Merge pull request #1080 from Leoniela/test

WIP_adding_glossary_to_tutorial

Author: satra

doc/quickstart.rst

@@ -50,3 +50,13 @@ Developer guides
    devel/gitwash/index
 
 .. include:: links_names.txt
+
+Useful links for beginners
+===========================
+
+Getting started with Python - Tutorials. `Available here`__
+
+Python for Beginners `Available here`__
+
+   __ http://www.codecademy.com/en/tracks/python
+   __ https://www.python.org/about/gettingstarted/

doc/users/tutorial_101.rst

@@ -99,15 +99,15 @@ This results in a workflow containing two isolated nodes:
 
 **5. Connecting nodes to each other**
 
-We want to connect the output produced by realignment to the input of
-smoothing. This is done as follows.
+We want to connect the output produced by the node realignment to the input of
+the node smoothing. This is done as follows.
 
 .. testcode::
 
    workflow.connect(realigner, 'realigned_files', smoother, 'in_files')
 
-or alternatively, a more flexible notation can be used. Although not shown here,
-the following notation can be used to connect multiple outputs from one node to
+
+Although not shown here, the following notation can be used to connect multiple outputs from one node to
 multiple inputs (see step 7 below).
 
 .. testcode::
@@ -189,3 +189,22 @@ inside which are three folders: realign, smooth and artdetect (the names
 of the nodes). The outputs of these routines are in these folders.
 
 .. include:: ../links_names.txt
+
+.. glossary::
+
+   pipeline
+      Connected series of processes (processes can be run parallel and or sequential)
+
+   workflow 
+      (kind of synonymous to pipeline) = hosting the nodes
+
+   node 
+      = switching-point within a pipeline, you can give it a name (in the above example e.g. realigner), 
+      a node usually requires an or several inputs and will produce an or several outputs
+
+   interface 
+      = specific software (e.g. FSL, SPM ...) are wrapped in interfaces, within a node instances of an
+      interface can be run
+
+   modules 
+      for each interface the according modules have to be imported in the usual pythonic manner