diff options
author | jfbu <jfbu@free.fr> | 2018-12-28 14:50:20 +0300 |
---|---|---|
committer | jfbu <jfbu@free.fr> | 2018-12-28 14:50:20 +0300 |
commit | 32d57b8637b89cdbd90da748f7cd7cd0e6d7d9f8 (patch) | |
tree | 6ec66ea9f429f4853e063a47cf4d2cfcd46bc092 /sphinx/addnodes.py | |
parent | 4f37b3342a2497913258d05cde413242bae543d7 (diff) | |
parent | 38c5ec13a54a2b7fcd7e70956ee99a656a651f13 (diff) |
Merge branch '1.8'
resolved Conflicts:
doc/development/tutorials/todo.rst
sphinx/locale/__init__.py
sphinx/search/zh.py
Diffstat (limited to 'sphinx/addnodes.py')
-rw-r--r-- | sphinx/addnodes.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/addnodes.py b/sphinx/addnodes.py index 9ba582ab5..f77ebda5e 100644 --- a/sphinx/addnodes.py +++ b/sphinx/addnodes.py @@ -252,8 +252,8 @@ class index(nodes.Invisible, nodes.Inline, nodes.TextElement): *entrytype* is one of "single", "pair", "double", "triple". - *key* is categolziation characters (usually it is single character) for - general index page. For the detail of this, please see also: + *key* is categorization characters (usually a single character) for + general index page. For the details of this, please see also: :rst:dir:`glossary` and issue #2320. """ |