aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2017-09-10 11:48:34 +0100
committerChristopher Baines <mail@cbaines.net>2017-09-10 12:00:03 +0100
commitc2a59a92bb18360f26d251c8b1b121b40b1bc806 (patch)
tree06e5cb3bd5a31a009693cf075cbe3bad7a854f2e
parentfb1cba687e2f4d8d19660085941fc9d56e77b4c7 (diff)
downloadguix-c2a59a92bb18360f26d251c8b1b121b40b1bc806.tar
guix-c2a59a92bb18360f26d251c8b1b121b40b1bc806.tar.gz
doc: Replace upstream-list with upstream-blocks.
This fixes the documentation to match the implementation. * doc/guix.texi (Web Services): Replace 'upstream-list' with 'upstream-blocks'.
-rw-r--r--doc/guix.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index be11520b3a..0399c39814 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14105,12 +14105,12 @@ HTTPS.
(ssl-certificate-key #f))))))
@end example
-@item @code{upstream-list} (default: @code{'()})
+@item @code{upstream-blocks} (default: @code{'()})
A list of @dfn{upstream blocks} to create in the generated configuration
file, the elements should be of type
@code{<nginx-upstream-configuration>}.
-Configuring upstreams through the @code{upstream-list} can be useful
+Configuring upstreams through the @code{upstream-blocks} can be useful
when combined with @code{locations} in the
@code{<nginx-server-configuration>} records. The following example
creates a server configuration with one location configuration, that
@@ -14133,7 +14133,7 @@ requests with two servers.
(nginx-location-configuration
(uri "/path1")
(body '("proxy_pass http://server-proxy;"))))))))
- (upstream-list
+ (upstream-blocks
(list (nginx-upstream-configuration
(name "server-proxy")
(servers (list "server1.example.com"
@@ -14143,7 +14143,7 @@ requests with two servers.
@item @code{file} (default: @code{#f})
If a configuration @var{file} is provided, this will be used, rather than
generating a configuration file from the provided @code{log-directory},
-@code{run-directory}, @code{server-blocks} and @code{upstream-list}. For
+@code{run-directory}, @code{server-blocks} and @code{upstream-blocks}. For
proper operation, these arguments should match what is in @var{file} to ensure
that the directories are created when the service is activated.