Index: source/python/install.py
===================================================================
--- source/python/install.py	(revision c5074d295840f29091c45f8333ce650ad2a25ccd)
+++ source/python/install.py	(revision 274f9efe4b8438ab5238967e39adc200c624b56e)
@@ -66,14 +66,12 @@
 # ------------------------------------------------------------------------------
 def main():
-    '''
-    @Description:
-        Controls the installation process. Calls the installation function
-        if target is specified.
-
-    @Intput:
-        <nothing>
-
-    @Return:
-        <nothing>
+    '''Controls the installation process. Calls the installation function
+    if target is specified.
+
+    Parameters
+    ----------
+
+    Return
+    ------
     '''
 
@@ -88,15 +86,14 @@
 
 def get_install_cmdline_arguments():
-    '''
-    @Description:
-        Decomposes the command line arguments and assigns them to variables.
-        Apply default values for non mentioned arguments.
-
-    @Input:
-        <nothing>
-
-    @Return:
-        args: instance of ArgumentParser
-            Contains the commandline arguments from script/program call.
+    '''Decomposes the command line arguments and assigns them to variables.
+    Apply default values for non mentioned arguments.
+
+    Parameters
+    ----------
+
+    Return
+    ------
+    args : :obj:`Namespace`
+        Contains the commandline arguments from script/program call.
     '''
     parser = ArgumentParser(description='Install flex_extract software locally or \
@@ -139,19 +136,17 @@
 
 def install_via_gateway(c):
-    '''
-    @Description:
-        Perform the actual installation on local machine or prepare data
-        transfer to remote gate and submit a job script which will
-        install everything on the remote gate.
-
-    @Input:
-        c: instance of class ControlFile
-            Contains all the parameters of CONTROL file and
-            command line.
-            For more information about format and content of the parameter
-            see documentation.
-
-    @Return:
-        <nothing>
+    '''Perform the actual installation on local machine or prepare data
+    transfer to remote gate and submit a job script which will
+    install everything on the remote gate.
+
+    Parameters
+    ----------
+    c : :obj:`ControlFile`
+        Contains all the parameters of CONTROL file and
+        command line.
+
+    Return
+    ------
+
     '''
     import tarfile
@@ -224,23 +219,23 @@
 
 def mk_tarball(tarball_path, target):
-    '''
-    @Description:
-        Creates a tarball with all necessary files which need to be sent to the
-        installation directory.
-        It does not matter if this is local or remote.
-        Collects all python files, the Fortran source and makefiles,
-        the ECMWF_ENV file, the CONTROL files as well as the
-        template files.
-
-    @Input:
-        tarball_path: string
-            The complete path to the tar file which will contain all
-            relevant data for flex_extract.
-
-        target: string
-            The queue where the job is submitted to.
-
-    @Return:
-        <nothing>
+    '''Creates a tarball with all necessary files which need to be sent to the
+    installation directory.
+    It does not matter if this is local or remote.
+    Collects all python files, the Fortran source and makefiles,
+    the ECMWF_ENV file, the CONTROL files as well as the
+    template files.
+
+    Parameters
+    ----------
+    tarball_path : :obj:`string`
+        The complete path to the tar file which will contain all
+        relevant data for flex_extract.
+
+    target : :obj:`string`
+        The queue where the job is submitted to.
+
+    Return
+    ------
+
     '''
     import tarfile
@@ -294,15 +289,15 @@
 
 def un_tarball(tarball_path):
-    '''
-    @Description:
-        Extracts the given tarball into current directory.
-
-    @Input:
-        tarball_path: string
-            The complete path to the tar file which will contain all
-            relevant data for flex_extract.
-
-    @Return:
-        <nothing>
+    '''Extracts the given tarball into current directory.
+
+    Parameters
+    ----------
+    tarball_path : :obj:`string`
+        The complete path to the tar file which will contain all
+        relevant data for flex_extract.
+
+    Return
+    ------
+
     '''
     import tarfile
@@ -316,26 +311,26 @@
 
 def mk_env_vars(ecuid, ecgid, gateway, destination):
-    '''
-    @Description:
-        Creates a file named ECMWF_ENV which contains the
-        necessary environmental variables at ECMWF servers.
-        It is based on the template ECMWF_ENV.template.
-
-    @Input:
-        ecuid: string
-            The user id on ECMWF server.
-
-        ecgid: string
-            The group id on ECMWF server.
-
-        gateway: string
-            The gateway server the user is using.
-
-        destination: string
-            The remote destination which is used to transfer files
-            from ECMWF server to local gateway server.
-
-    @Return:
-        <nothing>
+    '''Creates a file named ECMWF_ENV which contains the
+    necessary environmental variables at ECMWF servers.
+    It is based on the template ECMWF_ENV.template.
+
+    Parameters
+    ----------
+    ecuid : :obj:`string`
+        The user id on ECMWF server.
+
+    ecgid : :obj:`string`
+        The group id on ECMWF server.
+
+    gateway : :obj:`string`
+        The gateway server the user is using.
+
+    destination : :obj:`string`
+        The remote destination which is used to transfer files
+        from ECMWF server to local gateway server.
+
+    Return
+    ------
+
     '''
     from genshi.template.text import NewTextTemplate
@@ -358,30 +353,30 @@
 
 def mk_compilejob(makefile, target, ecuid, ecgid, fp_root):
-    '''
-    @Description:
-        Modifies the original job template file so that it is specified
-        for the user and the environment were it will be applied. Result
-        is stored in a new file "job.temp" in the python directory.
-
-    @Input:
-        makefile: string
-            Name of the makefile which should be used to compile FORTRAN
-            CONVERT2 program.
-
-        target: string
-            The target where the installation should be done, e.g. the queue.
-
-        ecuid: string
-            The user id on ECMWF server.
-
-        ecgid: string
-            The group id on ECMWF server.
-
-        fp_root: string
-           Path to the root directory of FLEXPART environment or flex_extract
-           environment.
-
-    @Return:
-        <nothing>
+    '''Modifies the original job template file so that it is specified
+    for the user and the environment were it will be applied. Result
+    is stored in a new file "job.temp" in the python directory.
+
+    Parameters
+    ----------
+    makefile : :obj:`string`
+        Name of the makefile which should be used to compile FORTRAN
+        CONVERT2 program.
+
+    target : :obj:`string`
+        The target where the installation should be done, e.g. the queue.
+
+    ecuid : :obj:`string`
+        The user id on ECMWF server.
+
+    ecgid : :obj:`string`
+        The group id on ECMWF server.
+
+    fp_root : :obj:`string`
+       Path to the root directory of FLEXPART environment or flex_extract
+       environment.
+
+    Return
+    ------
+
     '''
     from genshi.template.text import NewTextTemplate
@@ -413,30 +408,30 @@
 
 def mk_job_template(ecuid, ecgid, gateway, destination, fp_root):
-    '''
-    @Description:
-        Modifies the original job template file so that it is specified
-        for the user and the environment were it will be applied. Result
-        is stored in a new file.
-
-    @Input:
-        ecuid: string
-            The user id on ECMWF server.
-
-        ecgid: string
-            The group id on ECMWF server.
-
-        gateway: string
-            The gateway server the user is using.
-
-        destination: string
-            The remote destination which is used to transfer files
-            from ECMWF server to local gateway server.
-
-        fp_root: string
-           Path to the root directory of FLEXPART environment or flex_extract
-           environment.
-
-    @Return:
-        <nothing>
+    '''Modifies the original job template file so that it is specified
+    for the user and the environment were it will be applied. Result
+    is stored in a new file.
+
+    Parameters
+    ----------
+    ecuid : :obj:`string`
+        The user id on ECMWF server.
+
+    ecgid : :obj:`string`
+        The group id on ECMWF server.
+
+    gateway : :obj:`string`
+        The gateway server the user is using.
+
+    destination : :obj:`string`
+        The remote destination which is used to transfer files
+        from ECMWF server to local gateway server.
+
+    fp_root : :obj:`string`
+       Path to the root directory of FLEXPART environment or flex_extract
+       environment.
+
+    Return
+    ------
+
     '''
     from genshi.template.text import NewTextTemplate
@@ -467,15 +462,15 @@
 
 def delete_convert_build(src_path):
-    '''
-    @Description:
-        Clean up the Fortran source directory and remove all
-        build files (e.g. *.o, *.mod and CONVERT2)
-
-    @Input:
-        src_path: string
-            Path to the fortran source directory.
-
-    @Return:
-        <nothing>
+    '''Clean up the Fortran source directory and remove all
+    build files (e.g. \*.o, \*.mod and CONVERT2)
+
+    Parameters
+    ----------
+    src_path : :obj:`string`
+        Path to the fortran source directory.
+
+    Return
+    ------
+
     '''
 
@@ -491,17 +486,17 @@
 
 def make_convert_build(src_path, makefile):
-    '''
-    @Description:
-        Compiles the Fortran code and generates the executable.
-
-    @Input:
-        src_path: string
-            Path to the fortran source directory.
-
-        makefile: string
-            The name of the makefile which should be used.
-
-    @Return:
-        <nothing>
+    '''Compiles the Fortran code and generates the executable.
+
+    Parameters
+    ----------
+    src_path : :obj:`string`
+        Path to the fortran source directory.
+
+    makefile : :obj:`string`
+        The name of the makefile which should be used.
+
+    Return
+    ------
+
     '''
 
