From 6b0e1e6265ad1644163efb5da697aeaf6be24370 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 16 Jan 2020 17:49:34 +0100 Subject: [PATCH] docs: use code-tags instead of pre-tags Similar to the previous commit, code-tags seems more appropriate than pre-tags here. So let's change it. Fixes: ca0c1e69cab "docs: update releasing process to use new scripts and gitlab" Acked-by: Dylan Baker Reviewed-by: Eric Engestrom Part-of: (cherry picked from commit 1de361e56b33fff35e2feb83dd5c404f67d42a69) --- .pick_status.json | 2 +- docs/releasing.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 902b1cc0f94..5ed43f11ec9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2974,7 +2974,7 @@ "description": "docs: use code-tags instead of pre-tags", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "ca0c1e69cab67276b2f701f7c3ea43658a52fd83" }, diff --git a/docs/releasing.html b/docs/releasing.html index 7c4e213fb92..8f0882b9369 100644 --- a/docs/releasing.html +++ b/docs/releasing.html @@ -520,7 +520,7 @@ So we do a quick 'touch test'

The release notes are completely generated by the -

bin/gen_release_notes.py
script. Simply run this script before +bin/gen_release_notes.py script. Simply run this script before bumping the version The only thing left to do is add the sha256 sums. @@ -576,7 +576,7 @@ Something like the following steps will do the trick: git cherry-pick -x X.Y -

Then run the 

./bin/post_verison.py X.Y.Z
, where X.Y.Z is the +

Then run the ./bin/post_verison.py X.Y.Z, where X.Y.Z is the version you just made. This will updated docs/relnotes.html and docs/index.html. Remove docs/release-calendar.html. Then commit and push: