summaryrefslogtreecommitdiff
path: root/trove.configure.help
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-09-17 17:03:36 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-09-17 17:03:36 +0100
commiteca4102de2c146fade89968ba7a68d03b69fc459 (patch)
tree73fdb280280d7e89a771c5dff4ef97d80c461ea0 /trove.configure.help
parent562a7fa353747a62cede095ae7790ab4854ec922 (diff)
parentd980deeb057d80b3c2f83eb2dff2c5b8a7de3a1d (diff)
downloaddefinitions-eca4102de2c146fade89968ba7a68d03b69fc459.tar.gz
Merge branch 'baserock/pedroalvarez/optional-upstream-trove'
Reviewed-by: Sam Thursfield Reviewed-by: Lars Wirzenius
Diffstat (limited to 'trove.configure.help')
-rw-r--r--trove.configure.help4
1 files changed, 2 insertions, 2 deletions
diff --git a/trove.configure.help b/trove.configure.help
index b8056e37..c96bdf74 100644
--- a/trove.configure.help
+++ b/trove.configure.help
@@ -82,8 +82,8 @@ help: |
access it. This configuration does not do that automatically.
* `UPSTREAM_TROVE` -- public name of the upstream Trove (domain
- name or IP address). The new Trove will be configured to mirror
- that Trove.
+ name or IP address). This is an optional setting. If it's set,
+ the new Trove will be configured to mirror that Trove.
* `TROVE_ADMIN_USER`, `TROVE_ADMIN_EMAIL`, `TROVE_ADMIN_NAME`,
`TROVE_ADMIN_SSH_PUBKEY` -- details of the Trove's (initial)