merged branch silverskater/patch-1 (PR #700)

This PR was submitted for the master branch but it was merged into the 1.0 branch instead (closes #700).

Discussion
----------

reflect change: Modularity chapter renamed to Organizing Controllers (#570)

Commits
-------

d051da3 reflect change: Modularity chapter renamed to Organizing Controllers (#570)

doc/usage.rst

@@ -462,8 +462,8 @@ the defaults for new controllers.
 .. note::
 
     The global configuration does not apply to controller providers you might
-    mount as they have their own global configuration (see the Modularity
-    paragraph below).
+    mount as they have their own global configuration (read the 
+    :doc:`dedicated chapter<organizing_controllers>` for more information).
 
 Error handlers
 --------------