Index: Documentation/html/_sources/Installation/gateway.rst.txt
===================================================================
--- Documentation/html/_sources/Installation/gateway.rst.txt	(revision 30f7911a6e9f08ea7e46542a8f3383d7cd5b8f00)
+++ Documentation/html/_sources/Installation/gateway.rst.txt	(revision d72089559ba8d16d2cf31482c3bc1e074448cdd1)
@@ -8,5 +8,5 @@
 .. toctree::
     :hidden:
-    :maxdepth: 3
+    :maxdepth: 2
     
 .. _Python 3: https://docs.python.org/3/
@@ -43,12 +43,8 @@
 .. _ref-req-gateway: 
  
-Gateway environment requirements
-================================
+Gateway mode - dependencies
+===========================
 
-The environment on your local system has to provide these software packages
-and libraries, since ``flex_extract`` does only prepare the job script and send
-it to the ECMWF servers:
-    
-* `Python3`_ or `Anaconda Python3`_
+* `Python3`_ 
 * `numpy`_
 * `genshi`_
@@ -60,16 +56,31 @@
 ===========================
 
-The easiest way to install all required packages is to use the package management system of your Linux distribution. To do so, it is necessary to use a user with admin rights.
-The installation was tested on a *GNU/Linux Debian buster* and an *Ubuntu 18.04 Bionic Beaver* system.
+In this mode, access to the ECMWF computing and archiving facilities is enabled through an ECaccess gateway server on a local member state server. The ECaccess framework is necessary to interactively submit jobs to the ECMWF batch system and to transfer files between ECMWF and local gateway server. 
+
+Please see `ECMWF's instructions on gateway server`_ to establish the gateway server if not already in place. Additionally, to be able to use the ECaccess file transfer service **ectrans** it is necessary to create a so-called association. The easiest way is to visit the ECaccess Member State Gateway website (e.g. https://msgatway.ecmwf.int) and follow the instructions in the short `ECaccess Presentation`_ (page 17 ff.). Additional documentation can be found on the `ECMWF ectrans site`_.
+
+The next step is to create an *ecaccess certificate* to be able to send and receive files from and to the ECMWF server. You can do this by using the ``ecaccess-certificate-create`` command on the gateway server. You will be prompted for your ECMWF member state user name and a password (generated by a token). This certificate has to be renewed periodically (every 7 days).
+
+
+.. code-block:: bash
+   
+   $ ecaccess-certificate-create
+   Please enter your user-id: example_username
+   Your passcode: ***
+   
+   
+   
+The easiest way to install all required packages is to use the package management system of your Linux distribution which required admin rights.
+The installation was tested under *GNU/Linux Debian buster* and *Ubuntu 18.04 Bionic Beaver*.
 
 .. code-block:: sh
 
-   # On a Linux Debian or Ubuntu system do
+
+   # On a Debian or Debian-derived sytem (e. g. Ubuntu) system you may use the following commands (or equivalent commands of your preferred package manager):
    # (if not already available):
    apt-get install python3
-   apt-get install pip
-   apt-get install genshi
-   apt-get install numpy
-
+   apt-get install python3-genshi
+   apt-get install python3-numpy
+   
 
 .. _ref-test-gateway:
@@ -77,9 +88,9 @@
 Test gateway environment
 ========================
- 
+
 Check the availability of the python packages by typing ``python3`` in
 a terminal window and run the ``import`` commands in the python shell. 
 If there are no error messages, you succeeded in setting up the environment.
-
+ 
 .. code-block:: python
     
@@ -95,21 +106,7 @@
 ====================
 
-In this mode, access to the ECMWF computing and archiving facilities is enabled through an ECaccess gateway server on a local member state server. The ECaccess framework is necessary to interactively submit jobs to the ECMWF batch system and to transfer files between ECMWF and local gateway server. 
-
-Please see `ECMWF's instructions on gateway server`_ to establish the gateway server if not already in place.
-Additionally, to be able to use the Ecaccess file transfer service **ectrans** please also create an association. 
-The easiest way is to visit the ECaccess Member State Gateway website (e.g. msgatway.ecmwf.int) and follow the instructions in the short `ECaccess Presentation`_ (page 17 ff.). Additional documentation can be found on the `ECMWF ectrans site`_.
-
-After everything is set up you have to create an *ecaccess certificate* to be able to send and receive files from and to the ECMWF server. You can do this by using the ``ecaccess-certificate-create`` command on the gateway server. You will be prompted for your ECMWF member state user name and a password (which will be usually generated by a Token). This certificate has to be re-newed periodically (every 7 days). 
-
-.. code-block:: bash
+``Flex_extract`` will be run on an ECMWF server which makes the setup the same as for the **remote mode**. In the ``setup.sh`` script `[ref] <Documentation/Input/setup.html>`_, select the ``makefile.gfortran`` for the ``CONVERT2`` Fortran program and the ECMWF server (*target*) you would like to use. 
+The job script, send to the job queue via the ECaccess software, loads the required modules from the module system. For enabling the file transfer via the gateway, you have to set the *ECUID*, *ECGID*, *GATEWAY* and *DESTINATION* parameter values.
    
-   $ ecaccess-certificate-create
-   Please enter your user-id: example_username
-   Your passcode: ***
-   
-``Flex_extract`` will be run on an ECMWF server which makes the setup the same as for the **remote mode**. In the ``setup.sh`` script `[ref] <Documentation/Input/setup.html>`_, select the ``Makefile.gfortran`` for the ``CONVERT2`` Fortran program and the ECMWF server (*target*) you would like to use. 
-The job script, send to the job queue via the ECaccess software, selects again automatically the correct libraries from the module system. For enableing the file transfer you have to set the *ECUID*, *ECGID*, *GATEWAY* and *DESTINATION* parameter values.
- 
 
 .. code-block:: bash
@@ -123,9 +120,9 @@
     #
     TARGET='ecgate'
-    MAKEFILE='Makefile.gfortran'
+    MAKEFILE='makefile.gfortran'
     ECUID='uid'
     ECGID='gid'
-    GATEWAY='server.example.edu'
-    DESTINATION='example@genericSftp'
+    GATEWAY='localserver.tld'
+    DESTINATION='association_name@genericSftp'
     INSTALLDIR=None
     JOB_TEMPLATE='job.template'
@@ -139,5 +136,5 @@
    $ ./setup.sh
    
-to start the installation. You should see the following output at the command line. 
+to start the installation. You should see the following on standard output. 
     
     
@@ -149,6 +146,5 @@
    You should get an email with subject "flexcompile" within the next few minutes!
 
-    
-The email content should look like this with a "SUCCESS" statement in the last line:
+``Flex_extract`` uses the email address connectd to the user account on ECMWF servers. The email content should look like this with a "SUCCESS" statement in the last line:
 
 .. code-block:: bash
