diff --git a/IPython/core/completer.py b/IPython/core/completer.py index 80fa4dd..5032aa5 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -485,7 +485,7 @@ def back_unicode_name_matches(text): Note that snowman is not a valid python3 combining character but will be expanded. Though it will not recombine back to the snowman character by the completion machinery. - This will not either back-complete standard sequences like \n, \b ... + This will not either back-complete standard sequences like \\n, \\b ... Used on Python 3 only. """ diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py index 1a39d6f..4db116a 100644 --- a/IPython/core/magics/pylab.py +++ b/IPython/core/magics/pylab.py @@ -86,11 +86,11 @@ class PylabMagics(Magics): In [3]: %matplotlib qt - You can list the available backends using the -l/--list option + You can list the available backends using the -l/--list option:: In [4]: %matplotlib --list Available matplotlib backends: ['osx', 'qt4', 'qt5', 'gtk3', 'notebook', 'wx', 'qt', 'nbagg', - 'gtk', 'tk', 'inline'] + 'gtk', 'tk', 'inline'] """ args = magic_arguments.parse_argstring(self.matplotlib, line) if args.list: diff --git a/docs/source/interactive/tutorial.rst b/docs/source/interactive/tutorial.rst index 05ac62a..1113d9a 100644 --- a/docs/source/interactive/tutorial.rst +++ b/docs/source/interactive/tutorial.rst @@ -190,6 +190,8 @@ Profiles allow you to use IPython for different tasks, keeping separate config files and history for each one. More details in :ref:`the profiles section `. +.. _startup_files: + Startup Files ------------- diff --git a/docs/source/whatsnew/github-stats-3.rst b/docs/source/whatsnew/github-stats-3.rst index 32d5bea..2abd3fa 100644 --- a/docs/source/whatsnew/github-stats-3.rst +++ b/docs/source/whatsnew/github-stats-3.rst @@ -11,7 +11,7 @@ GitHub stats for 2015/02/27 - 2015/04/03 (since 3.0) These lists are automatically generated, and may be incomplete or contain duplicates. We closed 46 issues and merged 133 pull requests. -The full list can be seen `on GitHub `_. +The full list can be seen `on GitHub `__. The following 33 authors contributed 344 commits: @@ -58,7 +58,7 @@ GitHub stats for 2014/04/02 - 2015/02/13 (since 2.0) These lists are automatically generated, and may be incomplete or contain duplicates. We closed 469 issues and merged 925 pull requests. -The full list can be seen `on GitHub `_. +The full list can be seen `on GitHub `__. The following 155 authors contributed 5975 commits. diff --git a/docs/source/whatsnew/version0.11.rst b/docs/source/whatsnew/version0.11.rst index 3c45c55..44c64e9 100644 --- a/docs/source/whatsnew/version0.11.rst +++ b/docs/source/whatsnew/version0.11.rst @@ -253,8 +253,8 @@ Twisted is itself a Python library. So while Twisted is a very capable framework, we think ZeroMQ fits our needs much better and we hope you will find the change to be a significant improvement in the long run. -Our manual contains :ref:`a full description of how to use IPython for parallel -computing `, and the `tutorial`__ presented by Min +Our manual contains a full description of how to use IPython for parallel +computing, and the `tutorial`__ presented by Min Ragan-Kelley at the SciPy 2011 conference provides a hands-on complement to the reference docs. @@ -287,7 +287,7 @@ that assigning values is pure Python assignment. Simple flags exist for commonly used options, these are always prefixed with '--'. The IPython command-line help has the details of all the options (via -``ipythyon --help``), but a simple example should clarify things; the ``pylab`` +``ipython --help``), but a simple example should clarify things; the ``pylab`` flag can be used to start in pylab mode with the qt4 backend:: ipython --pylab=qt diff --git a/docs/source/whatsnew/version0.13.rst b/docs/source/whatsnew/version0.13.rst index 622c9ea..b1106eb 100644 --- a/docs/source/whatsnew/version0.13.rst +++ b/docs/source/whatsnew/version0.13.rst @@ -283,7 +283,7 @@ that provide specialized magics. These typically require additional software to run and must be manually loaded via ``%load_ext ``, but are extremely useful. The following extensions are provided: -**Cython magics** (extension :ref:`cythonmagic `) +**Cython magics** (extension ``cythonmagic``) This extension provides magics to automatically build and compile Python extension modules using the Cython_ language. You must install Cython separately, as well as a C compiler, for this to work. The examples @@ -425,7 +425,7 @@ of the internal execution parts: The parallel tools now default to using ``NoDB`` as the storage backend for intermediate results. This means that the default usage case will have a significantly reduced memory footprint, though certain advanced features are -not available with this backend. For more details, see :ref:`parallel_db`. +not available with this backend. The parallel magics now display all output, so you can do parallel plotting or other actions with complex display. The ``px`` magic has now both line and cell @@ -530,10 +530,7 @@ The directory ``docs/resources`` in the source distribution contains SVG and PNG versions of our file icons, as well as an ``Info.plist.example`` file with instructions to install them on Mac OSX. This is a first draft of our icons, and we encourage contributions from users with graphic talent to improve them -in the future: - -.. image:: ../../resources/ipynb_icon_128x128.png - :alt: IPython notebook file icon. +in the future. New top-level `locate` command diff --git a/tools/github_stats.py b/tools/github_stats.py index 65691f0..e170887 100755 --- a/tools/github_stats.py +++ b/tools/github_stats.py @@ -212,7 +212,7 @@ if __name__ == "__main__": print("We closed %d issues and merged %d pull requests." % (n_issues, n_pulls)) if milestone: - print("The full list can be seen `on GitHub `" + print("The full list can be seen `on GitHub `__" % (project, milestone) )