unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Oleg Pykhalov <go.wigust@gmail.com>
To: bug#28356 <28356@debbugs.gnu.org>
Subject: [bug#28356] [PATCH 1/1] doc: Replace server-list with server-blocks.
Date: Tue, 05 Sep 2017 14:15:30 +0300	[thread overview]
Message-ID: <87y3ptgzvx.fsf@magnolia> (raw)
In-Reply-To: <871snlieja.fsf@magnolia>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH 1/1] doc: Replace server-list with server-blocks. --]
[-- Type: text/x-patch, Size: 2409 bytes --]

From 2799970350073812c2d458d9750649cdf7f23315 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
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{<nginx-server-configuration>}.
@@ -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

  reply	other threads:[~2017-09-05 11:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-05 11:13 [bug#28356] [PATCH 0/1] doc: Replace server-list with server-blocks Oleg Pykhalov
2017-09-05 11:15 ` Oleg Pykhalov [this message]
2017-09-07  5:58   ` [bug#28356] [PATCH 1/1] " Christopher Baines
2017-09-07  7:46     ` Oleg Pykhalov
2017-09-10 11:02       ` bug#28356: " Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87y3ptgzvx.fsf@magnolia \
    --to=go.wigust@gmail.com \
    --cc=28356@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).