From 925f2e118092b6a01b1e445a33238ac362fad60a 2013-11-05 19:50:04
From: Thomas Kluyver <takowl@gmail.com>
Date: 2013-11-05 19:50:04
Subject: [PATCH] Describe CL precedence over config files

---

diff --git a/docs/source/config/intro.rst b/docs/source/config/intro.rst
index c4f5473..95d9989 100644
--- a/docs/source/config/intro.rst
+++ b/docs/source/config/intro.rst
@@ -104,6 +104,9 @@ To see all of these abbreviated options, run::
     ipython notebook --help
     # etc.
 
+Options specified at the command line, in either format, override
+options set in a configuration file.
+
 The config magic
 ----------------