summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-01-10 17:43:52 +0100
committerLudovic Courtès <ludo@gnu.org>2022-01-10 19:31:02 +0100
commitc1aa0ee9bdbdd229bba50dec6d1c0f41bff7b8d2 (patch)
treef1fe3f89f20c00123bfa91a3ad72b69ba823c452 /doc
parent611989d1d6853ddff8968154576b63d262ff3ef6 (diff)
downloadguix-c1aa0ee9bdbdd229bba50dec6d1c0f41bff7b8d2.tar.gz
guix hash: Allow '-r' as a non-deprecated alias.
This is a followup to 05c962594c346da21f201be72caadfa19060cc9d.

Discussed at <https://issues.guix.gnu.org/51307#24>.

* guix/scripts/hash.scm (%options): Warn about deprecation for
"--recursive", but not for '-r' as it's a convenient shorthand.  Mention
'--serializer=nar' in the deprecation message.
* doc/guix.texi (Invoking guix hash): Adjust accordingly.
Diffstat (limited to 'doc')
-rw-r--r--doc/guix.texi7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index ab9f17b29f..390c4347d6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11827,11 +11827,12 @@ in the definitions of packages.
 
 @item --recursive
 @itemx -r
-This option is deprecated in favor of @option{--serializer}.  It is a
-legacy alias for that with @var{type} set to @code{nar}.
+The @option{--recursive} option is deprecated in favor of
+@option{--serializer=nar} (see below); @option{-r} remains accepted as a
+convenient shorthand.
 
 @item --serializer=@var{type}
-@itemx -S
+@itemx -S @var{type}
 Compute the hash on @var{file} using @var{type} serialization.
 
 @var{type} may be one of the following: