summaryrefslogtreecommitdiffstats
path: root/README.rst
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-10-14 18:16:48 +0200
committerDylan William Hardison <dylan@hardison.net>2018-10-14 18:16:48 +0200
commit6367a26da4093a8379e370ef328e9507c98b2e7e (patch)
tree14c29aefed892abd5e9a53954019dc44242a9a7c /README.rst
parentf64b0d503df0ea11b3ec26f452c581493f832233 (diff)
parent8f0d6063aa670f01ab1ac25d682589d1978c6e83 (diff)
downloadbugzilla-6367a26da4093a8379e370ef328e9507c98b2e7e.tar.gz
bugzilla-6367a26da4093a8379e370ef328e9507c98b2e7e.tar.xz
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/README.rst b/README.rst
index 0d8d03f38..2a0fa289c 100644
--- a/README.rst
+++ b/README.rst
@@ -252,9 +252,12 @@ BUGZILLA_UNSAFE_AUTH_DELEGATION
BMO_urlbase
The public url for this instance. Note that if this begins with https://
- abd BMO_inbound_proxies is set to '*' Bugzilla will believe the connection to it
+ and BMO_inbound_proxies is set to '*' Bugzilla will believe the connection to it
is using SSL.
+BMO_canonical_urlbase
+ The public url for the production instance, if different from urlbase above.
+
BMO_attachment_base
This is the url for attachments.
When the allow_attachment_display parameter is on, it is possible for a