diff --git a/docs/source/examples/Notebook/Examples and Tutorials Index.ipynb b/docs/source/examples/Notebook/Examples and Tutorials Index.ipynb index 1a4a2127d..35553fd63 100644 --- a/docs/source/examples/Notebook/Examples and Tutorials Index.ipynb +++ b/docs/source/examples/Notebook/Examples and Tutorials Index.ipynb @@ -30,7 +30,9 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "collapsed": false + }, "source": [ "* [What is the Jupyter Notebook](What is the Jupyter Notebook.ipynb)\n", "* [Notebook Basics](Notebook Basics.ipynb)\n", @@ -49,7 +51,9 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "collapsed": false + }, "source": [ "* [Importing Notebooks](Importing Notebooks.ipynb)\n", "* [Connecting with the Qt Console](Connecting with the Qt Console.ipynb)\n", @@ -73,7 +77,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.0" + "version": "3.5.1" } }, "nbformat": 4, diff --git a/docs/source/examples/Notebook/Importing Notebooks.ipynb b/docs/source/examples/Notebook/Importing Notebooks.ipynb index 14d91d244..a4dde144b 100644 --- a/docs/source/examples/Notebook/Importing Notebooks.ipynb +++ b/docs/source/examples/Notebook/Importing Notebooks.ipynb @@ -515,7 +515,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.4.0" + "version": "3.5.1" } }, "nbformat": 4, diff --git a/docs/source/examples/Notebook/JavaScript Notebook Extensions.ipynb b/docs/source/examples/Notebook/JavaScript Notebook Extensions.ipynb index 6987f4b30..da37f9ebc 100644 --- a/docs/source/examples/Notebook/JavaScript Notebook Extensions.ipynb +++ b/docs/source/examples/Notebook/JavaScript Notebook Extensions.ipynb @@ -555,19 +555,28 @@ " - `Medium`\n", " - `Hard`\n", " \n", - "We will use it to customiZe the output of the converted notebook depending on the tag on each cell" + "We will use it to customize the output of the converted notebook depending on the tag on each cell" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": { "collapsed": false }, "outputs": [], "source": [ - "%load soln/celldiff.js" + "# %load soln/celldiff.js" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] } ], "metadata": { @@ -586,7 +595,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.4.3" + "version": "3.5.1" } }, "nbformat": 4, diff --git a/docs/source/examples/Notebook/Working With Markdown Cells.ipynb b/docs/source/examples/Notebook/Working With Markdown Cells.ipynb index aabccf1d1..21454ae1f 100644 --- a/docs/source/examples/Notebook/Working With Markdown Cells.ipynb +++ b/docs/source/examples/Notebook/Working With Markdown Cells.ipynb @@ -175,25 +175,29 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Github flavored markdown (GFM)" + "## GitHub flavored markdown" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "The Notebook webapp support Github flavored markdown meaning that you can use triple backticks for code blocks \n", - "
\n",
-    "```python\n",
-    "print \"Hello World\"\n",
-    "```\n",
+    "The Notebook webapp supports Github flavored markdown meaning that you can use triple backticks for code blocks:\n",
     "\n",
-    "```javascript\n",
-    "console.log(\"Hello World\")\n",
-    "```\n",
-    "
\n", + "
\n",
+    "    ```python\n",
+    "    print \"Hello World\"\n",
+    "    ```\n",
+    "    
\n", + "\n", + "
\n",
+    "    ```javascript\n",
+    "    console.log(\"Hello World\")\n",
+    "    ```\n",
+    "    
\n", + "\n", + "Gives:\n", "\n", - "Gives \n", "```python\n", "print \"Hello World\"\n", "```\n", @@ -202,19 +206,23 @@ "console.log(\"Hello World\")\n", "```\n", "\n", - "And a table like this : \n", + "And a table like this: \n", "\n", - "
\n",
-    "| This | is   |\n",
-    "|------|------|\n",
-    "|   a  | table| \n",
-    "
\n", + "
\n",
+    "    ```\n",
+    "\n",
+    "    | This | is   |\n",
+    "    |------|------|\n",
+    "    |   a  | table| \n",
+    "\n",
+    "    ```\n",
+    "    
\n", "\n", - "A nice Html Table\n", + "A nice HTML Table:\n", "\n", "| This | is |\n", "|------|------|\n", - "| a | table| " + "| a | table| \n" ] }, { @@ -314,7 +322,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.4.3" + "version": "3.5.1" } }, "nbformat": 4, diff --git a/docs/source/examples/Notebook/nbpackage/nbs/other.ipynb b/docs/source/examples/Notebook/nbpackage/nbs/other.ipynb index dad7e734a..43825b896 100644 --- a/docs/source/examples/Notebook/nbpackage/nbs/other.ipynb +++ b/docs/source/examples/Notebook/nbpackage/nbs/other.ipynb @@ -4,6 +4,8 @@ "cell_type": "markdown", "metadata": {}, "source": [ + "### Other notebook\n", + "\n", "This notebook just defines `bar`" ] }, @@ -36,7 +38,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.4.2" + "version": "3.5.1" } }, "nbformat": 4, diff --git a/docs/source/index.rst b/docs/source/index.rst index 650cd78d2..a014ed3a6 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -57,10 +57,17 @@ The Jupyter notebook examples/Notebook/Running Code examples/Notebook/Working With Markdown Cells examples/Notebook/Custom Keyboard Shortcuts + examples/Notebook/JavaScript Notebook Extensions examples/Notebook/Importing Notebooks examples/Notebook/Connecting with the Qt Console examples/Notebook/Typesetting Equations +.. toctree:: + :hidden: + + examples/Notebook/nbpackage/mynotebook.ipynb + examples/Notebook/nbpackage/nbs/other.ipynb + .. toctree:: :maxdepth: 2 :caption: About Jupyter Notebook