Handle Wordpress random keys correctly on install and upgrade.

[wizard.git] / doc / upgrade.rst

diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index be9c2363e425fc147c04185563240048cb124b58..259577d0fcb885b762b78f3b508e9409a37408e4 100644 (file)
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -112,6 +112,12 @@ Finally, :meth:`~wizard.app.Application.upgrade` actually performs an upgrade,
 and will most frequently call a shell script or fetches a web page that will
 perform a schema upgrade.
 
+.. note::
+
+    When migrating an old-style autoinstall, it is neither expected nor
+    required for upgrade scripts for the intervening versions to be
+    created.
+
 Troubleshooting
 ---------------
 
@@ -178,7 +184,7 @@ to these tags::
 Find the committer date associated with the ``tmaster`` commit using ``git show tmaster``
 and note it somewhere::
 
-    DATE=`git show tmaster --format="format:%cd" | head -n1`
+    DATE=`git show tmaster --pretty="format:%cd" | head -n1`
 
 Next, begin performing ordinary procedure for preparing the
 pristine copy.  There are two caveats:  you will need to use ``--force``
@@ -222,11 +228,10 @@ manually restore any custom changes we may have made, then amend your commit and
 push back::
 
     # you probably lost your environment variable
-    DATE=`git show HEAD --format="format:%cd" | head -n1`
+    DATE=`git show HEAD --pretty="format:%ad" | head -n1`
     env GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" git commit --amend -a
     git tag -d $APP-$VERSION-scripts
     git tag $APP-$VERSION-scripts
-    git push --force
     git push --force --tags
 
 And on your now invalid version, grab the new version::