Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/extending/keymaps.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Customize keymaps
which is not guaranteed to be kept in future versions of the notebook,
and can be removed or changed without warnings.

The notebook shortcuts that are defined by jupyter both in edit mode an command
The notebook shortcuts that are defined by jupyter both in edit mode and command
mode are configurable in the frontend configuration file
``~/.jupyter/nbconfig/notebook.json``. The modification of Keyboard shortcut
suffer of several limitations, mainly that your Browser and OS might prevent
Expand Down
4 changes: 2 additions & 2 deletions notebook/serverextensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ class ServerExtensionApp(BaseExtensionApp):
examples = _examples

subcommands = dict(
enable=(EnableServerExtensionApp, "Enable an server extension"),
disable=(DisableServerExtensionApp, "Disable an server extension"),
enable=(EnableServerExtensionApp, "Enable a server extension"),
disable=(DisableServerExtensionApp, "Disable a server extension"),
list=(ListServerExtensionsApp, "List server extensions")
)

Expand Down
2 changes: 1 addition & 1 deletion notebook/static/tree/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ require([
e.preventDefault();

// Set the hash without causing the page to jump.
// http://stackoverflow.com/a/14690177/2824256
// https://stackoverflow.com/a/14690177/2824256
var hash = $(this).attr("href");
if(window.history.pushState) {
window.history.pushState(null, null, hash);
Expand Down