From 01dd1601a4bd1e55beaf1a13cfbfc2ac9c21eb68 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 14 Aug 2014 17:15:04 +0200 Subject: [PATCH] Post beta release update. -- --- NEWS | 6 +++++- doc/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index cef9417c2..d6fb1b33f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Noteworthy changes in version 2.1.0-betaNNN (unreleased) +-------------------------------------------------------- + + Noteworthy changes in version 2.1.0-beta783 (2014-08-14) -------------------------------------------------------- @@ -5,7 +9,7 @@ Noteworthy changes in version 2.1.0-beta783 (2014-08-14) * gpg: Make --quick-sign-key promote local key signatures. - * gpg: Add "show-usage" sub-option to --list-options. + * gpg: Added "show-usage" sub-option to --list-options. * gpg: Screen keyserver responses to avoid importing unwanted keys from rogue servers. diff --git a/doc/Makefile.am b/doc/Makefile.am index 43d69cd21..870aa91e0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -131,7 +131,7 @@ online: gnupg.html gnupg.pdf echo "Uploading current manuals to www.gnupg.org ..."; \ cp $(srcdir)/gnupg-logo-tr.png gnupg.html/; \ user=werner ; webhost="ftp.gnupg.org" ; dashdevel="" ; \ - if echo "@PACKAGE_VERSION@" | grep -- "-git" >/dev/null; then \ + if echo "@PACKAGE_VERSION@" | grep -- "-beta" >/dev/null; then \ dashdevel="-devel" ; \ else \ rsync -v gnupg.pdf $${user}@$${webhost}:webspace/manuals/ ; \