diff --git a/.github/integration-test.py b/.github/integration-test.py
index 7450628df..9ea09a8ae 100755
--- a/.github/integration-test.py
+++ b/.github/integration-test.py
@@ -95,7 +95,7 @@ def run_test(image_name, test_name, bootstrap_pip_spec, test_files, upgrade, ins
copy_to_container(test_name, os.path.join(source_path, 'integration-tests/'), '/srv/src')
- # Install TLJH master first to test upgrades
+ # Install TLJH from the default branch first to test upgrades
if upgrade:
run_container_command(
test_name,
diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py
index de76307b5..4eb718cd3 100644
--- a/bootstrap/bootstrap.py
+++ b/bootstrap/bootstrap.py
@@ -47,7 +47,7 @@
import shutil
import urllib.request
-progress_page_favicon_url = "https://raw.githubusercontent.com/jupyterhub/jupyterhub/master/share/jupyterhub/static/favicon.ico"
+progress_page_favicon_url = "https://raw.githubusercontent.com/jupyterhub/jupyterhub/HEAD/share/jupyterhub/static/favicon.ico"
progress_page_html = """
@@ -57,7 +57,7 @@
- 
+ 
Please wait while your TLJH is setting up...
Click the button below to see the logs
diff --git a/docs/conf.py b/docs/conf.py
index fc0d14690..2558b8b18 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,8 +16,8 @@
'sphinx.ext.intersphinx',
'sphinx_copybutton']
-# The master toctree document.
-master_doc = 'index'
+# The root toctree document.
+root_doc = master_doc = "index"
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
diff --git a/docs/contributing/index.rst b/docs/contributing/index.rst
index 80bb51619..d8e294bd9 100644
--- a/docs/contributing/index.rst
+++ b/docs/contributing/index.rst
@@ -9,7 +9,7 @@ Your contribution is integral to the future of the project. Thank you!
This section contains documentation for people who want to contribute.
-You can find the `source code on GitHub `_
+You can find the `source code on GitHub `_
.. toctree::
:titlesonly:
diff --git a/docs/howto/admin/systemd.rst b/docs/howto/admin/systemd.rst
index 67bbaf8e8..d2a50589c 100644
--- a/docs/howto/admin/systemd.rst
+++ b/docs/howto/admin/systemd.rst
@@ -7,8 +7,8 @@ Customizing ``systemd`` services
By default, TLJH configures two ``systemd`` services to run JupyterHub and Traefik.
These services come with a default set of settings, which are specified in
-`jupyterhub.service `_ and
-`traefik.service `_.
+`jupyterhub.service `_ and
+`traefik.service `_.
They look like the following:
.. code-block:: bash
diff --git a/docs/howto/content/nbgitpuller.rst b/docs/howto/content/nbgitpuller.rst
index b35e6991f..152fd556c 100644
--- a/docs/howto/content/nbgitpuller.rst
+++ b/docs/howto/content/nbgitpuller.rst
@@ -41,7 +41,7 @@ Step 1: Generate nbgitpuller link
**Generate the link with a Binder app**.
#. The easiest way to generate an nbgitpuller link is to use the
- `mybinder.org based application `_.
+ `mybinder.org based application `_.
Open it, and wait for it to load.
.. image:: ../../images/nbgitpuller/binder-progress.png
diff --git a/docs/topic/customizing-installer.rst b/docs/topic/customizing-installer.rst
index b18febc04..e85dd48ad 100644
--- a/docs/topic/customizing-installer.rst
+++ b/docs/topic/customizing-installer.rst
@@ -97,7 +97,7 @@ in your new hub, you would run:
curl -L https://tljh.jupyter.org/bootstrap.py \
| sudo python3 - \
- --user-requirements-txt-url https://raw.githubusercontent.com/data-8/materials-sp18/master/requirements.txt
+ --user-requirements-txt-url https://raw.githubusercontent.com/data-8/materials-sp18/HEAD/requirements.txt
The URL **must** point to a working requirements.txt. If there are any errors, the installation
will fail.