From 2799970350073812c2d458d9750649cdf7f23315 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 5 Sep 2017 14:04:14 +0300 Subject: [PATCH 1/1] doc: Replace server-list with server-blocks. * doc/guix.texi (Web Services): Replace 'server-list' with 'server-blocks'. --- doc/guix.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e7a88e19f..9ac52535b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14038,7 +14038,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") @@ -14086,7 +14086,7 @@ The directory to which NGinx will write log files. The directory in which NGinx will create a pid file, and write temporary files. -@item @code{server-list} (default: @code{'()}) +@item @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{}. @@ -14097,7 +14097,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") @@ -14122,7 +14122,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") @@ -14144,7 +14144,7 @@ requests with two servers. @item @code{config-file} (default: @code{#f}) If the @var{config-file} is provided, this will be used, rather than generating a configuration file from the provided @code{log-directory}, -@code{run-directory}, @code{server-list} and @code{upstream-list}. For +@code{run-directory}, @code{server-blocks} and @code{upstream-list}. For proper operation, these arguments should match what is in @var{config-file} to ensure that the directories are created when the service is activated. -- 2.14.1