diff --git a/CHANGES b/CHANGES
index d753c4027..a375f0d76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -122,6 +122,11 @@ New features added
 
 * Other changes:
 
+  - Added a command-line switch ``-Q``: it will suppress warnings.
+
+  - Added a command-line switch ``-A``: it can be used to give additional
+    values into the HTML templates.
+
   - Added a distutils command `build_sphinx`: When Sphinx is installed,
     you can call ``python setup.py build_sphinx`` for projects that have
     Sphinx documentation, which will build the docs and place them in
diff --git a/doc/intro.rst b/doc/intro.rst
index de288dbde..34f791ed9 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -114,8 +114,12 @@ The :program:`sphinx-build` script has several more options:
    case.)
 
 **-q**
-   Do not output anything on standard output, only write warnings to standard
-   error.
+   Do not output anything on standard output, only write warnings and errors to
+   standard error.
+
+**-Q**
+   Do not output anything on standard output, also suppress warnings.  Only
+   errors are written to standard error.
 
 **-P**
    (Useful for debugging only.)  Run the Python debugger, :mod:`pdb`, if an