Merge pull request #718 from consideRatio/master

docs: fix language regarding master
jupyterhub · Oct 19, 2021 · 909b257 · 909b257
2 parents ebd76f7 + 9179365
commit 909b257
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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 = """
 <html>
 <head>
@@ -57,7 +57,7 @@
   <meta http-equiv="refresh" content="30" >
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <meta name="viewport" content="width=device-width">
-  <img class="logo" src="https://raw.githubusercontent.com/jupyterhub/the-littlest-jupyterhub/master/docs/images/logo/logo.png">
+  <img class="logo" src="https://raw.githubusercontent.com/jupyterhub/the-littlest-jupyterhub/HEAD/docs/images/logo/logo.png">
   <div class="loader center"></div>
   <div class="center main-msg">Please wait while your TLJH is setting up...</div>
   <div class="center logs-msg">Click the button below to see the logs</div>

diff --git 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
@@ -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 <https://github.com/jupyterhub/the-littlest-jupyterhub/tree/master/tljh>`_
+You can find the `source code on GitHub <https://github.com/jupyterhub/the-littlest-jupyterhub/tree/HEAD/tljh>`_
 
 .. toctree::
    :titlesonly:

diff --git 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 <https://github.com/jupyterhub/the-littlest-jupyterhub/blob/master/tljh/systemd-units/jupyterhub.service>`_ and
-`traefik.service <https://github.com/jupyterhub/the-littlest-jupyterhub/blob/master/tljh/systemd-units/traefik.service>`_.
+`jupyterhub.service <https://github.com/jupyterhub/the-littlest-jupyterhub/blob/HEAD/tljh/systemd-units/jupyterhub.service>`_ and
+`traefik.service <https://github.com/jupyterhub/the-littlest-jupyterhub/blob/HEAD/tljh/systemd-units/traefik.service>`_.
 They look like the following:
 
 .. code-block:: bash

diff --git 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 <https://mybinder.org/v2/gh/jupyterhub/nbgitpuller/master?urlpath=apps/binder%2Flink_generator.ipynb>`_.
+   `mybinder.org based application <https://mybinder.org/v2/gh/jupyterhub/nbgitpuller/HEAD?urlpath=apps/binder%2Flink_generator.ipynb>`_.
    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
@@ -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.