Merge branch 'develop' into local-dev-env-1

This updates this MR to the latest base branch (develop) and also
is an experiment on what happens when I merge instead of rebase to
update MRs.

.gitlab-ci.yml

@@ -9,6 +9,11 @@ docs:
   stage: "build"
   script:
     - "nix-shell --run 'nix-build docs.nix'"
+    - "cp --recursive --no-preserve=mode result/docs/. docs/build/"
+  artifacts:
+    paths:
+      - "docs/build/"
+    expose_as: "documentation"
 
 unit-tests:
   stage: "test"

README.rst

@@ -13,7 +13,6 @@ Documentation
 
 There is documentation for:
 
-* Users: ``docs/user/README.rst``
 * Operators/Admins: ``docs/ops/README.rst``
 * Developers: ``docs/dev/README.rst``
 

docs/source/index.rst

@@ -11,7 +11,6 @@ Howdy!  We separated the documentation into parts addressing different audiences
 .. toctree::
    :maxdepth: 2
 
-   Users <user/README>
    Administrators <ops/README>
    Developers <dev/README>
 

docs/source/user/README.rst

-User documentation
-==================
-
-This will contain the user documentation for this project.
-