--- a/doc/admin-manual/installation-base.tex	Wed May 05 10:07:24 2010 +0000
+++ b/doc/admin-manual/installation-base.tex	Wed May 05 10:33:25 2010 +0000
@@ -1,4 +1,4 @@
-\section{Installationguide}
+\section{Installation and Configuration}
 
 This section describes preconditions for the entire system and an
 installation on a Debian 5.0.x (Lenny) for the GNV-System without an
@@ -13,7 +13,7 @@
 
 \subsection{Preconditions}
 
-\subsubsection{System}
+\subsubsection*{System}
 
 \begin{itemize}
   \item Storage for the delivered software: 100 MB
@@ -27,7 +27,7 @@
     caching
 \end{itemize}
 
-\subsubsection{Database: Software and Data}
+\subsubsection*{Database: Software and Data}
 
 The software has been developed for the following system:
 
@@ -42,7 +42,7 @@
     ENC Data Model. - ESRI Data Models. http://support.esri.com/datamodels
   \item CONTIS -- Federal Maritime and Hydrographic Agency (BSH). Continental 
     Shelf Information System --
-    http://www.bsh.de/en/Marine\_uses/Industry/CONTIS\_maps/index.jsp
+    \url{http://www.bsh.de/en/Marine\_uses/Industry/CONTIS\_maps/index.jsp}
   \item GNV specific schema MapViewer interface -- Schema for integrating with MapViewer and
     their WMS services
   \item GNV specific schema for managing the cache -- The central
@@ -54,7 +54,7 @@
 \subsection{Operating System}
 
 {\em Hint}: Configuring of partitions, firewalls, etc. for the system is out of
-the scope of this project.
+the scope of this documentation.
 
 \subsection{Java Environment}
 
@@ -96,7 +96,7 @@
 
 \subsubsection*{Configuration}
 
-To ensure that the Apache Tomcat and the GNV Artefact Server will use
+To ensure that the Apache Tomcat and the GNV Artifact-Server will use
 Sun Java 6 exclusively, switch to the default Java version
 globally\footnote{This manual assumes that there are no other packages
 depending to another Java version.}.
@@ -136,13 +136,6 @@
 \end{lstlisting}
 
 
-\subsubsection*{Uninstalling}
-
-For removing Sun Java from the operating system, use:
-
-\verb+apt-get --purge remove sun-java6-jdk+
-
-
 \subsection{Tomcat Application Server}
 To run the GNV-System a Apache Tomcat Server Version 5.5 is required.
 This section describes the steps for installing and configuring
@@ -211,12 +204,6 @@
 If there are problems, setup \verb+ mod_jk+ module in Apache WebServer
 and check its according log files.
 
-\subsubsection*{Uninstalling Apache Tomcat}
-
-To uninstall the Apache Tomcat, use the following:
-\verb+ apt-get --purge remove tomcat5.5+
-
-
 \subsection{Apache Webserver}
 This section describes the required steps for the installation and configuration 
 of the Apache Webserver Version 2.2. Apache WebServer controls all
@@ -288,12 +275,6 @@
 the startpage of the GNV WebClient.
 
 
-\subsubsection*{Uninstalling the Apache Webserver}
-To uninstall the Apache Webserver and its configuration, you can use the
-following command:
-\verb+ apt-get purge apache2+
-
-
 \subsection{UMN MapServer: Installation and configuration}
 The UMN MapServer is part of the artifact server. It is responsible for
 rendering shapefiles produced by the artifact-server and publish them as
@@ -343,14 +324,3 @@
 
 For a sucessful configuration, the response document \verb+ mapserver+
 contains a XML document describing the capabilities of the mapserver.
-
-
-\subsubsection*{Un-installing UMN- Mapserver}
-
-To uninstall the UMN-mapserver without its dependencies, execute the following:
-
-\begin{lstlisting}
-cd /usr/lib/cgi-bin
-rm -i gnv-wrapper
-apt-get purge cgi-mapserv-gp
-\end{lstlisting}