diff --git a/IPython/lib/guisupport.py b/IPython/lib/guisupport.py index 5e13d43..cfd325e 100644 --- a/IPython/lib/guisupport.py +++ b/IPython/lib/guisupport.py @@ -2,7 +2,7 @@ """ Support for creating GUI apps and starting event loops. -IPython's GUI integration allows interative plotting and GUI usage in IPython +IPython's GUI integration allows interactive plotting and GUI usage in IPython session. IPython has two different types of GUI integration: 1. The terminal based IPython supports GUI event loops through Python's diff --git a/IPython/utils/text.py b/IPython/utils/text.py index cedd164..98d72f4 100644 --- a/IPython/utils/text.py +++ b/IPython/utils/text.py @@ -661,7 +661,7 @@ def compute_item_matrix(items, row_first=False, empty=None, *args, **kwargs) : empty : (default None) default value to fill list if needed separator_size : int (default=2) - How much caracters will be used as a separation between each columns. + How much characters will be used as a separation between each columns. displaywidth : int (default=80) The width of the area onto which the columns should enter diff --git a/docs/README.rst b/docs/README.rst index b5ba14e..c91290e 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -48,7 +48,7 @@ API documentation. This build target skips that. You can run ``make help`` to see information on all possible make targets. To save time, -the make targets above only proceess the files that have been changed since the +the make targets above only process the files that have been changed since the previous docs build. To remove the previous docs build you can use ``make clean``. You can also combine ``clean`` with other `make` commands; diff --git a/examples/IPython Kernel/Script Magics.ipynb b/examples/IPython Kernel/Script Magics.ipynb index f0bb6e0..a4ffdb6 100644 --- a/examples/IPython Kernel/Script Magics.ipynb +++ b/examples/IPython Kernel/Script Magics.ipynb @@ -436,7 +436,7 @@ "\n", " c.ScriptMagics.scripts = ['R', 'pypy', 'myprogram']\n", "\n", - "And if any of these programs do not apear on your default PATH, then you would also need to specify their location with:\n", + "And if any of these programs do not appear on your default PATH, then you would also need to specify their location with:\n", "\n", " c.ScriptMagics.script_paths = {'myprogram': '/opt/path/to/myprogram'}" ] diff --git a/tools/git-mpr.py b/tools/git-mpr.py index ac5e2b8..f048ed8 100755 --- a/tools/git-mpr.py +++ b/tools/git-mpr.py @@ -118,7 +118,7 @@ def main(*args): if not_merged : print('*************************************************************************************') - print('the following branch have not been merged automatically, considere doing it by hand :') + print('The following branch has not been merged automatically, consider doing it by hand :') for num, cmd in not_merged.items() : print( "PR {num}: {cmd}".format(num=num, cmd=cmd)) print('*************************************************************************************')