typos and structure installation with git

mapbender · Aug 26, 2015 · 8fa7bd3 · 8fa7bd3
1 parent ac23dac
commit 8fa7bd3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 64 deletions.
diff --git a/de/book/installation/installation_git.rst b/de/book/installation/installation_git.rst
@@ -246,45 +246,23 @@ ApiGen
 	 sudo pear install pear.apigen.org/apigen
 
 
-Troubleshooting
-***************
-
-* Die ApiGen-Bestandteile laufen nur in der neusten Version von Phing. 2.4.12  ist ausreichend,  2.4.9 reicht nicht aus! 
-Testen Sie mit: 
-
-
-.. code-block:: yaml
-
-              phing -v
-
-
-Mit dem folgenden Befehl können Sie ein Update all Ihrer Pear-Pakete vornehmen: 
-
-
-.. code-block:: yaml
-    
-	 sudo pear install pear.apigen.org/apigen
-
-
-Lesen Sie mehr über `How to write Mapbender3 API Documentation? <../../../en/book/development/apidocumentation.html>`_.
-
+Lesen Sie mehr in `How to write Mapbender3 Documentation? <../../../en/book/development/documentation_howto.html>`_.
 
 Troubleshooting
 ***************
 
-* The ApiGen task only works with recent versions of Phing (>= 2.4.12). Check the Phing version with 
+* Die ApiGen-Bestandteile laufen nur mit neueren Versionen von Phing (>= 2.4.12). Testen Sie die Phing Version mit: 
 
-
-.. code-block:: yaml
+.. code-block:: bash
 
               phing -v
 
 
-You can update all your Pear packages with
-
-
-.. code-block:: yaml
+Mit dem folgenden Befehl können Sie ein Update all Ihrer Pear-Pakete vornehmen: 
 
-	sudo pear upgrade-all
 
+.. code-block:: bash
 
+    sudo pear upgrade-all
+      Enable full APC compatibility [yes] : yes
+      Enable internal debugging in APCu [no] : yes
diff --git a/en/book/installation/installation_git.rst b/en/book/installation/installation_git.rst
@@ -27,7 +27,7 @@ Get the code from the git repository. Cloning is easy, just issue the following
 
 .. code-block:: bash
 
-	git clone https://github.com/mapbender/mapbender-starter.git mapbender3
+    git clone https://github.com/mapbender/mapbender-starter.git mapbender3
     cd mapbender3
 
 Developers granted secure access to the code must use the SSH-URL of the
@@ -277,60 +277,64 @@ Read more about `How to write Mapbender3 API Documentation? <../development/apid
 Troubleshooting
 ***************
 
-* The ApiGen task only works with recent versions of Phing (>= 2.4.12). Check the Phing version with 
+* The ApiGen task only works with recent versions of Phing (>= 2.4.12). Check the Phing version with:
 
 
-.. code-block:: yaml
+.. code-block:: bash
 
               phing -v
 
 
 You can update all your Pear packages with
 
 
-.. code-block:: yaml
+.. code-block:: bash
 
-	sudo pear upgrade-all
+    sudo pear upgrade-all
       Enable full APC compatibility [yes] : yes
       Enable internal debugging in APCu [no] : yes 
 
-Using the quick_install.py script
-*********************************
+      
+..
+   Using the quick_install.py script
+   *********************************
+
+   A Python script to quickly install a mapbender-starter is provided with the
+   mapbender-starter itself. You can download that script, which offers a number
+   of command line arguments:
+
+   - branch: by default, the develop branch is used, but you can specify any branch
+   - directory: by default the directory mapbender3_BRANCH will be used, but that
+     can be specified as well.
+   - admin user: the default admin account (root <[email protected]> / root) can be
+     changed as well.
+
+   You can download the script or just pass it's URL to curl to fetch it and pipe
+   the result trough Python. The later is demonstrated in the examples section
+   below.
+
+   Examples
+   ========
 
-A Python script to quickly install a mapbender-starter is provided with the
-mapbender-starter itself. You can download that script, which offers a number
-of command line arguments:
+   http://bit.ly/1tQvo5i is the shortened URL for
+   https://raw.githubusercontent.com/mapbender/mapbender-starter/develop/bin/quick_install.py
 
-- branch: by default, the develop branch is used, but you can specify any branch
-- directory: by default the directory mapbender3_BRANCH will be used, but that
-  can be specified as well.
-- admin user: the default admin account (root <[email protected]> / root) can be
-  changed as well.
+   - Install develop branch into mapbender3_develop
 
-You can download the script or just pass it's URL to curl to fetch it and pipe
-the result trough Python. The later is demonstrated in the examples section
-below.
+     .. code-block:: sh
 
-Examples
-========
+       curl -sSL http://bit.ly/1tQvo5i | python
 
-http://bit.ly/1tQvo5i is the shortened URL for
-https://raw.githubusercontent.com/mapbender/mapbender-starter/develop/bin/quick_install.py
+   - Install foo branch into /tmp/bar
 
-- Install develop branch into mapbender3_develop
-
-  .. code-block:: sh
+     .. code-block:: sh
 
-    curl -sSL http://bit.ly/1tQvo5i | python
+       curl -sSL http://bit.ly/1tQvo5i | python - --dir=/tmp/bar foo
 
-- Install foo branch into /tmp/bar
-
-  .. code-block:: sh
+   - Install develop branch, but use admin <[email protected]> with password admin
 
-    curl -sSL http://bit.ly/1tQvo5i | python - --dir=/tmp/bar foo
+     .. code-block:: sh
 
-- Install develop branch, but use admin <[email protected]> with password admin
-
-  .. code-block:: sh
+       curl -sSL http://bit.ly/1tQvo5i | python - --username=admin [email protected] --password=admin
 
-    curl -sSL http://bit.ly/1tQvo5i | python - --username=admin [email protected] --password=admin
+