Merge pull request #1798 from vkarak/docs/misc-fixes

[bugfix] More documentation fixes

Author: Vasileios Karakasis

docs/tutorial_deps.rst

@@ -103,7 +103,7 @@ Here is the output when running the OSU tests with the asynchronous execution po
 
    [ReFrame Setup]
      version:           3.4-dev2 (rev: 56c6c237)
-     command:           './bin/reframe --system=daint -C tutorials/config/settings.py -c tutorials/deps/osu_benchmarks.py -r'
+     command:           './bin/reframe -C tutorials/config/settings.py -c tutorials/deps/osu_benchmarks.py -r'
      launched by:       user@daint101
      working directory: '/users/user/Devel/reframe'
      settings file:     'tutorials/config/settings.py'
@@ -256,7 +256,7 @@ As a result, its immediate dependency :class:`OSUBuildTest` will be skipped, whi
 
 .. code-block:: console
 
-   ./bin/reframe -c tutorials/deps/osu_benchmarks.py -n OSULatencyTest -l
+   ./bin/reframe -c tutorials/deps/osu_benchmarks.py --system=daint:gpu -n OSULatencyTest -l
 
 .. code-block:: none
 

reframe/core/pipeline.py

@@ -652,17 +652,21 @@ def pipeline_hooks(cls):
     #:
     #: ::
     #:
-    #:     'resources': {
-    #:         'gpu': [
-    #:             '--gres=gpu:{num_gpus_per_node}'
-    #:         ],
-    #:         'datawarp': [
-    #:             '#DW jobdw capacity={capacity}',
-    #:             '#DW stage_in source={stagein_src}'
-    #:         ]
-    #:     }
+    #:     'resources': [
+    #:         {
+    #:             'name': 'gpu',
+    #:             'options': ['--gres=gpu:{num_gpus_per_node}']
+    #:         },
+    #:         {
+    #:             'name': 'datawarp',
+    #:             'options': [
+    #:                 '#DW jobdw capacity={capacity}',
+    #:                 '#DW stage_in source={stagein_src}'
+    #:             ]
+    #:         }
+    #:     ]
     #:
-    #: A regression test then may instantiate the above resources by setting
+    #: A regression test may then instantiate the above resources by setting
     #: the :attr:`extra_resources` attribute as follows:
     #:
     #: ::