##// END OF EJS Templates
Merge pull request #3802 from ivanov/doc-to-rst...
Matthias Bussonnier -
r11764:79d36b57 merge
parent child Browse files
Show More
@@ -0,0 +1,16 b''
1 .. _config_index:
2
3 ===============================
4 Configuration and customization
5 ===============================
6
7 .. toctree::
8 :maxdepth: 2
9
10 overview
11 extensions/index
12 ipython
13 integrating
14 editors
15 inputtransforms
16 old
@@ -0,0 +1,15 b''
1 ==================================
2 Using IPython for interactive work
3 ==================================
4
5 .. toctree::
6 :maxdepth: 2
7
8 tutorial
9 tips
10 reference
11 shell
12 qtconsole
13 htmlnotebook
14
15
@@ -0,0 +1,25 b''
1 .. _parallel_index:
2
3 ====================================
4 Using IPython for parallel computing
5 ====================================
6
7 .. toctree::
8 :maxdepth: 2
9
10 parallel_intro
11 parallel_process
12 parallel_multiengine
13 magics
14 parallel_task
15 asyncresult
16 parallel_mpi
17 parallel_db
18 parallel_security
19 parallel_winhpc
20 parallel_demos
21 dag_dependencies
22 parallel_details
23 parallel_transition
24
25
@@ -110,11 +110,10 b' linkcheck:'
110 $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
110 $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
111 @echo
111 @echo
112 @echo "Link check complete; look for any errors in the above output " \
112 @echo "Link check complete; look for any errors in the above output " \
113 "or in build/linkcheck/output.txt."
113 "or in build/linkcheck/output.rst."
114
114
115 gitwash-update:
115 gitwash-update:
116 python ../tools/gitwash_dumper.py source/development ipython
116 python ../tools/gitwash_dumper.py source/development ipython
117 cd source/development/gitwash && rename 's/.rst/.txt/' *.rst
118
117
119 nightly: dist
118 nightly: dist
120 rsync -avH --delete dist/ ipython:www/doc/nightly
119 rsync -avH --delete dist/ ipython:www/doc/nightly
1 NO CONTENT: file renamed from docs/README.txt to docs/README.rst
NO CONTENT: file renamed from docs/README.txt to docs/README.rst
@@ -14,7 +14,7 b" if __name__ == '__main__':"
14 pjoin = os.path.join
14 pjoin = os.path.join
15 package = 'IPython'
15 package = 'IPython'
16 outdir = pjoin('source','api','generated')
16 outdir = pjoin('source','api','generated')
17 docwriter = ApiDocWriter(package,rst_extension='.txt')
17 docwriter = ApiDocWriter(package,rst_extension='.rst')
18 # You have to escape the . here because . is a special char for regexps.
18 # You have to escape the . here because . is a special char for regexps.
19 # You must do make clean if you change this!
19 # You must do make clean if you change this!
20 docwriter.package_skip_patterns += [r'\.fixes$',
20 docwriter.package_skip_patterns += [r'\.fixes$',
@@ -58,9 +58,9 b" if __name__ == '__main__':"
58 r'\.testing\.mkdoctests']
58 r'\.testing\.mkdoctests']
59 # Now, generate the outputs
59 # Now, generate the outputs
60 docwriter.write_api_docs(outdir)
60 docwriter.write_api_docs(outdir)
61 # Write index with .rst extension - we can include it, but Sphinx won't try
61 # Write index with .txt extension - we can include it, but Sphinx won't try
62 # to compile it
62 # to compile it
63 docwriter.write_index(outdir, 'gen.rst',
63 docwriter.write_index(outdir, 'gen.txt',
64 relative_to = pjoin('source','api')
64 relative_to = pjoin('source','api')
65 )
65 )
66 print ('%d files written' % len(docwriter.written_modules))
66 print ('%d files written' % len(docwriter.written_modules))
@@ -36,7 +36,7 b' FOR %%L IN (html pickle htmlhelp latex changes linkcheck) DO ('
36 )
36 )
37 IF "%1" == "linkcheck" (
37 IF "%1" == "linkcheck" (
38 ECHO Look for any errors in the above output
38 ECHO Look for any errors in the above output
39 ECHO or in build\linkcheck\output.txt.
39 ECHO or in build\linkcheck\output.rst.
40 )
40 )
41 GOTO END
41 GOTO END
42 )
42 )
1 NO CONTENT: file renamed from docs/source/about/credits.txt to docs/source/about/credits.rst
NO CONTENT: file renamed from docs/source/about/credits.txt to docs/source/about/credits.rst
1 NO CONTENT: file renamed from docs/source/about/history.txt to docs/source/about/history.rst
NO CONTENT: file renamed from docs/source/about/history.txt to docs/source/about/history.rst
1 NO CONTENT: file renamed from docs/source/about/index.txt to docs/source/about/index.rst
NO CONTENT: file renamed from docs/source/about/index.txt to docs/source/about/index.rst
1 NO CONTENT: file renamed from docs/source/about/license_and_copyright.txt to docs/source/about/license_and_copyright.rst
NO CONTENT: file renamed from docs/source/about/license_and_copyright.txt to docs/source/about/license_and_copyright.rst
@@ -9,4 +9,4 b''
9 :Release: |version|
9 :Release: |version|
10 :Date: |today|
10 :Date: |today|
11
11
12 .. include:: generated/gen.rst
12 .. include:: generated/gen.txt
1 NO CONTENT: file renamed from docs/source/attic/parallel_task_old.txt to docs/source/attic/parallel_task_old.rst
NO CONTENT: file renamed from docs/source/attic/parallel_task_old.txt to docs/source/attic/parallel_task_old.rst
@@ -67,7 +67,7 b' if ON_RTD:'
67 templates_path = ['_templates']
67 templates_path = ['_templates']
68
68
69 # The suffix of source filenames.
69 # The suffix of source filenames.
70 source_suffix = '.txt'
70 source_suffix = '.rst'
71
71
72 # The master toctree document.
72 # The master toctree document.
73 master_doc = 'index'
73 master_doc = 'index'
1 NO CONTENT: file renamed from docs/source/config/editors.txt to docs/source/config/editors.rst
NO CONTENT: file renamed from docs/source/config/editors.txt to docs/source/config/editors.rst
1 NO CONTENT: file renamed from docs/source/config/extensions/autoreload.txt to docs/source/config/extensions/autoreload.rst
NO CONTENT: file renamed from docs/source/config/extensions/autoreload.txt to docs/source/config/extensions/autoreload.rst
1 NO CONTENT: file renamed from docs/source/config/extensions/cythonmagic.txt to docs/source/config/extensions/cythonmagic.rst
NO CONTENT: file renamed from docs/source/config/extensions/cythonmagic.txt to docs/source/config/extensions/cythonmagic.rst
1 NO CONTENT: file renamed from docs/source/config/extensions/index.txt to docs/source/config/extensions/index.rst
NO CONTENT: file renamed from docs/source/config/extensions/index.txt to docs/source/config/extensions/index.rst
1 NO CONTENT: file renamed from docs/source/config/extensions/octavemagic.txt to docs/source/config/extensions/octavemagic.rst
NO CONTENT: file renamed from docs/source/config/extensions/octavemagic.txt to docs/source/config/extensions/octavemagic.rst
1 NO CONTENT: file renamed from docs/source/config/extensions/rmagic.txt to docs/source/config/extensions/rmagic.rst
NO CONTENT: file renamed from docs/source/config/extensions/rmagic.txt to docs/source/config/extensions/rmagic.rst
1 NO CONTENT: file renamed from docs/source/config/extensions/storemagic.txt to docs/source/config/extensions/storemagic.rst
NO CONTENT: file renamed from docs/source/config/extensions/storemagic.txt to docs/source/config/extensions/storemagic.rst
1 NO CONTENT: file renamed from docs/source/config/extensions/sympyprinting.txt to docs/source/config/extensions/sympyprinting.rst
NO CONTENT: file renamed from docs/source/config/extensions/sympyprinting.txt to docs/source/config/extensions/sympyprinting.rst
1 NO CONTENT: file renamed from docs/source/config/inputtransforms.txt to docs/source/config/inputtransforms.rst
NO CONTENT: file renamed from docs/source/config/inputtransforms.txt to docs/source/config/inputtransforms.rst
1 NO CONTENT: file renamed from docs/source/config/integrating.txt to docs/source/config/integrating.rst
NO CONTENT: file renamed from docs/source/config/integrating.txt to docs/source/config/integrating.rst
1 NO CONTENT: file renamed from docs/source/config/ipython.txt to docs/source/config/ipython.rst
NO CONTENT: file renamed from docs/source/config/ipython.txt to docs/source/config/ipython.rst
1 NO CONTENT: file renamed from docs/source/config/old.txt to docs/source/config/old.rst
NO CONTENT: file renamed from docs/source/config/old.txt to docs/source/config/old.rst
1 NO CONTENT: file renamed from docs/source/config/overview.txt to docs/source/config/overview.rst
NO CONTENT: file renamed from docs/source/config/overview.txt to docs/source/config/overview.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/configure_git.txt to docs/source/development/gitwash/configure_git.rst
NO CONTENT: file renamed from docs/source/development/gitwash/configure_git.txt to docs/source/development/gitwash/configure_git.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/development_workflow.txt to docs/source/development/gitwash/development_workflow.rst
NO CONTENT: file renamed from docs/source/development/gitwash/development_workflow.txt to docs/source/development/gitwash/development_workflow.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/dot2_dot3.txt to docs/source/development/gitwash/dot2_dot3.rst
NO CONTENT: file renamed from docs/source/development/gitwash/dot2_dot3.txt to docs/source/development/gitwash/dot2_dot3.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/following_latest.txt to docs/source/development/gitwash/following_latest.rst
NO CONTENT: file renamed from docs/source/development/gitwash/following_latest.txt to docs/source/development/gitwash/following_latest.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/forking_hell.txt to docs/source/development/gitwash/forking_hell.rst
NO CONTENT: file renamed from docs/source/development/gitwash/forking_hell.txt to docs/source/development/gitwash/forking_hell.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/git_development.txt to docs/source/development/gitwash/git_development.rst
NO CONTENT: file renamed from docs/source/development/gitwash/git_development.txt to docs/source/development/gitwash/git_development.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/git_install.txt to docs/source/development/gitwash/git_install.rst
NO CONTENT: file renamed from docs/source/development/gitwash/git_install.txt to docs/source/development/gitwash/git_install.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/git_resources.txt to docs/source/development/gitwash/git_resources.rst
NO CONTENT: file renamed from docs/source/development/gitwash/git_resources.txt to docs/source/development/gitwash/git_resources.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/index.txt to docs/source/development/gitwash/index.rst
NO CONTENT: file renamed from docs/source/development/gitwash/index.txt to docs/source/development/gitwash/index.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/patching.txt to docs/source/development/gitwash/patching.rst
NO CONTENT: file renamed from docs/source/development/gitwash/patching.txt to docs/source/development/gitwash/patching.rst
1 NO CONTENT: file renamed from docs/source/development/gitwash/set_up_fork.txt to docs/source/development/gitwash/set_up_fork.rst
NO CONTENT: file renamed from docs/source/development/gitwash/set_up_fork.txt to docs/source/development/gitwash/set_up_fork.rst
@@ -20,7 +20,7 b' on the IPython GitHub wiki.'
20 :maxdepth: 1
20 :maxdepth: 1
21
21
22
22
23 gitwash/index.txt
23 gitwash/index
24 messaging.txt
24 messaging
25 parallel_messages.txt
25 parallel_messages
26 parallel_connections.txt
26 parallel_connections
1 NO CONTENT: file renamed from docs/source/development/inputhook_app.txt to docs/source/development/inputhook_app.rst
NO CONTENT: file renamed from docs/source/development/inputhook_app.txt to docs/source/development/inputhook_app.rst
@@ -1058,4 +1058,4 b' Missing things include:'
1058 * Signal handling: specify what kind of information kernel should broadcast (or
1058 * Signal handling: specify what kind of information kernel should broadcast (or
1059 not) when it receives signals.
1059 not) when it receives signals.
1060
1060
1061 .. include:: ../links.rst
1061 .. include:: ../links.txt
1 NO CONTENT: file renamed from docs/source/development/parallel_connections.txt to docs/source/development/parallel_connections.rst
NO CONTENT: file renamed from docs/source/development/parallel_connections.txt to docs/source/development/parallel_connections.rst
1 NO CONTENT: file renamed from docs/source/development/parallel_messages.txt to docs/source/development/parallel_messages.rst
NO CONTENT: file renamed from docs/source/development/parallel_messages.txt to docs/source/development/parallel_messages.rst
@@ -21,15 +21,15 b' Contents'
21 .. toctree::
21 .. toctree::
22 :maxdepth: 1
22 :maxdepth: 1
23
23
24 overview.txt
24 overview
25 whatsnew/index.txt
25 whatsnew/index
26 install/index.txt
26 install/index
27 interactive/index.txt
27 interactive/index
28 parallel/index.txt
28 parallel/index
29 config/index.txt
29 config/index
30 development/index.txt
30 development/index
31 api/index.txt
31 api/index
32 about/index.txt
32 about/index
33
33
34 .. htmlonly::
34 .. htmlonly::
35 * :ref:`genindex`
35 * :ref:`genindex`
@@ -7,5 +7,5 b' Installation'
7 .. toctree::
7 .. toctree::
8 :maxdepth: 2
8 :maxdepth: 2
9
9
10 install.txt
10 install
11
11
1 NO CONTENT: file renamed from docs/source/install/install.txt to docs/source/install/install.rst
NO CONTENT: file renamed from docs/source/install/install.txt to docs/source/install/install.rst
1 NO CONTENT: file renamed from docs/source/interactive/htmlnotebook.txt to docs/source/interactive/htmlnotebook.rst
NO CONTENT: file renamed from docs/source/interactive/htmlnotebook.txt to docs/source/interactive/htmlnotebook.rst
1 NO CONTENT: file renamed from docs/source/interactive/qtconsole.txt to docs/source/interactive/qtconsole.rst
NO CONTENT: file renamed from docs/source/interactive/qtconsole.txt to docs/source/interactive/qtconsole.rst
1 NO CONTENT: file renamed from docs/source/interactive/reference.txt to docs/source/interactive/reference.rst
NO CONTENT: file renamed from docs/source/interactive/reference.txt to docs/source/interactive/reference.rst
1 NO CONTENT: file renamed from docs/source/interactive/shell.txt to docs/source/interactive/shell.rst
NO CONTENT: file renamed from docs/source/interactive/shell.txt to docs/source/interactive/shell.rst
1 NO CONTENT: file renamed from docs/source/interactive/tips.txt to docs/source/interactive/tips.rst
NO CONTENT: file renamed from docs/source/interactive/tips.txt to docs/source/interactive/tips.rst
1 NO CONTENT: file renamed from docs/source/interactive/tutorial.txt to docs/source/interactive/tutorial.rst
NO CONTENT: file renamed from docs/source/interactive/tutorial.txt to docs/source/interactive/tutorial.rst
1 NO CONTENT: file renamed from docs/source/links.rst to docs/source/links.txt
NO CONTENT: file renamed from docs/source/links.rst to docs/source/links.txt
1 NO CONTENT: file renamed from docs/source/overview.txt to docs/source/overview.rst
NO CONTENT: file renamed from docs/source/overview.txt to docs/source/overview.rst
1 NO CONTENT: file renamed from docs/source/parallel/asyncresult.txt to docs/source/parallel/asyncresult.rst
NO CONTENT: file renamed from docs/source/parallel/asyncresult.txt to docs/source/parallel/asyncresult.rst
1 NO CONTENT: file renamed from docs/source/parallel/dag_dependencies.txt to docs/source/parallel/dag_dependencies.rst
NO CONTENT: file renamed from docs/source/parallel/dag_dependencies.txt to docs/source/parallel/dag_dependencies.rst
1 NO CONTENT: file renamed from docs/source/parallel/magics.txt to docs/source/parallel/magics.rst
NO CONTENT: file renamed from docs/source/parallel/magics.txt to docs/source/parallel/magics.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_db.txt to docs/source/parallel/parallel_db.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_db.txt to docs/source/parallel/parallel_db.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_demos.txt to docs/source/parallel/parallel_demos.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_demos.txt to docs/source/parallel/parallel_demos.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_details.txt to docs/source/parallel/parallel_details.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_details.txt to docs/source/parallel/parallel_details.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_intro.txt to docs/source/parallel/parallel_intro.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_intro.txt to docs/source/parallel/parallel_intro.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_mpi.txt to docs/source/parallel/parallel_mpi.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_mpi.txt to docs/source/parallel/parallel_mpi.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_multiengine.txt to docs/source/parallel/parallel_multiengine.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_multiengine.txt to docs/source/parallel/parallel_multiengine.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_process.txt to docs/source/parallel/parallel_process.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_process.txt to docs/source/parallel/parallel_process.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_security.txt to docs/source/parallel/parallel_security.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_security.txt to docs/source/parallel/parallel_security.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_task.txt to docs/source/parallel/parallel_task.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_task.txt to docs/source/parallel/parallel_task.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_transition.txt to docs/source/parallel/parallel_transition.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_transition.txt to docs/source/parallel/parallel_transition.rst
1 NO CONTENT: file renamed from docs/source/parallel/parallel_winhpc.txt to docs/source/parallel/parallel_winhpc.rst
NO CONTENT: file renamed from docs/source/parallel/parallel_winhpc.txt to docs/source/parallel/parallel_winhpc.rst
@@ -9,6 +9,6 b' Contents'
9 .. toctree::
9 .. toctree::
10 :maxdepth: 1
10 :maxdepth: 1
11
11
12 parallel_winhpc.txt
12 parallel_winhpc
13 parallel_demos.txt
13 parallel_demos
14
14
1 NO CONTENT: file renamed from docs/source/whatsnew/development.txt to docs/source/whatsnew/development.rst
NO CONTENT: file renamed from docs/source/whatsnew/development.txt to docs/source/whatsnew/development.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/github-stats-0.11.txt to docs/source/whatsnew/github-stats-0.11.rst
NO CONTENT: file renamed from docs/source/whatsnew/github-stats-0.11.txt to docs/source/whatsnew/github-stats-0.11.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/github-stats-0.12.txt to docs/source/whatsnew/github-stats-0.12.rst
NO CONTENT: file renamed from docs/source/whatsnew/github-stats-0.12.txt to docs/source/whatsnew/github-stats-0.12.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/github-stats-0.13.txt to docs/source/whatsnew/github-stats-0.13.rst
NO CONTENT: file renamed from docs/source/whatsnew/github-stats-0.13.txt to docs/source/whatsnew/github-stats-0.13.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/github-stats-1.0.txt to docs/source/whatsnew/github-stats-1.0.rst
NO CONTENT: file renamed from docs/source/whatsnew/github-stats-1.0.txt to docs/source/whatsnew/github-stats-1.0.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/index.txt to docs/source/whatsnew/index.rst
NO CONTENT: file renamed from docs/source/whatsnew/index.txt to docs/source/whatsnew/index.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/version0.10.txt to docs/source/whatsnew/version0.10.rst
NO CONTENT: file renamed from docs/source/whatsnew/version0.10.txt to docs/source/whatsnew/version0.10.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/version0.11.txt to docs/source/whatsnew/version0.11.rst
NO CONTENT: file renamed from docs/source/whatsnew/version0.11.txt to docs/source/whatsnew/version0.11.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/version0.12.txt to docs/source/whatsnew/version0.12.rst
NO CONTENT: file renamed from docs/source/whatsnew/version0.12.txt to docs/source/whatsnew/version0.12.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/version0.13.txt to docs/source/whatsnew/version0.13.rst
NO CONTENT: file renamed from docs/source/whatsnew/version0.13.txt to docs/source/whatsnew/version0.13.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/version0.8.txt to docs/source/whatsnew/version0.8.rst
NO CONTENT: file renamed from docs/source/whatsnew/version0.8.txt to docs/source/whatsnew/version0.8.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/version0.9.txt to docs/source/whatsnew/version0.9.rst
NO CONTENT: file renamed from docs/source/whatsnew/version0.9.txt to docs/source/whatsnew/version0.9.rst
1 NO CONTENT: file renamed from docs/source/whatsnew/version1.0.txt to docs/source/whatsnew/version1.0.rst
NO CONTENT: file renamed from docs/source/whatsnew/version1.0.txt to docs/source/whatsnew/version1.0.rst
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now