aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'doc/ChangeLog')
-rw-r--r--doc/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 78b2b2589..6847b8a17 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-25 David Shaw <[email protected]>
+
+ * gpg.sgml: Document keyserver-option http-proxy, import-option
+ merge-only, remove old honor-http-proxy, --merge-only, and
+ --emulate-md-encode-bug. Document COLUMNS and LINES.
+
2004-02-12 David Shaw <[email protected]>
* gnupg.7: Clarify that 'gpgv' doesn't encrypt, and that's not a