Skip to content

Commit f5a3417

Browse files
authored
Merge pull request #3800 from Xctrunner/master
fixing grammatical errors and typos
2 parents d129f78 + ecc4d26 commit f5a3417

File tree

2 files changed

+27
-26
lines changed

2 files changed

+27
-26
lines changed

docs/source/extending/frontend_extensions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Defining and registering your own actions
141141
As part of your front-end extension, you may wish to define actions, which can
142142
be attached to toolbar buttons, or called from the command palette. Here is an
143143
example of an extension that defines an (not very useful!) action to show an
144-
alert, and adds a toolabr button using the full action name:
144+
alert, and adds a toolbar button using the full action name:
145145

146146
.. code:: javascript
147147

docs/source/extending/keymaps.rst

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ Customize keymaps
77
which is not guaranteed to be kept in future versions of the notebook,
88
and can be removed or changed without warnings.
99

10-
The notebook shortcuts that are defined by jupyter both in edit mode and command
11-
mode are configurable in the frontend configuration file
12-
``~/.jupyter/nbconfig/notebook.json``. The modification of Keyboard shortcut
13-
suffer of several limitations, mainly that your Browser and OS might prevent
14-
certain shortcut to work correctly. If this is the case, there are
15-
unfortunately not much than can be done. The second issue can arise with
16-
keyboard that have a layout different than US English. Again even if we are
17-
aware of the issue, there is not much we can do about that.
10+
The notebook shortcuts that are defined by jupyter both in edit mode and
11+
command mode are configurable in the frontend configuration file
12+
``~/.jupyter/nbconfig/notebook.json``. The modification of keyboard
13+
shortcuts suffers from several limitations, mainly that your Browser and OS
14+
might prevent certain shortcuts from working correctly. If this is the case,
15+
there is unfortunately not much that can be done. The second issue can arise
16+
with keyboards that have a layout different than US English. Again, even if
17+
we are aware of the issue, there is not much that can be done.
1818

19-
Shortcut are also limited by the underlying library that handle code and text
20-
edition: CodeMirror. If some Keyboard shortcuts are conflicting, the method
21-
describe below might not work to create new keyboard shortcuts, especially in
22-
the ``edit`` mode of the notebook.
19+
Shortcuts are also limited by the underlying library that handles code and
20+
text editing: CodeMirror. If some keyboard shortcuts are conflicting, the
21+
method described below might not work to create new keyboard shortcuts,
22+
especially in the ``edit`` mode of the notebook.
2323

2424

2525
The 4 sections of interest in ``~/.jupyter/nbconfig/notebook.json`` are the
@@ -30,15 +30,16 @@ following:
3030
- ``keys.command.bind``
3131
- ``keys.edit.bind``
3232

33-
The first two section describe which default keyboard shortcut not to register
34-
at notebook startup time. These are mostly useful if you need to ``unbind`` a
35-
default keyboard shortcut before binding it to a new ``command``.
33+
The first two sections describe which default keyboard shortcuts not to
34+
register at notebook startup time. These are mostly useful if you need to
35+
``unbind`` a default keyboard shortcut before binding it to a new
36+
``command``.
3637

37-
These two first sections apply respectively to the ``command`` and ``edit``
38-
mode of the notebook. They take a list of shortcut to ``unbind``.
38+
The first two sections apply respectively to the ``command`` and ``edit``
39+
mode of the notebook. They take a list of shortcuts to ``unbind``.
3940

4041
For example, to unbind the shortcut to split a cell at the position of the
41-
cursor (``Ctrl-Shift-Minus``)use the following:
42+
cursor (``Ctrl-Shift-Minus``) use the following:
4243

4344
.. code:: javascript
4445
@@ -57,16 +58,16 @@ cursor (``Ctrl-Shift-Minus``)use the following:
5758
5859
5960
60-
The last two section describe which new keyboard shortcut to register
61-
at notebook startup time, and which actions they trigger.
61+
The last two sections describe which new keyboard shortcuts to register
62+
at notebook startup time and which actions they trigger.
6263

63-
These two last sections apply respectively to the ``command`` and ``edit``
64+
The last two sections apply respectively to the ``command`` and ``edit``
6465
mode of the notebook. They take a dictionary with shortcuts as ``keys`` and
6566
``commands`` name as value.
6667

6768
For example, to bind the shortcut ``G,G,G`` (Press G three time in a row) in
68-
command mode, to the command that restart the kernel and run all cells, use the
69-
following:
69+
command mode to the command that restarts the kernel and runs all cells, use
70+
the following:
7071

7172

7273
.. code:: javascript
@@ -86,5 +87,5 @@ following:
8687
8788
8889
89-
The name of the available ``commands`` can be find by hovering the right end of
90-
a row in the command palette.
90+
The name of the available ``commands`` can be find by hovering over the
91+
right end of a row in the command palette.

0 commit comments

Comments
 (0)