[QGIS Commit] r10740 - in docs/trunk/english_us/user_guide: . features_at_a_glance_screenies

[svn_qgis at osgeo.org]

Author: sholl
Date: 2009-05-05 11:44:06 -0400 (Tue, 05 May 2009)
New Revision: 10740

Added:
   docs/trunk/english_us/user_guide/features_at_a_glance_screenies/proxy-settings.png
Modified:
   docs/trunk/english_us/user_guide/features_at_a_glance.tex
   docs/trunk/english_us/user_guide/features_at_a_glance_screenies/Makefile
Log:
* added some notes about the different Proxy-types and added a screener of
  the dialog



Modified: docs/trunk/english_us/user_guide/features_at_a_glance.tex
===================================================================
--- docs/trunk/english_us/user_guide/features_at_a_glance.tex	2009-05-05 14:24:56 UTC (rev 10739)
+++ docs/trunk/english_us/user_guide/features_at_a_glance.tex	2009-05-05 15:44:06 UTC (rev 10740)
@@ -838,8 +838,40 @@
 
 \begin{itemize}
 \item \checkbox{Use proxy for web access} and define host, port, user, and password.
+\item Set the \dropmenuopt{Proxy type} according to your needs
+ \begin{itemize}
+  \item \dropmenuopt{Default Proxy}: Proxy is determined based on the application proxy set using
+  \item \dropmenuopt{Socks5Proxy}: Generic proxy for any kind of connection. Supports TCP, UDP, binding to a port (incoming connections) and authentication.
+  \item \dropmenuopt{HttpProxy}: Implemented using the "CONNECT" command, supports only outgoing TCP connections; supports authentication.
+  \item \dropmenuopt{HttpCachingProxy}: Implemented using normal HTTP commands, it is useful only in the context of HTTP requests
+  \item \dropmenuopt{FtpCachingProxy}: Implemented using an FTP proxy, it is useful only in the context of FTP requests
+ \end{itemize}
 \end{itemize}
 
+Excluding some URLs can be added to the textbox below the proxy-settings (see
+fig. \ref{fig:proxy-settings}) by pressing the \button{Add}-button. After that
+double-click into the just created URL-field and enter the URL you would like
+to exclude from using the proxy. Obviously he button \button{Remove} removes the selected
+entry.
+
+If you need more detailed information about the different proxy-settings,
+please refer to the manual of the unterlaying QT-library-documentation at
+\url{http://doc.trolltech.com/4.5/qnetworkproxy.html#ProxyType-enum}.
+
+\begin{figure}[ht]
+   \begin{center}
+   \caption{Proxy-settings in QGIS \nixcaption}
+   \includegraphics[clip=true, width=10cm]{proxy-settings}
+   \label{fig:proxy-settings}
+\end{center} 
+\end{figure}
+
+\begin{Tip} \caption{\textsc{Using Proxies}}
+\qgistip{Using proxies can sometimes be tricky. It is useful to 'trial and
+error' the above proxy types and check if they succeed in your case.
+}
+\end{Tip}
+
 You can modify the options according to your needs. Some of the changes may 
 require a restart of QGIS before they will be effective.
 

Modified: docs/trunk/english_us/user_guide/features_at_a_glance_screenies/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/features_at_a_glance_screenies/Makefile	2009-05-05 14:24:56 UTC (rev 10739)
+++ docs/trunk/english_us/user_guide/features_at_a_glance_screenies/Makefile	2009-05-05 15:44:06 UTC (rev 10740)
@@ -13,6 +13,7 @@
 PNG=startup.eps\
     measure_area.eps\
     measure_line.eps\
+    proxy-settings.eps\
 	
 ##### TARGETS #####
 

Added: docs/trunk/english_us/user_guide/features_at_a_glance_screenies/proxy-settings.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/features_at_a_glance_screenies/proxy-settings.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream