Merge pull request 'update urls' (#1) from intro16 into master

Reviewed-on: https://git.osgeo.org/gitea/osgeolive/OSGeoLive-Notebooks/pulls/1

Running_Notebook_Server.ipynb

@@ -64,7 +64,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The notebook web server can also be configured using IPython profiles and configuration files. The Notebook web server configuration options are set in a file named `ipython_notebook_config.py` in your IPython *profile directory*. The profile directory is a subfolder of your IPython directory, which itself is usually `.ipython` in your home directory.\n",
+    "The notebook web server can also be configured using profiles and configuration files. \n",
     "\n",
     "You can display the location of your default profile directory by running the command:"
    ]
@@ -99,7 +99,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "More details about Jupyter configuration files and profiles can be found [here](https://jupyter-notebook.readthedocs.io/en/stable/config.html)."
+    "More details about Jupyter configuration files and profiles can be found [here](https://jupyter-notebook.readthedocs.io/en/stable/configuration.html)."
    ]
   },
   {
@@ -122,13 +122,7 @@
     "This can be accomplished by passing a command line options.\n",
     "\n",
     "    jupyter notebook --ip=* --no-browser\n",
-    "\n",
-    "You can also add the following to your`ipython_notebook_config.py` file:\n",
-    "\n",
-    "```python\n",
-    "c.NotebookApp.ip = '*'\n",
-    "c.NotebookApp.open_browser = False\n",
-    "```"
+    "\n"
    ]
   },
   {
@@ -142,13 +136,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The notebook dashboard typically lives at the URL `http://localhost:8888/tree`. If you prefer that it lives, together with the \n",
-    "rest of the notebook web application, under a base URL prefix, such as `http://localhost:8888/ipython/tree`, you can do so by adding the following lines to your `ipython_notebook_config.py` file.\n",
-    "\n",
-    "```python\n",
-    "c.NotebookApp.base_url = '/ipython/'\n",
-    "c.NotebookApp.webapp_settings = {'static_url_prefix':'/ipython/static/'}\n",
-    "```"
+    "The notebook dashboard typically lives at the URL `http://localhost:8888/tree`. "
    ]
   },
   {
@@ -181,13 +169,8 @@
    "metadata": {},
    "source": [
     "By default, the notebook server stores the notebook documents that it saves as files in the working directory of the notebook server, also known as the\n",
-    "`notebook_dir`. This  logic is implemented in the `FileNotebookManager` class. However, the server can be configured to use a different notebook manager class, which can store the notebooks in a different format. \n",
-    "\n",
-    "The [bookstore](https://github.com/rgbkrk/bookstore) package currently allows users to store notebooks on Rackspace CloudFiles or OpenStack Swift based object stores.\n",
-    "\n",
-    "Writing a notebook manager is as simple as extending the base class `NotebookManager`. The [simple_notebook_manager](https://github.com/khinsen/simple_notebook_manager) provides a great example\n",
-    "of an in memory notebook manager, created solely for the purpose of\n",
-    "illustrating the notebook manager API."
+    "`notebook_dir`. \n",
+    "\n"
    ]
   },
   {
@@ -208,7 +191,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "JupyterHub is a multi-user server that manages and proxies multiple instances of the single-user IPython/Jupyter Notebook server. (see also Bindr project)\n",
+    "JupyterHub is a multi-user server that manages and proxies multiple instances of the single-user Jupyter Notebook server. (see also Bindr project)\n",
     "\n",
     "<img src=\"https://c2a32ff18d23c8f567f0-e44b0df73868b5d567b1e58e01681d15.ssl.cf5.rackcdn.com/2015-03-24-deploying-jupyterhub-for-education/jupyterhub-9efc59baf33d2640641cb4a1fd9145ff.gif\" width=\"800px\" />\n",
     "\n",
@@ -233,12 +216,8 @@
     "POST /api/routes/[:path]\n",
     "```\n",
     "\n",
-    "#### [JupyterHub](https://github.com/jupyter/jupyterhub)\n",
-    "\n",
-    "* Hub spawns proxy\n",
-    "* Proxy forwards ~all requests to hub by default\n",
-    "* Hub handles login, and spawns single-user servers on demand\n",
-    "* Hub configures proxy to forward url prefixes to single-user servers\n"
+    "#### [JupyterHub](https://github.com/jupyterhub/jupyterhub)\n",
+    "\n"
    ]
   },
   {
@@ -248,7 +227,7 @@
     "## Authentication models\n",
     "\n",
     "* PAM/Unix (Default)\n",
-    "* [GitHub OAuth](https://github.com/jupyter/oauthenticator) - Demo at demohub.jupyter.org\n",
+    "* [GitHub OAuth](https://github.com/jupyter/oauthenticator) \n",
     "\n",
     "This is extensible enough to implement other authentication methods, the simplest being any involving OAuth (follow the GitHub OAuthenticator for a skeleton)."
    ]
@@ -259,7 +238,7 @@
    "source": [
     "## Spawners\n",
     "\n",
-    "By default, notebook servers are spawned in the context of the user as a process on the host machine. One alternative for spawning is the [DockerSpawner](https://github.com/jupyter/dockerspawner) which runs each user in their own environment inside a Docker container.\n"
+    "By default, notebook servers are spawned in the context of the user as a process on the host machine. One alternative for spawning is the [DockerSpawner](https://github.com/jupyterhub/dockerspawner) which runs each user in their own environment inside a Docker container.\n"
    ]
   },
   {
@@ -284,7 +263,7 @@
    "source": [
     "## tmpnb\n",
     "\n",
-    "tmpnb is a temporary notebook system. Visit [try.jupyter.org](https://try.jupyter.org) for a demo.\n",
+    "tmpnb is a temporary notebook system. Visit [try.jupyter.org](https://jupyter.org/try) for a demo.\n",
     "\n",
     "Similar to JupyterHub with the DockerSpawner, tmpnb uses a proxy to route to notebook servers. The difference is that there is no login and notebook servers get deleted after a period of (configurable) inactivity.\n",
     "\n",