From f86217c9d1b0f483e44a66eccbbc8fed27c3b9f1 Mon Sep 17 00:00:00 2001 From: Jakub Wilk Date: Fri, 1 Jan 2016 20:54:30 +0100 Subject: [PATCH] Fix typos. --- doc/config.rst | 2 +- doc/domains.rst | 4 ++-- doc/extdev/appapi.rst | 2 +- doc/web/quickstart.rst | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index 69cd066b4..e4f085365 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -453,7 +453,7 @@ documentation on :ref:`intl` for details. this path are searched by the standard :mod:`gettext` module. Internal messages are fetched from a text domain of ``sphinx``; so if you - add the directory :file:`./locale` to this settting, the message catalogs + add the directory :file:`./locale` to this setting, the message catalogs (compiled from ``.po`` format using :program:`msgfmt`) must be in :file:`./locale/{language}/LC_MESSAGES/sphinx.mo`. The text domain of individual documents depends on :confval:`gettext_compact`. diff --git a/doc/domains.rst b/doc/domains.rst index e7bfc1a53..803a4343c 100644 --- a/doc/domains.rst +++ b/doc/domains.rst @@ -594,7 +594,7 @@ a visibility statement (``public``, ``private`` or ``protected``). .. rst:directive:: .. cpp:member:: (member) variable declaration .. cpp:var:: (member) variable declaration - Describe a varible or member variable, e.g.,:: + Describe a variable or member variable, e.g.,:: .. cpp:member:: std::string MyClass::myMember @@ -671,7 +671,7 @@ a visibility statement (``public``, ``private`` or ``protected``). Namespacing ~~~~~~~~~~~~~~~~~ -Declarations in the C++ doamin are as default placed in global scope. +Declarations in the C++ domain are as default placed in global scope. The current scope can be changed using three namespace directives. They manage a stack declarations where ``cpp:namespace`` resets the stack and changes a given scope. diff --git a/doc/extdev/appapi.rst b/doc/extdev/appapi.rst index c2ee4cc86..d1912676a 100644 --- a/doc/extdev/appapi.rst +++ b/doc/extdev/appapi.rst @@ -155,7 +155,7 @@ package. add_directive('literalinclude', literalinclude_directive, content = 0, arguments = (1, 0, 0), linenos = directives.flag, - language = direcitves.unchanged, + language = directives.unchanged, encoding = directives.encoding) .. versionchanged:: 0.6 diff --git a/doc/web/quickstart.rst b/doc/web/quickstart.rst index 996942db6..1611774c1 100644 --- a/doc/web/quickstart.rst +++ b/doc/web/quickstart.rst @@ -135,7 +135,7 @@ add this data to the ``COMMENT_OPTIONS`` that are used in the template. .. note:: - This only works works if your documentation is served from your + This only works if your documentation is served from your document root. If it is served from another directory, you will need to prefix the url route with that directory, and give the `docroot` keyword argument when creating the web support object::