aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2008-01-10 08:13:14 +0000
committerWerner Koch <[email protected]>2008-01-10 08:13:14 +0000
commit1e46b20f4822380ab93a580914fa6236a09e91fb (patch)
tree65cd0b4f9909ed6084623af9a4d409ae32c050f8
parent2008-01-10 Marcus Brinkmann <[email protected]> (diff)
downloadgnupg-1e46b20f4822380ab93a580914fa6236a09e91fb.tar.gz
gnupg-1e46b20f4822380ab93a580914fa6236a09e91fb.zip
Add missing country tag to qualified.txt.
Typo fixes.
-rw-r--r--doc/ChangeLog9
-rw-r--r--doc/a-decade-of-gnupg.txt6
-rw-r--r--doc/gpg.texi6
-rw-r--r--doc/qualified.txt4
4 files changed, 18 insertions, 7 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2fa21954c..080a97bc3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,7 +1,16 @@
+2008-01-10 Werner Koch <[email protected]>
+
+ * qualified.txt: Add missing country tag to the last entries.
+ Reported by Marcus Brinkmann.
+
2008-01-10 Marcus Brinkmann <[email protected]>
* tools.texi (gpgconf): Some clarifications.
+2008-01-02 Werner Koch <[email protected]>
+
+ * gpg.texi (GPG Esoteric Options): Mention --log-file.
+
2007-12-13 Werner Koch <[email protected]>
diff --git a/doc/a-decade-of-gnupg.txt b/doc/a-decade-of-gnupg.txt
index a42d741d8..7ab57a865 100644
--- a/doc/a-decade-of-gnupg.txt
+++ b/doc/a-decade-of-gnupg.txt
@@ -15,7 +15,7 @@ test version but nevertheless included most of the features of the
current GnuPG. The data format however was not compatible with
OpenPGP but oriented towards the PGP 2 format with a few extensions
(e.g. to allow streaming of data). The OpenPGP working group was
-founded back in fall 1997 and I learned a bit to late about it to
+founded back in fall 1997 and I learned a bit too late about it to
build "g10" according to the then existing draft. For copyright
reasons it was practically not possible to reverse engineer the format
used by PGP-5, so the establishment of the OpenPGP WG was the right
@@ -85,7 +85,7 @@ fun project, I soon found my self hacking on PGP-2 parsing code based
on the description in RFC-1991 and the pgformat.txt file. As this
turned out to be easy I continued and finally came up with code to
decrypt and create PGP-2 data. After I told the GNU towers that I
-will take up the PGP replacement implementation I spend the rest of
+will take up the PGP replacement implementation I spent the rest of
the year replacing IDEA by Blowfish, RSA by Elgamal, implementing
streaming encryption, adding some key management and getting the code
into a reasonable shape.
@@ -144,7 +144,7 @@ GnuPG development. In 2001 David Shaw joined the project and since
then he is one of the most active GnuPG hackers and the co-maintainer.
It's now a long time since GnuPG could be managed as a fun project and
-thus I spend most of my professional life maintaining and extending
+thus I now spend most of my professional life maintaining and extending
GnuPG. In 2001 I founded g10 Code, a Free Software company for the
development and support of GnuPG and related software. The most known
project is probably GnuPG-2 which started under the name NewPG as part
diff --git a/doc/gpg.texi b/doc/gpg.texi
index cc048b1db..771af2bbb 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2068,9 +2068,11 @@ Same as @option{--status-fd}, except the status data is written to file
@item --logger-fd @code{n}
Write log output to file descriptor @code{n} and not to stderr.
-@item --logger-file @code{file}
+@item --log-file @code{file}
+@itemx --logger-file @code{file}
Same as @option{--logger-fd}, except the logger data is written to file
-@code{file}.
+@code{file}. Note that @option{--log-file} is only implemented for
+GnuPG-2.
@item --attribute-fd @code{n}
Write attribute subpackets to the file descriptor @code{n}. This is most
diff --git a/doc/qualified.txt b/doc/qualified.txt
index ddd77972b..a627cb069 100644
--- a/doc/qualified.txt
+++ b/doc/qualified.txt
@@ -193,7 +193,7 @@ E0:BF:1B:91:91:6B:88:E4:F1:15:92:22:CE:37:23:96:B1:4A:2E:5C de
#[checked: 2007-12-13 via received ZIP file with qualified signature from
# /CN=Dr. Matthias Stehle/O=Deutscher Sparkassenverlag
# /C=DE/SerialNumber=DSV0000000008/SN=Stehle/GN=Matthias Georg]
-C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA
+C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA de
# ID: 0x3A7D979B
# S/N: 00C4216083F35C54F67B09A80C3C55FE7D
@@ -208,7 +208,7 @@ C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA
#[checked: 2007-12-13 via received ZIP file with qualified signature from
# /CN=Dr. Matthias Stehle/O=Deutscher Sparkassenverlag
# /C=DE/SerialNumber=DSV0000000008/SN=Stehle/GN=Matthias Georg"]
-D5:C7:50:F2:FE:4E:EE:D7:C7:B1:E4:13:7B:FB:54:84:3A:7D:97:9B
+D5:C7:50:F2:FE:4E:EE:D7:C7:B1:E4:13:7B:FB:54:84:3A:7D:97:9B de
#*******************************************