diff mbox series

[24/59] config.txt: move gpg.* to a separate file

Message ID 20181020123848.2785-25-pclouds@gmail.com
State New, archived
Headers show
Series Split config.txt | expand

Commit Message

Duy Nguyen Oct. 20, 2018, 12:38 p.m. UTC
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Documentation/config.txt     | 21 +--------------------
 Documentation/gpg-config.txt | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 Documentation/gpg-config.txt
diff mbox series

Patch

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3065520a7f..adab71fd94 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -341,26 +341,7 @@  include::gitweb-config.txt[]
 
 include::grep-config.txt[]
 
-gpg.program::
-	Use this custom program instead of "`gpg`" found on `$PATH` when
-	making or verifying a PGP signature. The program must support the
-	same command-line interface as GPG, namely, to verify a detached
-	signature, "`gpg --verify $file - <$signature`" is run, and the
-	program is expected to signal a good signature by exiting with
-	code 0, and to generate an ASCII-armored detached signature, the
-	standard input of "`gpg -bsau $key`" is fed with the contents to be
-	signed, and the program is expected to send the result to its
-	standard output.
-
-gpg.format::
-	Specifies which key format to use when signing with `--gpg-sign`.
-	Default is "openpgp" and another possible value is "x509".
-
-gpg.<format>.program::
-	Use this to customize the program used for the signing format you
-	chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
-	be used as a legacy synonym for	`gpg.openpgp.program`. The default
-	value for `gpg.x509.program` is "gpgsm".
+include::gpg-config.txt[]
 
 include::gui-config.txt[]
 
diff --git a/Documentation/gpg-config.txt b/Documentation/gpg-config.txt
new file mode 100644
index 0000000000..590fe0d4ba
--- /dev/null
+++ b/Documentation/gpg-config.txt
@@ -0,0 +1,20 @@ 
+gpg.program::
+	Use this custom program instead of "`gpg`" found on `$PATH` when
+	making or verifying a PGP signature. The program must support the
+	same command-line interface as GPG, namely, to verify a detached
+	signature, "`gpg --verify $file - <$signature`" is run, and the
+	program is expected to signal a good signature by exiting with
+	code 0, and to generate an ASCII-armored detached signature, the
+	standard input of "`gpg -bsau $key`" is fed with the contents to be
+	signed, and the program is expected to send the result to its
+	standard output.
+
+gpg.format::
+	Specifies which key format to use when signing with `--gpg-sign`.
+	Default is "openpgp" and another possible value is "x509".
+
+gpg.<format>.program::
+	Use this to customize the program used for the signing format you
+	chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
+	be used as a legacy synonym for	`gpg.openpgp.program`. The default
+	value for `gpg.x509.program` is "gpgsm".