Merge branch 'feature/upstream' into develop

1 files changed, 14 insertions, 17 deletions

diff --git a/doc/releases.txt b/doc/releases.txt
index abd007e..0cb7518 100644
--- a/doc/releases.txt
+++ b/doc/releases.txt
@@ -1,4 +1,4 @@
-2019-07-30
+2019-08-24
 
 This text summarizes some points to pay attention to when a new release
 of sane-backends is planned.
@@ -32,34 +32,31 @@ Before the release:
 Making the release:
 
 * temporarily set a PRIVATE_TOKEN variable in the GitLab CI/CD
-  variables You have to create one in your own Settings > Access
-  Tokens.  Set it to expire in a few hours to avoid abuse.
+  variables.  You have to create one in your own Settings > Access
+  Tokens.  Set it to expire the next day to avoid abuse.  Better yet,
+  remove it from the CI/CD variables when the job is finished.
 * git tag -a -s 1.0.28 -m Release
 * git push --tags origin master
 * trigger the manual 'release' stage of the build via the web UI when
   this becomes possible.  This requires a valid PRIVATE_TOKEN.
 
-Announcing the release:
+Updating the website and announcing the release:
 
-* [TBD] checkout the sane/website.git module and:
-* [TBD] copy sane-backends.html to sane-backends-"old-version".html
-* [TBD] update sane-supported-devices.html with link to above "old" file
-* [TBD] rebuild sane-backends.html and sane-mfgs.html (make -C doc html-pages)
+* checkout the sane/website.git module and:
+* copy sane-backends.html to sane-backends-"old-version".html
+* update sane-supported-devices.html with link to above "old" file
+* rebuild sane-backends.html and sane-mfgs.html (make -C doc html-pages)
 * [TBD] use man2html from http://hydra.nac.uci.edu/indiv/ehood/man2html.html
   to rebuild html man pages (make -C doc html-man) (no other version works)
-* [TBD] add md5 sum to sane-md5sums.txt
-* [TBD] check and update platforms page (sane-support.html)
-* add announcement to index.html
+* update announcement to index.html
 * git commit -a && git push
-* check that website was updated automatically
-* [TBD] rebuild descriptions.db (make -C doc descriptions.db)
-* announce release on sane-devel and sane-announce mailing lists
+* check that website's pipeline succeeded
+* announce release on sane-announce mailing list (and Cc: sane-devel).
+  Ping the sane-announce list's moderator (m. allan noah) to get your
+  post approved ASAP.
 
 After the release:
 
-* [TBD] copy ChangeLog to ChangeLogs/ChangeLog-$version
-* [TBD] start a new ChangeLog via git checkout ChangeLog
-* [TBD] bump version number in tools/create-changelog.sh
 * remove the ':new' tag from all doc/descriptions*/*.desc files
 * git add new and changed files and commit
 * git push