Skip to content

Commit fd42606

Browse files
mateuszmanderatimabbott
authored andcommitted
Update stale "master" branch references to "main".
We renamed master->main a long time ago.
1 parent 0d712d5 commit fd42606

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,5 +427,5 @@ make a high-quality Docker image for Zulip possible.
427427
[install-normal]: https://zulip.readthedocs.io/en/latest/production/install.html#installer-options
428428
[outgoing-email]: https://zulip.readthedocs.io/en/latest/production/email.html
429429
[server-settings]: https://zulip.readthedocs.io/en/latest/production/settings.html
430-
[prod-settings-template]: https://github.com/zulip/zulip/blob/master/zproject/prod_settings_template.py
430+
[prod-settings-template]: https://github.com/zulip/zulip/blob/main/zproject/prod_settings_template.py
431431
[create-organization]: http://zulip.readthedocs.io/en/latest/production/install.html#step-3-create-a-zulip-organization-and-log-in

UPGRADING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ docker-compose exec -u zulip zulip cat /home/zulip/deployments/current/version.p
8585
args:
8686
# Change these if you want to build zulip from a different repo/branch
8787
ZULIP_GIT_URL: https://github.com/zulip/zulip.git
88-
ZULIP_GIT_REF: master
88+
ZULIP_GIT_REF: main
8989
```
9090
9191
You can set `ZULIP_GIT_URL` to any clone of the zulip/zulip git repository,
92-
and `ZULIP_GIT_REF` to be any ref name in that repository (e.g. `master` or
92+
and `ZULIP_GIT_REF` to be any ref name in that repository (e.g. `main` or
9393
`1.9.0` or `445932cc8613c77ced023125248c8b966b3b7528`).
9494

9595
2. Run `docker-compose build zulip` to build a Zulip Docker image from the

kubernetes/chart/zulip/values-local.yaml.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ zulip:
77
# password: set-secure-password
88

99
# Add any other environment variables you want to configure here.
10-
# based on; https://github.com/zulip/docker-zulip/blob/master/docker-compose.yml#L63
10+
# based on; https://github.com/zulip/docker-zulip/blob/main/docker-compose.yml#L63
1111
# these values will be merged with db secrets and hosts/ports
1212
environment:
1313
# Domain

kubernetes/chart/zulip/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ affinity: {}
125125

126126
zulip:
127127
## Environment variables based on
128-
## https://github.com/zulip/docker-zulip/blob/master/docker-compose.yml#L63
128+
## https://github.com/zulip/docker-zulip/blob/main/docker-compose.yml#L63
129129
environment:
130130
## Disable the default Zulip requirement of HTTPS. HTTPS and
131131
## certificates are managed by the Kubernetes cluster, so by

0 commit comments

Comments
 (0)