diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-12-23 23:26:04 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-23 23:26:04 +0100 |
commit | 02bf685d00238f74d28211e71d22a03f58e962cd (patch) | |
tree | 00d0bc1ef3fd74b6dc5d3ce68cb24835bf07a91f /doc/guix.texi | |
parent | 472c36bd36696cfe744e8a7b8f4d4ac5800e0f68 (diff) | |
parent | 8f2253af7da1c537b4c11e6b43c8d0a9f026b609 (diff) | |
download | guix-02bf685d00238f74d28211e71d22a03f58e962cd.tar guix-02bf685d00238f74d28211e71d22a03f58e962cd.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'doc/guix.texi')
-rw-r--r-- | doc/guix.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index c942908997..b14c8e0020 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17699,7 +17699,7 @@ A service type for the @code{fcgiwrap} FastCGI proxy. @end defvr @deftp {Data Type} fcgiwrap-configuration -Data type representing the configuration of the @code{fcgiwrap} serice. +Data type representing the configuration of the @code{fcgiwrap} service. This type has the following parameters: @table @asis @item @code{package} (default: @code{fcgiwrap}) @@ -17874,7 +17874,7 @@ The cat avatar generator is a simple service to demonstrate the use of php-fpm in @code{Nginx}. It is used to generate cat avatar from a seed, for instance the hash of a user's email address. -@deffn {Scheme Procedure} cat-avatar-generator-serice @ +@deffn {Scheme Procedure} cat-avatar-generator-service @ [#:cache-dir "/var/cache/cat-avatar-generator"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] |