diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:57:09 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:57:09 +0000 |
commit | 2722609ed8cf1f24bb6a8b8a5ad9d7ac6dec58c3 (patch) | |
tree | e0f8becff83e01bc4228b1824e81a6a355d6e439 /doc/faq.rst | |
parent | Releasing progress-linux version 7.3.7-3~progress7.99u1. (diff) | |
download | sphinx-2722609ed8cf1f24bb6a8b8a5ad9d7ac6dec58c3.tar.xz sphinx-2722609ed8cf1f24bb6a8b8a5ad9d7ac6dec58c3.zip |
Merging upstream version 7.4.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'doc/faq.rst')
-rw-r--r-- | doc/faq.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/faq.rst b/doc/faq.rst index 8538cdc..7645326 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -30,10 +30,10 @@ How do I... ``sidebartoc`` block. ... write my own extension? - See the :doc:`/development/tutorials/index`. + See the :ref:`extension-tutorials-index`. ... convert from my existing docs using MoinMoin markup? - The easiest way is to convert to xhtml, then convert `xhtml to reST`_. + The easiest way is to convert to xhtml, then convert `xhtml to reStructuredText`_. You'll still need to mark up classes and such, but the headings and code examples come through cleanly. @@ -58,8 +58,8 @@ Epydoc Epydoc's API docs for a given identifier. Doxygen - Michael Jones is developing a reST/Sphinx bridge to doxygen called `breathe - <https://github.com/michaeljones/breathe/tree/master>`_. + Michael Jones has developed a reStructuredText/Sphinx bridge to doxygen + called `breathe <https://github.com/breathe-doc/breathe/tree/master>`_. SCons Glenn Hutchings has written a SCons build script to build Sphinx @@ -147,7 +147,7 @@ Google Search .. _Getting Started: https://docs.readthedocs.io/en/stable/intro/getting-started-with-sphinx.html .. _api role: https://git.savannah.gnu.org/cgit/kenozooid.git/tree/doc/extapi.py -.. _xhtml to reST: https://docutils.sourceforge.io/sandbox/xhtml2rest/xhtml2rest.py +.. _xhtml to reStructuredText: https://docutils.sourceforge.io/sandbox/xhtml2rest/xhtml2rest.py Sphinx vs. Docutils |