>From 0f4ec7e7cfbf5619ce029e6dc17819d5be104b87 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov
Date: Tue, 5 Sep 2017 14:04:14 +0300
Subject: [PATCH] doc: Replace server-list with server-blocks.
* doc/guix.texi (Web Services): Replace 'server-list' with 'server-blocks'.
---
doc/guix.texi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 3e9593d0c..b06108524 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14037,7 +14037,7 @@ A simple example configuration is given below.
@example
(service nginx-service-type
(nginx-configuration
- (server-list
+ (server-blocks
(list (nginx-server-configuration
(server-name '("www.example.com"))
(root "/srv/http/www.example.com")
@@ -14085,7 +14085,7 @@ The directory to which NGinx will write log files.
The directory in which NGinx will create a pid file, and write temporary
files.
address@hidden @code{server-list} (default: @code{'()})
address@hidden @code{server-blocks} (default: @code{'()})
A list of @dfn{server blocks} to create in the generated configuration
file, the elements should be of type
@code{}.
@@ -14096,7 +14096,7 @@ HTTPS.
@example
(service nginx-service-type
(nginx-configuration
- (server-list
+ (server-blocks
(list (nginx-server-configuration
(server-name '("www.example.com"))
(root "/srv/http/www.example.com")
@@ -14121,7 +14121,7 @@ requests with two servers.
(service
nginx-service-type
(nginx-configuration
- (server-list
+ (server-blocks
(list (nginx-server-configuration
(server-name '("www.example.com"))
(root "/srv/http/www.example.com")
@@ -14143,9 +14143,9 @@ 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},
address@hidden, @code{server-list} and @code{upstream-list}. For
-proper operation, these arguments should match what is in @var{file} to
-ensure that the directories are created when the service is activated.
address@hidden, @code{server-blocks} and @code{upstream-list}. For
+proper operation, these arguments should match what is in @var{file} to ensure
+that the directories are created when the service is activated.
This can be useful if you have an existing configuration file, or it's
not possible to do what is required through the other parts of the
--
2.14.1