diff --git a/docs/Makefile b/docs/Makefile index 6ae59a5..1263bc3 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -58,9 +58,9 @@ html: api @echo @echo "Build finished. The HTML pages are in build/html." -api: source/api/generated/gen.txt +api: source/api/generated/gen.rst -source/api/generated/gen.txt: +source/api/generated/gen.rst: python autogen_api.py @echo "Build API docs finished." @@ -110,11 +110,10 @@ linkcheck: $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck @echo @echo "Link check complete; look for any errors in the above output " \ - "or in build/linkcheck/output.txt." + "or in build/linkcheck/output.rst." gitwash-update: python ../tools/gitwash_dumper.py source/development ipython - cd source/development/gitwash && rename 's/.rst/.txt/' *.rst nightly: dist rsync -avH --delete dist/ ipython:www/doc/nightly diff --git a/docs/autogen_api.py b/docs/autogen_api.py index 26aade7..dac44ea 100755 --- a/docs/autogen_api.py +++ b/docs/autogen_api.py @@ -14,7 +14,7 @@ if __name__ == '__main__': pjoin = os.path.join package = 'IPython' outdir = pjoin('source','api','generated') - docwriter = ApiDocWriter(package,rst_extension='.txt') + docwriter = ApiDocWriter(package,rst_extension='.rst') # You have to escape the . here because . is a special char for regexps. # You must do make clean if you change this! docwriter.package_skip_patterns += [r'\.fixes$', diff --git a/docs/make.cmd b/docs/make.cmd index d4e003d..00b1b74 100644 --- a/docs/make.cmd +++ b/docs/make.cmd @@ -36,7 +36,7 @@ FOR %%L IN (html pickle htmlhelp latex changes linkcheck) DO ( ) IF "%1" == "linkcheck" ( ECHO Look for any errors in the above output - ECHO or in build\linkcheck\output.txt. + ECHO or in build\linkcheck\output.rst. ) GOTO END ) diff --git a/docs/source/conf.py b/docs/source/conf.py index 85a78c7..7060c25 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -67,7 +67,7 @@ if ON_RTD: templates_path = ['_templates'] # The suffix of source filenames. -source_suffix = '.txt' +source_suffix = '.rst' # The master toctree document. master_doc = 'index' diff --git a/docs/source/config/index.rst b/docs/source/config/index.rst index 0e0a230..38e206c 100644 --- a/docs/source/config/index.rst +++ b/docs/source/config/index.rst @@ -7,10 +7,10 @@ Configuration and customization .. toctree:: :maxdepth: 2 - overview.txt - extensions/index.txt - ipython.txt - integrating.txt - editors.txt - inputtransforms.txt - old.txt + overview + extensions/index + ipython + integrating + editors + inputtransforms + old diff --git a/docs/source/development/index.rst b/docs/source/development/index.rst index d019ed1..87edb9a 100644 --- a/docs/source/development/index.rst +++ b/docs/source/development/index.rst @@ -20,7 +20,7 @@ on the IPython GitHub wiki. :maxdepth: 1 - gitwash/index.txt - messaging.txt - parallel_messages.txt - parallel_connections.txt + gitwash/index + messaging + parallel_messages + parallel_connections diff --git a/docs/source/development/messaging.rst b/docs/source/development/messaging.rst index 8600ea4..f146e34 100644 --- a/docs/source/development/messaging.rst +++ b/docs/source/development/messaging.rst @@ -1058,4 +1058,4 @@ Missing things include: * Signal handling: specify what kind of information kernel should broadcast (or not) when it receives signals. -.. include:: ../links.rst +.. include:: ../links.txt diff --git a/docs/source/index.rst b/docs/source/index.rst index c97d512..2ddf644 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -21,15 +21,15 @@ Contents .. toctree:: :maxdepth: 1 - overview.txt - whatsnew/index.txt - install/index.txt - interactive/index.txt - parallel/index.txt - config/index.txt - development/index.txt - api/index.txt - about/index.txt + overview + whatsnew/index + install/index + interactive/index + parallel/index + config/index + development/index + api/index + about/index .. htmlonly:: * :ref:`genindex` diff --git a/docs/source/install/index.rst b/docs/source/install/index.rst index 9879894..0fd8fd9 100644 --- a/docs/source/install/index.rst +++ b/docs/source/install/index.rst @@ -7,5 +7,5 @@ Installation .. toctree:: :maxdepth: 2 - install.txt + install diff --git a/docs/source/interactive/index.rst b/docs/source/interactive/index.rst index d342c7b..1ce17bc 100644 --- a/docs/source/interactive/index.rst +++ b/docs/source/interactive/index.rst @@ -5,11 +5,11 @@ Using IPython for interactive work .. toctree:: :maxdepth: 2 - tutorial.txt - tips.txt - reference.txt - shell.txt - qtconsole.txt - htmlnotebook.txt + tutorial + tips + reference + shell + qtconsole + htmlnotebook diff --git a/docs/source/parallel/index.rst b/docs/source/parallel/index.rst index be8b957..7da57a0 100644 --- a/docs/source/parallel/index.rst +++ b/docs/source/parallel/index.rst @@ -7,19 +7,19 @@ Using IPython for parallel computing .. toctree:: :maxdepth: 2 - parallel_intro.txt - parallel_process.txt - parallel_multiengine.txt - magics.txt - parallel_task.txt - asyncresult.txt - parallel_mpi.txt - parallel_db.txt - parallel_security.txt - parallel_winhpc.txt - parallel_demos.txt - dag_dependencies.txt - parallel_details.txt - parallel_transition.txt + parallel_intro + parallel_process + parallel_multiengine + magics + parallel_task + asyncresult + parallel_mpi + parallel_db + parallel_security + parallel_winhpc + parallel_demos + dag_dependencies + parallel_details + parallel_transition diff --git a/docs/source/parallel/winhpc_index.rst b/docs/source/parallel/winhpc_index.rst index d52da22..dad2e86 100644 --- a/docs/source/parallel/winhpc_index.rst +++ b/docs/source/parallel/winhpc_index.rst @@ -9,6 +9,6 @@ Contents .. toctree:: :maxdepth: 1 - parallel_winhpc.txt - parallel_demos.txt + parallel_winhpc + parallel_demos