Add more glossary links

Author: ludovic-gasc

README.rst

@@ -10,7 +10,7 @@ Notes to writers
 ================
 
 Tutorials should use Python 3.5 ``async`` and ``await`` keywords rather than
-``yield from``.
+``@asyncio.coroutine`` and ``yield from``.
 
 
 Ideas

glossary.rst

@@ -12,4 +12,10 @@ Glossary
         It's a piece of code that can be paused and resumed. Whereas threads are preemptively multitasked by the operating system, coroutines multitask cooperatively: they choose when to pause, and which coroutine to run next.
 
     event loop
-        The event loop is the central execution device to launch execution of coroutines and handle I/O (Network, sub-processes...)
+        The event loop is the central execution device to launch execution of coroutines and handle I/O (Network, sub-processes...)
+
+    future
+        It's like a mailbox where you can subscribe to receive a result when it will be done.
+
+    task
+        It represents the execution of a coroutine and take care the result in a future.

hello_clock.rst

@@ -1,10 +1,10 @@
 Hello Clock
 ^^^^^^^^^^^
 
-Example illustrating how to schedule two coroutines to run concurrently.
-They run for ten minutes, during which the first coroutine is scheduled every
+Example illustrating how to schedule two :term:`coroutines <coroutine>` to run concurrently.
+They run for ten minutes, during which the first :term:`coroutine <coroutine>` is scheduled every
 second, while the second is scheduled every minute.
 
-The function `asyncio.gather` is used to schedule both coroutines at once.
+The function `asyncio.gather` is used to schedule both :term:`coroutines <coroutine>` at once.
 
 .. literalinclude:: examples/hello_clock.py

hello_world.rst

@@ -24,7 +24,7 @@ This second example show how you can schedule multiple :term:`coroutines <corout
 event loop, and then run the :term:`event loop <event loop>`.
 
 Notice that this example will print 'second_hello' before 'first_hello',
-as the second task scheduled waits longer that the first one before printing.
+as the second :term:`task <task>` scheduled waits longer that the first one before printing.
 
 Also note that this example will never terminate, as the  :term:`loop <event loop>` is asked to
 `run_forever`.
@@ -35,8 +35,8 @@ Also note that this example will never terminate, as the  :term:`loop <event loo
 Stopping the loop
 -----------------
 
-This third example adds another task that will stop the :term:`event loop <event loop>` before
-all scheduled tasks could execute, which results in a warning.
+This third example adds another :term:`task <task>` that will stop the :term:`event loop <event loop>` before
+all scheduled :term:`tasks <task>` could execute, which results in a warning.
 
 .. literalinclude:: examples/loop_stop.py