Fix typos (#4760)

* Fix typos

* Revert trimming whitespaces

* Revert trimming whitespaces

* Revert trimming whitespaces

* Revert trimming whitespaces

* Revert trimming whitespaces

docs/source/changelog.rst

@@ -995,7 +995,7 @@ Bug fixes:
 - :code:`json_errors` should be outermost decorator on API handlers
 - Fix remove old nbserver info files
 - Fix notebook mime type on download links
-- Fix carriage symbol bahvior
+- Fix carriage symbol behavior
 - Fix terminal styles
 - Update dead links in docs
 - If kernel is broken, start a new session

docs/source/examples/Notebook/Distributing Jupyter Extensions as Python Packages.ipynb

@@ -439,7 +439,7 @@
     "        \"name\": \"tarball_bundler\",\n",
     "        # module containing bundle function\n",
     "        \"module_name\": \"my_tarball_bundler\",\n",
-    "        # human-redable menu item label\n",
+    "        # human-readable menu item label\n",
     "        \"label\" : \"Notebook Tarball (tar.gz)\",\n",
     "        # group under 'deploy' or 'download' menu\n",
     "        \"group\" : \"download\",\n",

docs/source/extending/bundler_extensions.rst

@@ -39,7 +39,7 @@ when enabling the bundler extension. (See :ref:`enabling-bundlers`.)
         """Example "hello world" bundler extension"""
         return [{
             'name': 'hello_bundler',                    # unique bundler name
-            'label': 'Hello Bundler',                   # human-redable menu item label
+            'label': 'Hello Bundler',                   # human-readable menu item label
             'module_name': 'mypackage.hello_bundler',   # module containing bundle()
             'group': 'deploy'                           # group under 'deploy' or 'download' menu
         }]
@@ -150,7 +150,7 @@ bundlers for single users, configuring bundlers system-wide, etc.
 Example: IPython Notebook bundle (.zip)
 ---------------------------------------
 
-The `hello_bundler` example in this documentation is simplisitic in the name
+The `hello_bundler` example in this documentation is simplistic in the name
 of brevity. For more meaningful examples, see
 `notebook/bundler/zip_bundler.py` and `notebook/bundler/tarball_bundler.py`.
 You can enable them to try them like so:

notebook/bundler/tarball_bundler.py

@@ -12,7 +12,7 @@ def _jupyter_bundlerextension_paths():
         "name": "tarball_bundler",
         # module containing bundle function
         "module_name": "notebook.bundler.tarball_bundler",
-        # human-redable menu item label
+        # human-readable menu item label
         "label" : "Notebook Tarball (tar.gz)",
         # group under 'deploy' or 'download' menu
         "group" : "download",

notebook/extensions.py

@@ -75,7 +75,7 @@ class BaseExtensionApp(JupyterApp):
 def _get_config_dir(user=False, sys_prefix=False):
     """Get the location of config files for the current context
 
-    Returns the string to the enviornment
+    Returns the string to the environment
 
     Parameters
     ----------

notebook/i18n/README.md

@@ -116,7 +116,7 @@ communicate this back to Jinja2.  So far, I haven't yet figured out how to do th
 of languages in the UI ( never a good thing ).
 
 2. We will need to decide if console messages should be translatable, and enable them if desired.
-3. The keyboard shorcut editor was implemented after the i18n work was completed, so that portion
+3. The keyboard shortcut editor was implemented after the i18n work was completed, so that portion
 does not have translation support at this time.
 4. Babel's documentation has instructions on how to integrate messages extraction
 into your *setup.py* so that eventually we can just do:

notebook/notebookapp.py

@@ -1366,7 +1366,7 @@ class NotebookApp(JupyterApp):
 
     def init_logging(self):
         # This prevents double log messages because tornado use a root logger that
-        # self.log is a child of. The logging module dipatches log messages to a log
+        # self.log is a child of. The logging module dispatches log messages to a log
         # and all of its ancenstors until propagate is set to False.
         self.log.propagate = False
         

notebook/services/contents/fileio.py

@@ -192,8 +192,8 @@ class FileManagerMixin(Configurable):
     """
 
     use_atomic_writing = Bool(True, config=True, help=
-    """By default notebooks are saved on disk on a temporary file and then if succefully written, it replaces the old ones.
-      This procedure, namely 'atomic_writing', causes some bugs on file system whitout operation order enforcement (like some networked fs).
+    """By default notebooks are saved on disk on a temporary file and then if successfully written, it replaces the old ones.
+      This procedure, namely 'atomic_writing', causes some bugs on file system without operation order enforcement (like some networked fs).
       If set to False, the new notebook is written directly on the old one which could fail (eg: full filesystem or quota )""")
 
     @contextmanager

notebook/static/base/js/events.js

@@ -18,7 +18,7 @@ define(['jquery', 'base/js/namespace'], function($, Jupyter) {
         window._events = new window._Events();
     }
     
-    // Backwards compatability.
+    // Backwards compatibility.
     Jupyter.Events = window._Events;
     Jupyter.events = window._events;
     

notebook/static/base/js/keyboard.js

@@ -384,7 +384,7 @@ define([
         } else {
             if(typeof(current_node) === 'string'){
                 console.warn('you are trying to set a shortcut that will be shadowed'+
-                             'by a more specific one. Aborting for :', action_name, 'the follwing '+
+                             'by a more specific one. Aborting for :', action_name, 'the following '+
                              'will take precedence', current_node);
                 return false;
             } else {
@@ -494,7 +494,7 @@ define([
 
     ShortcutManager.prototype.remove_shortcut = function (shortcut, suppress_help_update) {
         /**
-         * Remove the binding of shortcut `sortcut` with its action.
+         * Remove the binding of shortcut `shortcut` with its action.
          * throw an error if trying to remove a non-exiting shortcut
          **/
         if(!shortcut){

notebook/static/base/js/utils.js

@@ -736,7 +736,7 @@ define([
     var requireCodeMirrorMode = function (mode, callback, errback) {
         /** 
          * find a predefined mode or detect from CM metadata then
-         * require and callback with the resolveable mode string: mime or
+         * require and callback with the resolvable mode string: mime or
          * custom name
          */
 

notebook/static/base/less/flexbox.less

@@ -2,7 +2,7 @@
 /* Flexible box model classes */
 /* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
 
-/* This file is a compatability layer.  It allows the usage of flexible box 
+/* This file is a compatibility layer.  It allows the usage of flexible box 
 model layouts accross multiple browsers, including older browsers.  The newest,
 universal implementation of the flexible box model is used when available (see
 `Modern browsers` comments below).  Browsers that are known to implement this 

notebook/static/edit/js/main.js

@@ -92,7 +92,7 @@ requirejs([
         }
     };
 
-    // Make sure the codemirror editor is sized appropriatley.
+    // Make sure the codemirror editor is sized appropriately.
     var _handle_resize = function() {
         var backdrop = $("#texteditor-backdrop");
 

notebook/static/notebook/js/actions.js

@@ -708,13 +708,13 @@ define([
      * A bunch of `Advance actions` for Jupyter.
      * Cf `Simple Action` plus the following properties.
      *
-     * handler: first argument of the handler is the event that triggerd the action
+     * handler: first argument of the handler is the event that triggered the action
      *      (typically keypress). The handler is responsible for any modification of the
      *      event and event propagation.
      *      Is also responsible for returning false if the event have to be further ignored,
      *      true, to tell keyboard manager that it ignored the event.
      *
-     *      the second parameter of the handler is the environemnt passed to Simple Actions
+     *      the second parameter of the handler is the environment passed to Simple Actions
      *
      **/
     var custom_ignore = {

notebook/static/notebook/js/cell.js

@@ -467,14 +467,14 @@ define([
     };
 
     /**
-     * should be overritten by subclass
+     * should be overwritten by subclass
      * @method get_text
      */
     Cell.prototype.get_text = function () {
     };
 
     /**
-     * should be overritten by subclass
+     * should be overwritten by subclass
      * @method set_text
      * @param {string} text
      */
@@ -482,7 +482,7 @@ define([
     };
 
     /**
-     * should be overritten by subclass
+     * should be overwritten by subclass
      * serialise cell to json.
      * @method toJSON
      **/
@@ -504,7 +504,7 @@ define([
     };
 
     /**
-     * should be overritten by subclass
+     * should be overwritten by subclass
      * @method fromJSON
      **/
     Cell.prototype.fromJSON = function (data) {

notebook/static/notebook/js/celltoolbar.js

@@ -167,7 +167,7 @@ define([
      * @param name {String} name to use to refer to the preset. It is advised to use a prefix with the name
      * for easier sorting and avoid collision
      * @param  preset_list {List_of_String} reverse order of the button in the toolbar. Each String of the list
-     *          should correspond to a name of a registerd callback.
+     *          should correspond to a name of a registered callback.
      *
      * @private
      * @example
@@ -268,7 +268,7 @@ define([
      */
     CellToolbar.prototype.rebuild = function(){
         /**
-         * strip evrything from the div
+         * strip everything from the div
          * which is probably inner_element
          * or this.element.
          */
@@ -337,7 +337,7 @@ define([
      *              // set the value
      *              cell.metadata.slideshow.isSectionStart = value
      *              },
-     *          //geter
+     *          // getter
      *          function(cell){ var ns = cell.metadata.slideshow;
      *              // if the slideshow namespace does not exist return `undefined`
      *              // (will be interpreted as `false` by checkbox) otherwise
@@ -403,14 +403,14 @@ define([
      * @static
      *
      * @param list_list {list_of_sublist} List of sublist of metadata value and name in the dropdown list.
-     *        subslit shoud contain 2 element each, first a string that woul be displayed in the dropdown list,
-     *        and second the corresponding value to  be passed to setter/return by getter. the corresponding value 
+     *        subslit should contain 2 element each, first a string that woul be displayed in the dropdown list,
+     *        and second the corresponding value to  be passed to setter/return by getter. the corresponding value
      *        should not be "undefined" or behavior can be unexpected.
      * @param setter {function( cell, newValue )}
      *        A setter method to set the newValue
      * @param getter {function( cell )}
      *        A getter methods which return the current value of the metadata.
-     * @param [label=""] {String} optionnal label for the dropdown menu
+     * @param [label=""] {String} optional label for the dropdown menu
      *
      * @return callback {function( div, cell )} Callback to be passed to `register_callback`
      *
@@ -430,7 +430,7 @@ define([
      *                  // set the value
      *                  cell.metadata.slideshow.slide_type = value
      *                  },
-     *              //geter
+     *              // getter
      *              function(cell){ var ns = cell.metadata.slideshow;
      *                  // if the slideshow namespace does not exist return `undefined`
      *                  // (will be interpreted as `false` by checkbox) otherwise
@@ -463,7 +463,7 @@ define([
         };
     };
 
-    // Backwards compatability.
+    // Backwards compatibility.
     IPython.CellToolbar = CellToolbar;
 
     return {'CellToolbar': CellToolbar};

notebook/static/notebook/js/celltoolbarpresets/example.js

@@ -64,7 +64,7 @@ define([
              // set the value
              cell.metadata.yn_test.value = value;
              },
-         //geter
+         // getter
          function(cell){ var ns = cell.metadata.yn_test;
              // if the slideshow namespace does not exist return `undefined`
              // (will be interpreted as `false` by checkbox) otherwise
@@ -91,7 +91,7 @@ define([
                 // set the value
                 cell.metadata.test.slide_type = value;
                 },
-            //geter
+            // getter
             function(cell){ var ns = cell.metadata.test;
                 // if the slideshow namespace does not exist return `undefined`
                 // (will be interpreted as `false` by checkbox) otherwise
@@ -122,7 +122,7 @@ define([
     var add_simple_dialog_button = function(div, cell) {
         var help_text = ["This is the Metadata editting UI.",
                          "It heavily rely on plugin to work ",
-                         "and is still under developpement. You shouldn't wait too long before",
+                         "and is still under development. You shouldn't wait too long before",
                          " seeing some customisable buttons in those toolbar."
                         ].join('\n');
         var button_container = $(div);

notebook/static/notebook/js/celltoolbarpresets/slideshow.js

@@ -25,7 +25,7 @@ define([
                 // set the value
                 cell.metadata.slideshow.slide_type = value;
                 },
-            //geter
+            // getter
             function(cell){ var ns = cell.metadata.slideshow;
                 // if the slideshow namespace does not exist return `undefined`
                 // (will be interpreted as `false` by checkbox) otherwise

notebook/static/notebook/js/clipboard.js

@@ -80,7 +80,7 @@ function paste(event) {
 
 function notebookOnlyEvent(callback) {
     // Only call the callback to redirect the event if the notebook should be
-    // handling the events, at the descretion of the keyboard manager.
+    // handling the events, at the discretion of the keyboard manager.
     // If the focus is in a text widget or something (kbmanager disabled),
     // allow the default event.
     return function() {

notebook/static/notebook/js/codecell.js

@@ -609,7 +609,7 @@ define([
         return cont;
     };
 
-    // Backwards compatability.
+    // Backwards compatibility.
     IPython.CodeCell = CodeCell;
 
     return {'CodeCell': CodeCell};

notebook/static/notebook/js/commandpalette.js

@@ -11,9 +11,9 @@ define([
 
     /**
      * Humanize the action name to be consumed by user.
-     * internaly the actions anem are of the form
+     * internally the actions anem are of the form
      * <namespace>:<description-with-dashes>
-     * we drop <namesapce> and replace dashes for space.
+     * we drop <namespace> and replace dashes for space.
      */
     var humanize_action_id = function(str) {
       return str.split(':')[1].replace(/-/g, ' ').replace(/_/g, '-');
@@ -38,7 +38,7 @@ define([
 
     var CommandPalette = function(notebook) {
         if(!notebook){
-          throw new Error("CommandPalette takes a notebook non-null mandatory arguement");
+          throw new Error("CommandPalette takes a notebook non-null mandatory argument");
         }
 
         // typeahead lib need a specific layout with specific class names.
@@ -81,7 +81,7 @@ define([
         .modal({show: false, backdrop:true})
         .on('shown.bs.modal', function () {
               // click on button trigger de-focus on mouse up.
-              // or somethign like that.
+              // or something like that.
               setTimeout(function(){input.focus();}, 100);
         });
 

notebook/static/notebook/js/completer.js

@@ -113,7 +113,7 @@ define([
     /**
      *
      * pass true as parameter if this is the first invocation of the completer
-     * this will prevent the completer to dissmiss itself if it is not on a
+     * this will prevent the completer to dismiss itself if it is not on a
      * word boundary like pressing tab after a space, and make it autopick the
      * only choice if there is only one which prevent from popping the UI.  as
      * well as fast-forwarding the typing if all completion have a common
@@ -134,7 +134,7 @@ define([
 
         // we need to check that we are still on a word boundary
         // because while typing the completer is still reinvoking itself
-        // so dismiss if we are on a "bad" caracter
+        // so dismiss if we are on a "bad" character
         if (!this.reinvoke(pre_cursor) && !first_invocation) {
             this.close();
             return;
@@ -210,7 +210,7 @@ define([
 
         // append the introspection result, in order, at at the beginning of
         // the table and compute the replacement range from current cursor
-        // positon and matched_text length.
+        // position and matched_text length.
         var from = this.editor.posFromIndex(start);
         var to = this.editor.posFromIndex(end);
         for (i = matches.length - 1; i >= 0; --i) {
@@ -278,7 +278,7 @@ define([
         }
         this.sel.attr('size', Math.min(10, this.raw_result.length));
 
-        // After everything is on the page, compute the postion.
+        // After everything is on the page, compute the position.
         // We put it above the code if it is too close to the bottom of the page.
         var pos = this.editor.cursorCoords(
             this.editor.posFromIndex(start)

notebook/static/notebook/js/contexthint.js

@@ -86,7 +86,7 @@ define(['codemirror/lib/codemirror'], function(CodeMirror) {
 
     var getCompletions = function(token, editor) {
         var candidates = getAllTokens(editor);
-        // filter all token that have a common start (but nox exactly) the lenght of the current token
+        // filter all token that have a common start (but nox exactly) the length of the current token
         var lambda = function (x) {
                 return (x.indexOf(token.string) === 0 && x != token.string);
             };

notebook/static/notebook/js/main.js

@@ -205,7 +205,7 @@ requirejs([
 
     Object.defineProperty( IPython, 'actions', {
       get: function() {
-          console.warn('accessing "actions" on the global IPython/Jupyter is not recommended. Pass it to your objects contructors at creation time');
+          console.warn('accessing "actions" on the global IPython/Jupyter is not recommended. Pass it to your objects constructors at creation time');
           return acts;
       },
       enumerable: true,

notebook/static/notebook/js/notebook.js

@@ -168,7 +168,7 @@ define([
         this.paste_enabled = false;
         this.paste_attachments_enabled = false;
         this.writable = false;
-        // It is important to start out in command mode to match the intial mode
+        // It is important to start out in command mode to match the initial mode
         // of the KeyboardManager.
         this.mode = 'command';
         this.set_dirty(false);
@@ -1853,7 +1853,7 @@ define([
         var that = this;
         var cell = this.get_selected_cell();
         // The following should not happen as the menu item is greyed out
-        // when those conditions are not fullfilled (see MarkdownCell
+        // when those conditions are not fulfilled (see MarkdownCell
         // unselect/select/unrender handlers)
         if (cell.cell_type !== 'markdown') {
             console.log('Error: insert_image called on non-markdown cell');

notebook/static/notebook/js/quickhelp.js

@@ -152,7 +152,7 @@ define([
 
     // return an **html** string of the keyboard shortcut
     // for human eyes consumption.
-    // the sequence is a string, comma sepparated linkt of shortcut,
+    // the sequence is a string, comma separated linkt of shortcut,
     // where the shortcut is a list of dash-joined keys.
     // Each shortcut will be wrapped in <kbd> tag, and joined by comma is in a
     // sequence.

notebook/static/notebook/js/scrollmanager.js

@@ -222,7 +222,7 @@ define(['jquery'], function($) {
         }
     };
 
-    // Return naemspace for require.js loads
+    // Return namespace for require.js loads
     return {
         'ScrollManager': ScrollManager,
         'SlideScrollManager': SlideScrollManager,

notebook/static/notebook/js/shortcuteditor.js

@@ -119,7 +119,7 @@ var KeyBindingList = createReactClass({
 
             "This dialog allows you to modify the keyboard shortcuts available in command mode. "+ 
             "Any changes will be persisted between sessions and across environments. "+
-            "You can define two kinds of shorctuts: **key combinations** and **key sequences**.\n"+
+            "You can define two kinds of shortcuts: **key combinations** and **key sequences**.\n"+
             "\n"+
             " - **Key Combinations**:\n"+
             "   - Use hyphens `-` to represent keys that should be pressed at the same time.\n"+

notebook/static/notebook/js/textcell.js

@@ -158,7 +158,7 @@ define([
     /**
      * setter: {{#crossLink "TextCell/set_text"}}{{/crossLink}}
      * @method get_text
-     * @retrun {string} CodeMirror current text value
+     * @return {string} CodeMirror current text value
      */
     TextCell.prototype.get_text = function() {
         return this.code_mirror.getValue();
@@ -487,7 +487,7 @@ define([
 
         // We want to display a visual indicator that the drop is possible.
         // The dragleave event is fired when we hover a child element (which
-        // is often immediatly after we got the dragenter), so we keep track
+        // is often immediately after we got the dragenter), so we keep track
         // of the number of dragenter/dragleave we got, as discussed here :
         // https://stackoverflow.com/q/7110353/116067
         // This doesn't seem to be 100% reliable, so we clear the dropzone

notebook/static/notebook/js/toolbar.js

@@ -51,12 +51,12 @@ define(['jquery','base/js/i18n'], function($, i18n) {
      *      ]
      *
      *  @param list {List}
-     *      List of button of the group, with the following paramter for each :
+     *      List of button of the group, with the following parameter for each :
      *      @param list.label {string} text to show on button hover
      *      @param list.icon {string} icon to choose from [Font Awesome](http://fortawesome.github.io/Font-Awesome)
      *      @param list.callback {function} function to be called on button click
      *      @param [list.id] {String} id to give to the button
-     *  @param [group_id] {String} optionnal id to give to the group
+     *  @param [group_id] {String} optional id to give to the group
      *
      *
      *  for private usage, the key can also be strings starting with '<' and ending with '>' to inject custom element that cannot

notebook/static/notebook/js/tooltip.js

@@ -127,7 +127,7 @@ define([
         this.remove_and_cancel_tooltip();
     };
 
-    // grow the tooltip verticaly
+    // grow the tooltip vertically
     Tooltip.prototype.expand = function () {
         this.text.removeClass('smalltooltip');
         this.text.addClass('bigtooltip');
@@ -244,9 +244,9 @@ define([
     };
 
     // put the tooltip in a sicky state for 10 seconds
-    // it won't be removed by remove_and_cancell() unless you called with
+    // it won't be removed by remove_and_cancel() unless you called with
     // the first parameter set to true.
-    // remove_and_cancell_tooltip(true)
+    // remove_and_cancel_tooltip(true)
     Tooltip.prototype.stick = function (time) {
         time = (time !== undefined) ? time : 10;
         var that = this;

notebook/static/services/kernels/kernel.js

@@ -154,7 +154,7 @@ define([
      *
      * @function list
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Kernel.prototype.list = function (success, error) {
         utils.ajax(this.kernel_service_url, {
@@ -180,7 +180,7 @@ define([
      * @function start
      * @param {params} [Object] - parameters to include in the query string
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Kernel.prototype.start = function (params, success, error) {
         var url = this.kernel_service_url;
@@ -220,7 +220,7 @@ define([
      *
      * @function get_info
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Kernel.prototype.get_info = function (success, error) {
         utils.ajax(this.kernel_url, {
@@ -238,13 +238,13 @@ define([
      *
      * Shutdown the kernel.
      *
-     * If you are also using sessions, then this function shoul NOT be
+     * If you are also using sessions, then this function should NOT be
      * used. Instead, use Session.delete. Otherwise, the session and
      * kernel WILL be out of sync.
      *
      * @function kill
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Kernel.prototype.kill = function (success, error) {
         this.events.trigger('kernel_killed.Kernel', {kernel: this});
@@ -266,7 +266,7 @@ define([
      *
      * @function interrupt
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Kernel.prototype.interrupt = function (success, error) {
         this.events.trigger('kernel_interrupting.Kernel', {kernel: this});
@@ -302,7 +302,7 @@ define([
          *
          * @function interrupt
          * @param {function} [success] - function executed on ajax success
-         * @param {function} [error] - functon executed on ajax error
+         * @param {function} [error] - function executed on ajax error
          */
         this.events.trigger('kernel_restarting.Kernel', {kernel: this});
         this.stop_channels();
@@ -737,7 +737,7 @@ define([
          *      @param callbacks.iopub.output {function}
          *      @param callbacks.iopub.clear_output {function}
          *      @param callbacks.input {function}
-         *      @param callbacks.clear_on_done=true {Bolean}
+         *      @param callbacks.clear_on_done=true {Boolean}
          * @param {object} [options]
          *      @param [options.silent=false] {Boolean}
          *      @param [options.user_expressions=empty_dict] {Dict}
@@ -772,7 +772,7 @@ define([
          *      }
          *
          * Each callback will be passed the entire message as a single
-         * arugment.  Payload handlers will be passed the corresponding
+         * argument.  Payload handlers will be passed the corresponding
          * payload and the execute_reply message.
          */
         var content = {

notebook/static/services/sessions/session.js

@@ -77,7 +77,7 @@ define([
      *
      * @function list
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Session.prototype.list = function (success, error) {
         utils.ajax(this.session_service_url, {
@@ -97,7 +97,7 @@ define([
      *
      * @function start
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Session.prototype.start = function (success, error) {
         var that = this;
@@ -140,7 +140,7 @@ define([
      *
      * @function get_info
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Session.prototype.get_info = function (success, error) {
         utils.ajax(this.session_url, {
@@ -162,7 +162,7 @@ define([
      * @function rename_notebook
      * @param {string} [path] - new notebook path
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Session.prototype.rename_notebook = function (path, success, error) {
         if (path !== undefined) {
@@ -188,7 +188,7 @@ define([
      *
      * @function delete
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Session.prototype.delete = function (success, error) {
         if (this.kernel && this.kernel.is_connected()) {
@@ -217,7 +217,7 @@ define([
      * @function restart
      * @param {Object} [options] - options for the new kernel
      * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - functon executed on ajax error
+     * @param {function} [error] - function executed on ajax error
      */
     Session.prototype.restart = function (options, success, error) {
         var that = this;

notebook/static/tree/js/kernellist.js

@@ -91,7 +91,7 @@ define([
             .appendTo(running_indicator);
     };
     
-    // Backwards compatability.
+    // Backwards compatibility.
     IPython.KernelList = KernelList;
 
     return {'KernelList': KernelList};

notebook/static/tree/js/main.js

@@ -172,7 +172,7 @@ requirejs([
 
     page.show();
 
-    // For backwards compatability.
+    // For backwards compatibility.
     IPython.page = page;
     IPython.notebook_list = notebook_list;
     IPython.session_list = session_list;

notebook/templates/notebook.html

@@ -8,7 +8,7 @@
 <script type="text/javascript" src="{{mathjax_url}}?config={{mathjax_config}}&delayStartupUntil=configured" charset="utf-8"></script>
 {% endif %}
 <script type="text/javascript">
-// MathJax disabled, set as null to distingish from *missing* MathJax,
+// MathJax disabled, set as null to distinguish from *missing* MathJax,
 // where it will be undefined, and should prompt a dialog later.
 window.mathjax_url = "{{mathjax_url}}";
 </script>

notebook/tests/base/keyboard.js

@@ -88,8 +88,8 @@ casper.notebook_test(function () {
                 longer_last = longer_last  ||(that.msgs[m].match(/will be shadowed/) != null);
             }
         }
-        this.test.assert(longer_first, 'no warning if registering shorter shortut');
-        this.test.assert(longer_last , 'no warning if registering longer shortut');
+        this.test.assert(longer_first, 'no warning if registering shorter shortcut');
+        this.test.assert(longer_last , 'no warning if registering longer shortcut');
     });
 
 });

notebook/tests/notebook/notifications.js

@@ -39,10 +39,10 @@ casper.notebook_test(function () {
         this.test.assert(get_widget('kernel') && widget('kernel'), 'The kernel notification widget exists');
         this.test.assert(get_widget('notebook') && widget('notbook'), 'The notebook notification widget exists');
 
-        // try getting a non-existant widget
+        // try getting a non-existent widget
         this.test.assertRaises(get_widget, 'foo', 'get_widget: error is thrown');
 
-        // try creating a non-existant widget
+        // try creating a non-existent widget
         this.test.assert(widget('bar'), 'widget: new widget is created');
 
         // try creating a widget that already exists

notebook/tests/notebook/roundtrip.js

@@ -20,7 +20,7 @@ var black_dot_png = 'u\"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUA
 var svg = "\"<svg width='1cm' height='1cm' viewBox='0 0 1000 500'><defs><style>rect {fill:red;}; </style></defs><rect id='r1' x='200' y='100' width='600' height='300' /></svg>\"";
 
 // helper function to ensure that the short_name is found in the toJSON
-// represetnation, while the original in-memory cell retains its long mimetype
+// representation, while the original in-memory cell retains its long mimetype
 // name, and that fromJSON also gets its long mimetype name
 function assert_has(short_name, json, result, result2) {
     var long_name = mime[short_name];

notebook/tests/selenium/test_shutdown.py

@@ -7,7 +7,7 @@ def test_shutdown(notebook):
     wait_for_selector(notebook.browser, '#shutdown_kernel', single=True).click()
     wait_for_selector(notebook.browser, '.btn.btn-default.btn-sm.btn-danger', single=True).click()
 
-    #Wait until all shutdown modal elements dissapear before trying to execute the cell
+    #Wait until all shutdown modal elements disappear before trying to execute the cell
     wait_for_xpath(notebook.browser, "//div[contains(@class,'modal')]", obscures=True)
     notebook.execute_cell(0)
 

notebook/tests/selenium/utils.py

@@ -46,7 +46,7 @@ def _wait_for(driver, locator_type, locator, timeout=10, visible=False, single=F
         visible: if True, require that element is not only present, but visible
         single: if True, return a single element, otherwise return a list of matching
         elements
-        osbscures: if True, waits until the element becomes invisible
+        obscures: if True, waits until the element becomes invisible
     """
     wait = WebDriverWait(driver, timeout)
     if obscures:

notebook/tests/services/session.js

@@ -170,7 +170,7 @@ casper.notebook_test(function () {
     this.thenEvaluate( function() {IPython.notebook.session.start()});
     this.wait_for_kernel_ready();
 
-    // check for events when starting a nonexistant kernel
+    // check for events when starting a nonexistent kernel
     this.event_test(
         'bad_start_session',
         [

notebook/tests/test_config_manager.py

@@ -26,7 +26,7 @@ def test_json():
         assert 'c' not in data
         assert data['a'] == 1
         assert 'x' in data['nest']
-        # if we write it out, it also shouldn't pick up the subdirectoy
+        # if we write it out, it also shouldn't pick up the subdirectory
         manager.set('foo', data)
         data = manager.get('foo')
         assert data == root_data

notebook/tests/test_gateway.py

@@ -293,7 +293,7 @@ class TestGateway(NotebookTestBase):
             return False
 
     def create_kernel(self, kernel_name):
-        """Issues request to retart the given kernel
+        """Issues request to restart the given kernel
         """
         with mocked_gateway:
             kwargs = dict()
@@ -324,7 +324,7 @@ class TestGateway(NotebookTestBase):
             self.assertEqual(response.reason, 'No Content')
 
     def restart_kernel(self, kernel_id):
-        """Issues request to retart the given kernel
+        """Issues request to restart the given kernel
         """
         with mocked_gateway:
             response = self.request('POST', '/api/kernels/' + kernel_id + '/restart')

notebook/tests/util.js

@@ -625,7 +625,7 @@ casper.assert_colors_equal = function (hex_color, local_color, msg) {
     //
     // Parameters
     // hex_color: string
-    //      Hexadecimal color code, with or without preceeding hash character.
+    //      Hexadecimal color code, with or without preceding hash character.
     // local_color: string
     //      Local color representation.  Can either be hexadecimal (default for 
     //      phantom) or rgb (default for slimer).