diff --git a/docs/guides/user-environment.rst b/docs/guides/user-environment.rst index 45b4816..832d0f0 100644 --- a/docs/guides/user-environment.rst +++ b/docs/guides/user-environment.rst @@ -19,7 +19,7 @@ almost 145,000 packages in it right now, so a lot of what you need is going to b 1. Log in as an admin user and open a Terminal in your Jupyter Notebook. - .. image:: ../images/new_terminal_button.png + .. image:: ../images/notebook/new-terminal-button.png :alt: New Terminal button under New menu If you already have a terminal open as an admin user, that should work too! @@ -53,7 +53,7 @@ a community maintained repository of conda packages. 1. Log in as an admin user and open a Terminal in your Jupyter Notebook. - .. image:: ../images/new_terminal_button.png + .. image:: ../images/notebook/new-terminal-button.png :alt: New Terminal button under New menu If you already have a terminal open as an admin user, that should work too! @@ -89,7 +89,7 @@ make sure to look in the version of Ubuntu you are using! 1. Log in as an admin user and open a Terminal in your Jupyter Notebook. - .. image:: ../images/new_terminal_button.png + .. image:: ../images/notebook/new-terminal-button.png :alt: New Terminal button under New menu If you already have a terminal open as an admin user, that should work too! diff --git a/docs/images/admin-button.png b/docs/images/admin/admin-access-button.png similarity index 100% rename from docs/images/admin-button.png rename to docs/images/admin/admin-access-button.png diff --git a/docs/tutorials/images/first-login.png b/docs/images/first-login.png similarity index 100% rename from docs/tutorials/images/first-login.png rename to docs/images/first-login.png diff --git a/docs/images/new_terminal_button.png b/docs/images/notebook/new-terminal-button.png similarity index 100% rename from docs/images/new_terminal_button.png rename to docs/images/notebook/new-terminal-button.png diff --git a/docs/tutorials/images/digitalocean/additional-options.png b/docs/images/providers/digitalocean/additional-options.png similarity index 100% rename from docs/tutorials/images/digitalocean/additional-options.png rename to docs/images/providers/digitalocean/additional-options.png diff --git a/docs/tutorials/images/digitalocean/create-menu.png b/docs/images/providers/digitalocean/create-menu.png similarity index 100% rename from docs/tutorials/images/digitalocean/create-menu.png rename to docs/images/providers/digitalocean/create-menu.png diff --git a/docs/tutorials/images/digitalocean/hostname.png b/docs/images/providers/digitalocean/hostname.png similarity index 100% rename from docs/tutorials/images/digitalocean/hostname.png rename to docs/images/providers/digitalocean/hostname.png diff --git a/docs/tutorials/images/digitalocean/select-image.png b/docs/images/providers/digitalocean/select-image.png similarity index 100% rename from docs/tutorials/images/digitalocean/select-image.png rename to docs/images/providers/digitalocean/select-image.png diff --git a/docs/tutorials/images/digitalocean/server-create-done.png b/docs/images/providers/digitalocean/server-create-done.png similarity index 100% rename from docs/tutorials/images/digitalocean/server-create-done.png rename to docs/images/providers/digitalocean/server-create-done.png diff --git a/docs/tutorials/images/digitalocean/server-create-wait.png b/docs/images/providers/digitalocean/server-create-wait.png similarity index 100% rename from docs/tutorials/images/digitalocean/server-create-wait.png rename to docs/images/providers/digitalocean/server-create-wait.png diff --git a/docs/tutorials/digitalocean.rst b/docs/tutorials/digitalocean.rst index 33b6d84..88dd310 100644 --- a/docs/tutorials/digitalocean.rst +++ b/docs/tutorials/digitalocean.rst @@ -28,7 +28,7 @@ Let's create the server on which we can run JupyterHub. #. Click the **Create** button on the top right, and select **Droplets** from the dropdown menu. DigitalOcean calls servers **droplets**. - .. image:: images/digitalocean/create-menu.png + .. image:: ../images/providers/digitalocean/create-menu.png :alt: Dropdown menu on clicking 'create' in top right corner This takes you to a page titled **Create Droplets** that lets you configure @@ -36,7 +36,7 @@ Let's create the server on which we can run JupyterHub. #. Under **Choose an image**, select **18.04 x64** under **Ubuntu**. - .. image:: images/digitalocean/select-image.png + .. image:: ../images/providers/digitalocean/select-image.png :alt: Select 18.04 x64 image under Ubuntu #. Under **Choose a size**, select the size of the server you want. The default @@ -45,7 +45,7 @@ Let's create the server on which we can run JupyterHub. #. Scroll down to **Select additional options**, and select **User data**. - .. image:: images/digitalocean/additional-options.png + .. image:: ../images/providers/digitalocean/additional-options.png :alt: Turn on User Data in additional options This opens up a textbox where you can enter a script that will be run @@ -67,19 +67,19 @@ Let's create the server on which we can run JupyterHub. #. Under the **Finalize and create** section, enter a ``hostname`` that descriptively identifies this server for you. - .. image:: images/digitalocean/hostname.png + .. image:: ../images/providers/digitalocean/hostname.png :alt: Select suitable hostname for your server #. Click the **Create** button! You will be taken to a different screen, where you can see progress of your server being created. - .. image:: images/digitalocean/server-create-wait.png + .. image:: ../images/providers/digitalocean/server-create-wait.png :alt: Server being created #. In a few seconds your server will be created, and you can see the **public IP** used to access it. - .. image:: images/digitalocean/server-create-done.png + .. image:: ../images/providers/digitalocean/server-create-done.png :alt: Server finished creating, public IP available #. The Littlest JupyterHub is now installing in the background on your new server. @@ -91,7 +91,7 @@ Let's create the server on which we can run JupyterHub. #. When the installation is complete, it should give you a JupyterHub login page. - .. image:: images/first-login.png + .. image:: ../images/first-login.png :alt: JupyterHub log-in page #. Login using the **admin user name** you used in step 6, and a password. Use a @@ -114,7 +114,7 @@ web UI directly. Let's add a few users who can log in! #. In the control panel, open the **Admin** link in the top left. - .. image:: ../images/admin-button.png + .. image:: ../images/admin/admin-access-button.png :alt: Admin button in control panel, top left This opens up the JupyterHub admin page, where you can add / delete users, @@ -153,7 +153,7 @@ with ``sudo -E``. #. Log in as an admin user and open a Terminal in your Jupyter Notebook. - .. image:: ../images/new_terminal_button.png + .. image:: ../images/notebook/new-terminal-button.png :alt: New Terminal button under New menu #. Install `gdal `_ from `conda-forge `_. diff --git a/docs/tutorials/quickstart.rst b/docs/tutorials/quickstart.rst index a89a84d..25e3976 100644 --- a/docs/tutorials/quickstart.rst +++ b/docs/tutorials/quickstart.rst @@ -87,18 +87,11 @@ Step 3: Install conda / pip packages for all users The **User Environment** is a conda environment that is shared by all users in the JupyterHub. Libraries installed in this environment are immediately -available to all users. Admin users can install packages in this environment -with ``sudo -E``. - -#. If you were already logged in to the web interface as the admin user, you - might need to restart your server for your new powers to take effect. - - .. image:: ../images/control-panel-button.png - :alt: Control Panel button on top right of Notebook interface +available to all users. #. Log in as an admin user and open a Terminal in your Jupyter Notebook. - .. image:: ../images/new_terminal_button.png + .. image:: ../images/notebook/new-terminal-button.png :alt: New Terminal button under New menu #. Install `gdal `_ from `conda-forge `_.