summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2012-11-08 00:35:17 -0500
committerGerrit Code Review <gerrit@beaker-project.org>2012-11-08 00:35:17 -0500
commit273a1ac07c3c52f4c93289afc11ed7c5b480cbba (patch)
tree2cd64f312bbc518c29db7fb010ffeb3ad9dd1093
parent7f90dbcfc66bd4e981c9a4308ff608491b9d89b5 (diff)
parent739b6b95f40574c5f3a423645911cc3762d39536 (diff)
Merge "Move beaker.documentation_link to app.cfg from server.cfg" into developbeaker-distribution-inventory-1_1-61
-rw-r--r--Server/bkr/server/config/app.cfg1
-rw-r--r--Server/server.cfg2
2 files changed, 1 insertions, 2 deletions
diff --git a/Server/bkr/server/config/app.cfg b/Server/bkr/server/config/app.cfg
index 4158b86..4fb1b88 100644
--- a/Server/bkr/server/config/app.cfg
+++ b/Server/bkr/server/config/app.cfg
@@ -161,6 +161,7 @@ autoreload.package="bkr.server"
# gzip_filter.mime_types = ["application/x-javascript", "text/javascript", "text/html", "text/css", "text/plain"]
beaker.bz_create_link = "https://bugzilla.redhat.com/enter_bug.cgi?product=Beaker"
+beaker.documentation_link = 'http://beaker-project.org/help.html'
[/logs]
static_filter.on = True
diff --git a/Server/server.cfg b/Server/server.cfg
index 0c8e448..a7aed73 100644
--- a/Server/server.cfg
+++ b/Server/server.cfg
@@ -150,8 +150,6 @@ tg.url_scheme = "http"
# default no message is shown.
#beaker.reservation_policy_url = "http://example.com/reservation-policy"
-beaker.documentation_link = 'http://beaker-project.org/help.html'
-
# If both of these options are set, the Piwik tracking javascript snippet will
# be embedded in all pages, reporting statistics back to the given Piwik
# installation.