Minor doc updates and code refinements.

[wizard.git] / TODO

diff --git a/TODO b/TODO
index 7cf8c5b80d07419545734e592dc059e91ec2e76f..962ef75903ce8334aa6e872155fec3dcec06b01f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -265,8 +265,11 @@ OVERALL PLAN:
        perform a configuration in the production environment to extract
        out the canonical configuration files.
 
-   12. On the production server, call your wizard to perform an installation.
-       Inspect the generated configuration files, and implement:
+   12. On the production server, call your wizard to perform an installation;
+       be sure to use the option --no-commit in order to make propagating changes
+       back easier.  Inspect the generated configuration files (you can use `git
+       status` to find unversioned files that the installer created), and
+       implement:
             - extractors
             - substitutions
                 These are dictionaries of functions that perform extraction
@@ -298,7 +301,8 @@ OVERALL PLAN:
         script was buggy; try again.
 
     14. The current changes in the working copy should be merged in.  Add any new
-        files, and then `git commit --amend`.
+        files, and then `git commit --amend`.  `git push --force` to stick these
+        changes back in the "public" repository.
 
     15. In your local copy, you can pull the changes by doing `git reset --hard HEAD~`
         and then a `git pull` from the relevant source.  Otherwise, Git will complain