From 6ccb2d4c57021776883a21cc2d6fe571a3b1ed34 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Thu, 10 Feb 2022 14:58:20 +0100
Subject: [PATCH] Minor textual changes to developer instructions
---
docs/instructions.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/instructions.rst b/docs/instructions.rst
index 0df9f0c30..94f0efd48 100644
--- a/docs/instructions.rst
+++ b/docs/instructions.rst
@@ -2,7 +2,7 @@ Instructions
============
This document contains instructions for a few tasks that you might have to do as
-a Stackspin developer
+a Stackspin developer.
Building a new version of Zulip
-------------------------------
@@ -18,14 +18,14 @@ the following:
the whole ref, ``5e90b32f40`` in our example.
3. A local copy of our fork of `the docker-zulip repository
<https://github.com/greenhost/docker-zulip>`__ (at least until `our pull
- request is merged <https://github.com/zulip/docker-zulip/pull/325>`__
+ request is merged <https://github.com/zulip/docker-zulip/pull/325>`__).
This is necessary because we have added the ``SOCIAL_AUTH_OIDC_ENABLED_IDPS``
variable to the ``entrypoint.sh`` docker entrypoint script. Without our
changes, setting OIDC settings through environment variables is impossible.
Once you have these two things, you can run the following build command to build
-the container:
+the image:
.. code::
@@ -36,7 +36,7 @@ the container:
The build argument ZULIP_GIT_REF tells the Dockerfile to use that ref when
checking out and building Zulip. The tag is necessary so you can push the new
-Zulip container to our registry after building with the following command:
+Zulip image to our registry after building with the following command:
.. code::
--
GitLab