# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1277890427 0
# Node ID 706df18f0c01893b2520b8173a05e19b95485753
# Parent  411b09d348cad22f8b62b762518c47c3b0ee5831
Some refactoring of the proxy installation.

doc/trunk@1250 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 411b09d348ca -r 706df18f0c01 doc/ChangeLog
--- a/doc/ChangeLog	Wed Jun 30 08:52:49 2010 +0000
+++ b/doc/ChangeLog	Wed Jun 30 09:33:47 2010 +0000
@@ -1,3 +1,8 @@
+2010-06-30  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* admin-manual/installation-base.tex: Some refactoring of the proxy
+	  installation.
+
 2010-06-30  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* config-manual/general_settings.tex: Removed section 'Adding new
diff -r 411b09d348ca -r 706df18f0c01 doc/admin-manual/installation-base.tex
--- a/doc/admin-manual/installation-base.tex	Wed Jun 30 08:52:49 2010 +0000
+++ b/doc/admin-manual/installation-base.tex	Wed Jun 30 09:33:47 2010 +0000
@@ -331,9 +331,9 @@
 contains a XML document describing the capabilities of the mapserver.
 
 \subsection{Proxy-Script: Installation and Configuration}
-The Proxy-Script is required to allow requests which are send by the Map-Client
-which is integrated in the GNV-Web-Client. This is required because of security-
-policies according Java-Script which load further Documents during runtime.
+The Proxy-Script is required to allow the Map-Client to request external
+services. Security policies forbit and prevent requesting those services - like
+a GetFeatureInfo request - directly.
 
 \subsubsection{Installation}
 
@@ -342,7 +342,7 @@
 
 \verb+ apt-get install python+
 
-Than the script itself must be published on the server by executing the
+Then the script itself must be published on the server by executing the
 following steps:
 
 \begin{lstlisting}
@@ -351,11 +351,12 @@
 \end{lstlisting}
 
 \subsubsection{Configuration}
-The Proxy-Script can only communicate with servers which it is allowed to.
+The Proxy-Script can only communicate with servers it is allowed to.
 To enable the communication to the server where the UMN-Mapserver is hosted
-or to other Server it is necessary to edit the Proxy-Script at line 18.
+or to other Server it is necessary to edit {\tt allowedHosts} in the
+Proxy-Script at line 18.
 
-There you have tor replace the placeholder THISHOSTNAME with the name which
+There you have to replace the placeholder THISHOSTNAME with the name which
 will be used to reach the GNV-Web-Client.
 
 You can add further servers using the syntax which is given in the script.