summaryrefslogtreecommitdiffstats
path: root/template/en/default
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 /template/en/default
parentf64b0d503df0ea11b3ec26f452c581493f832233 (diff)
parent8f0d6063aa670f01ab1ac25d682589d1978c6e83 (diff)
downloadbugzilla-6367a26da4093a8379e370ef328e9507c98b2e7e.tar.gz
bugzilla-6367a26da4093a8379e370ef328e9507c98b2e7e.tar.xz
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/setup/strings.txt.pl4
1 files changed, 4 insertions, 0 deletions
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index adb79884a..cb0ac4fe9 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -233,6 +233,10 @@ END
localconfig_urlbase => <<'END',
The URL that is the common initial leading part of all URLs.
END
+ localconfig_canonical_urlbase => <<'END',
+The URL that is the canonical initial leading part of all URLs.
+This will be the production url for a dev site, for instance.
+END
localconfig_use_suexec => <<'END',
Set this to 1 if Bugzilla runs in an Apache SuexecUserGroup environment.