aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS9
-rw-r--r--doc/gpg.texi2
2 files changed, 9 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 4d533ce7e..fe80aabcf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Noteworthy changes in version 2.1.0 (unreleased)
+------------------------------------------------
+
+ * For a complete list of changes see the lists of changes for the
+ 2.1.0 beta versions below.
+
+
Noteworthy changes in version 2.1.0-beta864 (2014-10-03)
--------------------------------------------------------
@@ -11,7 +18,7 @@ Noteworthy changes in version 2.1.0-beta864 (2014-10-03)
* gpg: Default keyring is now created with a .kbx suffix.
- * gpg: Add a shortcut to key capabilies menu (e.g. "=e" sets the
+ * gpg: Add a shortcut to the key capabilies menu (e.g. "=e" sets the
encryption capabilities).
* gpg: Fixed obsolete options parsing.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 33329a130..002e888ce 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1425,7 +1425,7 @@ Set what trust model GnuPG should follow. The models are:
@item always
@opindex trust-mode:always
Skip key validation and assume that used keys are always fully
- trusted. You generally won't use this unless you are using some
+ valid. You generally won't use this unless you are using some
external validation scheme. This option also suppresses the
"[uncertain]" tag printed with signature checks when there is no
evidence that the user ID is bound to the key. Note that this