From 78eae9ffe8cecfcfcf19e353c8d0a5afd8f343e5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 29 Jan 2024 09:24:19 +0100 Subject: [PATCH] doc: Mark --textmode as legacy option. -- --- .git-blame-ignore-revs | 2 ++ doc/gpg.texi | 37 +++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7182d90d9..ec5aae1c7 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,4 @@ # indent: Modernize mem2str. 6a80d6f9206eae2c867c45daa5cd3e7d6c6ad114 +# doc: Fix spelling errors found by lintian. +2ed1f68b48db7b5503045386de0500fddf70077e diff --git a/doc/gpg.texi b/doc/gpg.texi index 9c1721500..93abd45cd 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2899,24 +2899,6 @@ done with @code{--with-colons}. @table @gnupgtabopt -@item -t, --textmode -@itemx --no-textmode -@opindex textmode -Treat input files as text and store them in the OpenPGP canonical text -form with standard "CRLF" line endings. This also sets the necessary -flags to inform the recipient that the encrypted or signed data is text -and may need its line endings converted back to whatever the local -system uses. This option is useful when communicating between two -platforms that have different line ending conventions (UNIX-like to Mac, -Mac to Windows, etc). @option{--no-textmode} disables this option, and -is the default. - -@item --force-v3-sigs -@itemx --no-force-v3-sigs -@item --force-v4-certs -@itemx --no-force-v4-certs -These options are obsolete and have no effect since GnuPG 2.1. - @item --force-ocb @itemx --force-aead @opindex force-ocb @@ -3891,6 +3873,25 @@ all on Windows. @table @gnupgtabopt +@item -t, --textmode +@itemx --no-textmode +@opindex textmode +Treat input files as text and store them in the OpenPGP canonical text +form with standard "CRLF" line endings. This also sets the necessary +flags to inform the recipient that the encrypted or signed data is text +and may need its line endings converted back to whatever the local +system uses. This option was useful when communicating between two +platforms with different line ending conventions (UNIX-like to Mac, +Mac to Windows, etc). @option{--no-textmode} disables this option, and +is the default. Note that this is a legacy option which should not +anymore be used by any modern software. + +@item --force-v3-sigs +@itemx --no-force-v3-sigs +@item --force-v4-certs +@itemx --no-force-v4-certs +These options are obsolete and have no effect since GnuPG 2.1. + @item --show-photos @itemx --no-show-photos @opindex show-photos