--- a/doc/admin-manual/installation-base.tex	Wed Jun 30 09:33:47 2010 +0000
+++ b/doc/admin-manual/installation-base.tex	Fri Aug 13 09:15:20 2010 +0000
@@ -54,6 +54,21 @@
 {\em Hint}: Configuring of partitions, firewalls, etc. for the system is out of
 the scope of this documentation.
 
+\subsection{Preparations}
+
+In some steps it is required to use templates wich are packed in
+\verb+ artifact-server-$VERSION.tar.bz2+ to get access to those files.
+
+Please extract the tar.bz2 file as explained in 
+Chapter~\ref{ref:artifact-server-install},
+ p.~\pageref{ref:artifact-server-install}.
+
+The complete document use the system-variable \verb+$ARTIFACT_SERVER_HOME+
+to refer the root-directory of the Artifac-Server.
+It might be helpful to export this variable using the following command:
+
+\verb+ export ARTIFACT_SERVER_HOME=/opt/artifact-server+ 
+
 \subsection{Java Environment}
 
 \subsubsection*{Installation Sun Java 6}
@@ -76,8 +91,10 @@
 
 Install Sun Java 6 and its dependencies by executing the following:
 
-\verb+ apt-get install sun-java6-jdk+
-
+\begin{lstlisting}
+   apt-get update
+   apt-get install sun-java6-jdk
+\end{lstlisting}
 
 \subsubsection*{Install Native Components for Java6 (optional)}
 
@@ -130,8 +147,8 @@
 Check if a version of 1.6.0* has been set. Check:
 
 \begin{lstlisting}
-  java version  "1.6.0_12"
-  Java(TM) SE Runtime Environment (build 1.6.0_12-b04)
+  java version  "1.6.0_20-b02"
+  Java(TM) SE Runtime Environment (build 1.6.0_20-b02)
   Java HotSpot(TM) Server VM (build 11.2-b01, mixed mode)
 \end{lstlisting}
 
@@ -153,6 +170,9 @@
 \verb+/etc/default/tomcat5.5+:
 
 \begin{lstlisting}
+   - #JAVA_HOME="/usr/lib/jvm/java-6-sun/"
+   + JAVA_HOME="/usr/lib/jvm/java-6-sun/"
+   
    - #JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
    + JAVA_OPTS="-Djava.awt.headless=true -Xmx1024m -server"
 
@@ -245,7 +265,7 @@
 
 After finishing the configuration, enable the module in Apache
 WebServer: \verb+ a2enmod jk+ and restart the server 
-\verb+ /etc/init.d/apache restart+.
+\verb+ /etc/init.d/apache2 restart+.
 
 
 \subsubsection*{Publish the site in Apache WebServer}
@@ -263,7 +283,7 @@
 
 Enable the specific site (VirtualHost) in Apache WebServer:
 \begin{lstlisting}
-  cp -i $ARTIFACT_SERVER_HOME/install/debian/apache2 to /etc/apache2/sites-available
+  cp -i $ARTIFACT_SERVER_HOME/install/debian/apache2/gnv to /etc/apache2/sites-available
   # Activate site for GNV
   a2ensite gnv
   /etc/init.d/apache reload
@@ -305,30 +325,47 @@
 dpkg -i cgi-mapserver-gp_5.6.3-1~gp+1_i386.deb
 \end{lstlisting}
 
-Provide a possibility to integrate MapServer properly and transfer
+If there are libraries which are required by the Mapserver but not
+installed yet run the following command:
+\begin{lstlisting}
+apt-get -f install
+\end{lstlisting}
+
+
+Provide a possibility to integrate Mapserver properly and transfer
 configurations to MapServer during runtime:
 
 \begin{lstlisting}
 cd /usr/lib/cgi-bin
 cp -i $ARTIFACT_SERVER_HOME/install/debian/umn-mapserver/gnv-wms .
+chmod +x gnv-wms
 \end{lstlisting}
 
 For setting proper contact details in the WMS Capabilities response,
 edit the file \verb+ $ARTIFACT_SERVER_HOME/conf/maptemplates/mapfile.vm+
 in the section WEB $\rightarrow$ METADATA.
 
+The Mapserver will need fonts for rendering lables in the map.
+To provide this it is required to install the freefonts.
+\begin{lstlisting}
+apt-get install ttf-freefont
+\end{lstlisting}
+
+
 \subsubsection*{Test of installation}
 Check for a sucessful installation via:
 
 \begin{lstlisting}
 cd root
 curl \
-"http://localhost/cgi-bin/gnv-wms?service=WMS&request=GetCapabilities&version=1.1.1" \
+"http://localhost/cgi-bin/gnv-wms" \
 -o mapserver
 \end{lstlisting}
 
 For a sucessful configuration, the response document \verb+ mapserver+
-contains a XML document describing the capabilities of the mapserver.
+contains a Value which contains the following message of the mapserver.
+
+TODO: QUERYSTRING WAS EMPTY HINZUFUEGEN
 
 \subsection{Proxy-Script: Installation and Configuration}
 The Proxy-Script is required to allow the Map-Client to request external
@@ -366,12 +403,12 @@
 It is possible to test the installation using the following command:
 
 \begin{lstlisting}
-curl http://localhost/cgi-bin/proxy.cgi?url=http%3A%2F%2Flocalhost
+curl http://localhost/cgi-bin/proxy.cgi?url=http%3A%2F%2Flocalhost/cgi-bin/mapserv-gp
 \end{lstlisting}
 
 If localhost is allowed in the proxy-script the result might be this:
 
 \begin{lstlisting}
-<html><body><h1>It works!</h1></body></html>
+TODO: QUERYSTRING WAS EMPTY HINZUFUEGEN
 \end{lstlisting}