diff options
author | Georg Brandl <georg@python.org> | 2014-01-11 08:14:55 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2014-01-11 08:14:55 +0100 |
commit | 7ae642f2b292e85c8f934fd05a48362e9b90d3c4 (patch) | |
tree | 2636476a5a2545aa5a2a55e8e039a7001d6bfbab /doc/config.rst | |
parent | 4238b992b5e047c00a8a94df263e64fc8d1260db (diff) | |
parent | 778bf598128f22b4cdd913dfed27edb9eeeb20d0 (diff) | |
download | sphinx-7ae642f2b292e85c8f934fd05a48362e9b90d3c4.tar.gz |
merge stable into default
Diffstat (limited to 'doc/config.rst')
-rw-r--r-- | doc/config.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/config.rst b/doc/config.rst index 70ccd26e..f57e9eff 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -118,7 +118,7 @@ General configuration in that case. .. deprecated:: 1.0 - Use :confval:`exclude_patterns` instead. + Use :confval:`exclude_patterns` or :ref:`metadata` instead. .. confval:: exclude_trees |