diff options
| author | Georg Brandl <georg@python.org> | 2014-01-19 10:32:12 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-01-19 10:32:12 +0100 |
| commit | 69dab54d89926f2fc8ce1febbd2288d09531cdb0 (patch) | |
| tree | 8ea5d51a670a4e9430a9f57e5eca16cfe994bd20 /tests/root | |
| parent | 604ea875698727d3c1d83317130af0fff5bb5ab8 (diff) | |
| parent | 59b355edaa4f17aff910bf2371526d5ce46fb648 (diff) | |
| download | sphinx-69dab54d89926f2fc8ce1febbd2288d09531cdb0.tar.gz | |
merge with stable
Diffstat (limited to 'tests/root')
| -rw-r--r-- | tests/root/conf.py | 2 | ||||
| -rw-r--r-- | tests/root/includes.txt | 1 | ||||
| -rw-r--r-- | tests/root/objects.txt | 9 |
3 files changed, 3 insertions, 9 deletions
diff --git a/tests/root/conf.py b/tests/root/conf.py index 8025ba33..3399043f 100644 --- a/tests/root/conf.py +++ b/tests/root/conf.py @@ -8,7 +8,7 @@ sys.path.append(os.path.abspath('..')) extensions = ['sphinx.ext.autodoc', 'sphinx.ext.jsmath', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.autosummary', 'sphinx.ext.doctest', 'sphinx.ext.extlinks', - 'sphinx.ext.viewcode', 'sphinx.ext.oldcmarkup', 'ext'] + 'sphinx.ext.viewcode', 'ext'] jsmath_path = 'dummy.js' diff --git a/tests/root/includes.txt b/tests/root/includes.txt index 904f0677..08917811 100644 --- a/tests/root/includes.txt +++ b/tests/root/includes.txt @@ -40,6 +40,7 @@ Literalinclude options .. cssclass:: inc-lines .. literalinclude:: literal.inc :lines: 6-7,9 + :lineno-start: 6 .. cssclass:: inc-startend .. literalinclude:: literal.inc diff --git a/tests/root/objects.txt b/tests/root/objects.txt index 57e82212..73661d22 100644 --- a/tests/root/objects.txt +++ b/tests/root/objects.txt @@ -101,6 +101,7 @@ Referring to :func:`nothing <>`. :type hour: DuplicateType :param hour: Duplicate param. Should not lead to crashes. :type hour: DuplicateType + :param .Cls extcls: A class from another module. C items @@ -117,14 +118,6 @@ C items .. c:var:: sphinx_global -Old C items (from oldcmarkup ext) ---------------------------------- - -.. cfunction:: Sphinx_Func() - -Refer to :cfunc:`Sphinx_Func`. - - Javascript items ================ |