Merge branch 'master' into core-updates

1 files changed, 24 insertions, 1 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index 88bf0bb621..8f14ddd507 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2599,7 +2599,7 @@ The available formats are:
 @table @code
 @item tarball
 This is the default format.  It produces a tarball containing all the
-specifies binaries and symlinks.
+specified binaries and symlinks.
 
 @item docker
 This produces a tarball that follows the
@@ -13769,6 +13769,29 @@ Commands to allow running. By default, @code{sed} is disabled.
 @item @code{debug?} (default: @code{#f})
 Set @code{debug?} to @code{#t} to show debug messages.
 
+@item @code{wrap-lines} (default: @code{#t})
+Initial line wrapping state in the web interface. Set to @code{#t} to
+initially wrap lines (the default), or to @code{#f} to initially not
+wrap lines.
+
+@item @code{http-auth} (default: @code{#f})
+HTTP authentication type to use. Set to @code{#f} to disable
+authentication (the default). Supported values are @code{"digest"} or
+@code{"basic"}.
+
+@item @code{users} (default: @code{#f})
+If HTTP authentication is enabled (see @code{http-auth}), access will be
+restricted to the credentials provided here. To configure users, use a
+list of pairs, where the first element of the pair is the username, and
+the 2nd element of the pair is the password.
+
+@example
+(tailon-configuration-file
+  (http-auth "basic")
+  (users     '(("user1" . "password1")
+               ("user2" . "password2"))))
+@end example
+
 @end table
 @end deftp