diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/DETAILS | 4 | ||||
-rw-r--r-- | doc/TRANSLATE | 4 | ||||
-rw-r--r-- | doc/announce-2.1.txt | 8 | ||||
-rw-r--r-- | doc/gpg.texi | 2 | ||||
-rw-r--r-- | doc/gpgsm.texi | 4 | ||||
-rw-r--r-- | doc/scdaemon.texi | 10 | ||||
-rw-r--r-- | doc/tools.texi | 8 | ||||
-rw-r--r-- | doc/whats-new-in-2.1.txt | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index 4b3f0afbe..02f9badff 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -913,8 +913,8 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: *** FAILURE <location> <error_code> This is the counterpart to SUCCESS and used to indicate a program - failure. It is used similar to ISO-C's EXIT_FAILURE but allows to - convey more information, in particular an gpg-error error code. + failure. It is used similar to ISO-C's EXIT_FAILURE but allows + conveying more information, in particular a gpg-error error code. That numerical error code may optionally have a suffix made of an underscore and a string with an error symbol like "151011327_EOF". A dash may be used instead of <location>. diff --git a/doc/TRANSLATE b/doc/TRANSLATE index 2a20aad61..eb0de97cd 100644 --- a/doc/TRANSLATE +++ b/doc/TRANSLATE @@ -23,8 +23,8 @@ Help files GnuPG provides a little help feature (entering a ? on a prompt). This help used to be translated the usual way with gettext but it turned -out that this is too inflexible and does for example not allow to -correct little mistakes in the English text. For some newer features +out that this is too inflexible and does for example not allow +correcting little mistakes in the English text. For some newer features we require editable help files anyway and thus the existing help strings have been moved to plain text files names "help.LL.txt". We distribute these files and allow overriding them by files of that name diff --git a/doc/announce-2.1.txt b/doc/announce-2.1.txt index e165332a1..8c35e53c6 100644 --- a/doc/announce-2.1.txt +++ b/doc/announce-2.1.txt @@ -6,13 +6,13 @@ new release: Version 2.1.0. The GNU Privacy Guard (GnuPG) is a complete and free implementation of the OpenPGP standard as defined by RFC-4880 and better known as PGP. -GnuPG, also known as GPG, allows to encrypt and sign data and +GnuPG, also known as GPG, enables encryption and signing of data and communication, features a versatile key management system as well as access modules for public key directories. GnuPG itself is a command line tool with features for easy integration with other applications. -A wealth of frontend applications and libraries making use of GnuPG -are available. Since version 2 GnuPG provides support for S/MIME and -Secure Shell in addition to OpenPGP. +A wealth of frontend applications and libraries are available that +make use of GnuPG. Since version 2 GnuPG provides support for S/MIME +and Secure Shell in addition to OpenPGP. GnuPG is Free Software (meaning that it respects your freedom). It can be freely used, modified and distributed under the terms of the GNU diff --git a/doc/gpg.texi b/doc/gpg.texi index 3be401f53..4d6a26159 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2357,7 +2357,7 @@ obsolete; it does not harm to use it though. Revert to the pre-2.1 public key list mode. This only affects the human readable output and not the machine interface (i.e. @code{--with-colons}). Note that the legacy format does not -allow to convey suitable information for elliptic curves. +convey suitable information for elliptic curves. @item --with-fingerprint @opindex with-fingerprint diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index 2f6c29788..dae26b239 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -636,7 +636,7 @@ algorithm than actually used. @command{gpgsm} uses a one-pass data processing model and thus needs to rely on the announced digest algorithms to properly hash the data. As a workaround this option may be used to tell gpg to also hash the data using the algorithm -@var{name}; this slows processing down a little bit but allows to verify +@var{name}; this slows processing down a little bit but allows verification of such broken signatures. If @command{gpgsm} prints an error like ``digest algo 8 has not been enabled'' you may want to try this option, with @samp{SHA256} for @var{name}. @@ -1479,7 +1479,7 @@ GETAUDITLOG [--data] [--html] If @option{--data} is used, the audit log is send using D-lines instead of being sent to the file descriptor given by an OUTPUT -command. If @option{--html} is used, the output is formated as an +command. If @option{--html} is used, the output is formatted as an XHTML block. This is designed to be incorporated into a HTML document. diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi index 5e532232d..c1458147f 100644 --- a/doc/scdaemon.texi +++ b/doc/scdaemon.texi @@ -258,7 +258,7 @@ deprecated; it may be removed in future releases. @item --disable-ccid @opindex disable-ccid Disable the integrated support for CCID compliant readers. This -allows to fall back to one of the other drivers even if the internal +allows falling back to one of the other drivers even if the internal CCID driver can handle the reader. Note, that CCID support is only available if libusb was available at build time. @@ -284,10 +284,10 @@ To get a list of available CCID readers you may use this command: If @var{n} is not 0 and no client is actively using the card, the card will be powered down after @var{n} seconds. Powering down the card avoids a potential risk of damaging a card when used with certain -cheap readers. This also allows non Scdaemon aware applications to -access the card. The disadvantage of using a card timeout is that -accessing the card takes longer and that the user needs to enter the -PIN again after the next power up. +cheap readers. This also allows applications that are not aware of +Scdaemon to access the card. The disadvantage of using a card timeout +is that accessing the card takes longer and that the user needs to +enter the PIN again after the next power up. Note that with the current version of Scdaemon the card is powered down immediately at the next timer tick for any value of @var{n} other diff --git a/doc/tools.texi b/doc/tools.texi index e52d6a70b..d6cf56ee4 100644 --- a/doc/tools.texi +++ b/doc/tools.texi @@ -234,7 +234,7 @@ commit the changes. @command{gpgconf} provides the backend of a configuration editor. The configuration editor would usually be a graphical user interface -program, that allows to display the current options, their default +program that displays the current options, their default values, and allows the user to make changes to the options. These changes can then be made active with @command{gpgconf} again. Such a program that uses @command{gpgconf} in this way will be called GUI @@ -999,9 +999,9 @@ This script is a wrapper around @command{gpgconf} to run it with the command @code{--apply-defaults} for all real users with an existing GnuPG home directory. Admins might want to use this script to update he GnuPG configuration files for all users after -@file{/etc/gnupg/gpgconf.conf} has been changed. This allows to enforce -certain policies for all users. Note, that this is not a bulletproof of -forcing a user to use certain options. A user may always directly edit +@file{/etc/gnupg/gpgconf.conf} has been changed. This allows enforcing +certain policies for all users. Note, that this is not a bulletproof way to +force a user to use certain options. A user may always directly edit the configuration files and bypass gpgconf. @noindent diff --git a/doc/whats-new-in-2.1.txt b/doc/whats-new-in-2.1.txt index dd29c669b..19ed8b9fc 100644 --- a/doc/whats-new-in-2.1.txt +++ b/doc/whats-new-in-2.1.txt @@ -540,7 +540,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html key id matching the key id of another key. Importing a key with a long key id already used by another key in gpg’s local key store was not possible due to checks done on import. Now, if the “wrong” key - has been imported first /gpg/ would not allow to later import the + has been imported first /gpg/ would not allow later import of the second “correct” key. This problem has been fixed in 2.1 by allowing the import and by doing trial verification against all matching keys. |