From 9a69f8ce17c2ef5f14c0fa4287ef3621b1829daf Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Fri, 28 Sep 2018 09:13:52 -0700
Subject: [PATCH] Adjusting the release build scripts

---
 admin/post_release                  | 19 +++++++++++++------
 admin/release                       |  2 +-
 admin/release.md                    |  2 +-
 user_guide_src/source/changelog.rst |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/admin/post_release b/admin/post_release
index d8f48e6bcaad..7f5e96d1bd42 100755
--- a/admin/post_release
+++ b/admin/post_release
@@ -61,21 +61,28 @@ Version |release|
 Release Date: Not Released
 ' user_guide_src/source/changelog.rst
 
-#---------------------------------------------------
-# Merge away
-echo -e "${BOLD}Setup the develop branch${NORMAL}"
 git add .
 git commit -S -m "Post ${branch} cleanup"
+
+#---------------------------------------------------
+# Cleanup master
+echo -e "${BOLD}Cleanup the master branch${NORMAL}"
+git checkout master
+git merge ${branch}
 git push origin master
-git push UPSTREAM master
+#git push UPSTREAM master
 
+#---------------------------------------------------
+# Cleanup develop
+echo -e "${BOLD}Cleanup the develop branch${NORMAL}"
 git checkout develop
 git merge ${branch}
 git push origin develop
-git push UPSTREAM develop
+#git push UPSTREAM develop
 
 # keep or delete the release branch? up to you
-#git branch -d $branch
+# at this point, you should have uptodate develop and master,
+# as well as the release and post-release branches
 
 #---------------------------------------------------
 # Phew!
diff --git a/admin/release b/admin/release
index 0625bac77018..fd88e623c7ad 100755
--- a/admin/release
+++ b/admin/release
@@ -83,6 +83,7 @@ echo -e "${BOLD}Generate the user guide${NORMAL}"
 cd user_guide_src
 
 # make the UG & embed it in the project root
+rm -rf build/*
 make html
 rm -Rf ../docs
 mv build/html ../docs
@@ -113,7 +114,6 @@ done
 git add .
 git commit -m "Release ${version}${qualifier}"
 
-
 #---------------------------------------------------
 # Done for now
 echo -e "${BOLD}Your $branch branch is ready to inspect.${NORMAL}"
diff --git a/admin/release.md b/admin/release.md
index d583ee7fc74a..28474ff9f693 100644
--- a/admin/release.md
+++ b/admin/release.md
@@ -91,4 +91,4 @@ Complete the next few steps of the release manually:
 Once the release branch has been vetted, and you have
 completed the manual steps, clean up with:
 
-    `admin/post_release`
+    `admin/post_release version [qualifier]`
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b0df6ee34fcf..8a21c7946f7f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -3,7 +3,7 @@ Change Log
 ##########
 
 Version |release|
-=================
+=================================
 
 Release Date: Not Released