Merge

doc/advanced/debug_faq.txt

@@ -108,7 +108,7 @@ print something out if a certain kind of Op was used, at a certain program
 position, or if a particular value shows up in one of the inputs or outputs.
 
 This can be a really powerful debugging tool.  Read about more things you can
-do with :api:`WrapLinkerMany`.
+do with :api:`link.WrapLinkerMany`.
 
 Note well the call to ``fn`` inside the call to ``print_eval``; without it,
 the graph wouldn't get computed at all!

doc/advanced_tutorial/optimization.txt

@@ -30,11 +30,12 @@ global. Optimizations that can be done with a narrow perspective are
 better defined as local optimizations. The majority of optimizations
 we want to define are local.
 
+.. optimizer:
 
 Global optimization
 -------------------
 
-A global optimization is an object which defines the following
+A global optimization (or optimizer) is an object which defines the following
 methods:
 
 - **apply(env)**