diff options
| author | Georg Brandl <georg@python.org> | 2010-11-12 08:29:27 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-11-12 08:29:27 +0100 |
| commit | a1f633ee036386e9d3f0317148ea64682bd23bc4 (patch) | |
| tree | ab298c46869fb93f6bef9379e7c1331b42714f07 | |
| parent | 5ca3c9817aae3fc6f1dd6f8c05dddfe9d9777d1e (diff) | |
| parent | 34707fefacbecc95daa5e7fc54bbf5adb2727a75 (diff) | |
| download | sphinx-git-a1f633ee036386e9d3f0317148ea64682bd23bc4.tar.gz | |
merge
| -rw-r--r-- | .hgignore | 2 | ||||
| -rw-r--r-- | doc/markup/para.rst | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -17,3 +17,5 @@ ~$ ^utils/.*3\.py$ ^distribute- +^tests/root/_build/* +^tests/root/generated/* diff --git a/doc/markup/para.rst b/doc/markup/para.rst index 42bcc33cc..302d9c1ba 100644 --- a/doc/markup/para.rst +++ b/doc/markup/para.rst @@ -52,7 +52,7 @@ units as well as normal text: Similar to :rst:dir:`versionadded`, but describes when and what changed in the named feature in some way (new parameters, changed side effects, etc.). -.. rst:directive:: .. deprecated:: vesion +.. rst:directive:: .. deprecated:: version Similar to :rst:dir:`versionchanged`, but describes when the feature was deprecated. An explanation can also be given, for example to inform the |