reorganize and update instructions

Author: nlharris

README.md

@@ -4,35 +4,38 @@ Migration of the OBF WP site to a static site generator (Hugo)
 
 ## Running hugo server locally
 
-1. [Install hugo](https://gohugo.io/installation/)
-2. Clone the GH repo:
+### Setting up a GitHub fork so you can make changes on your desktop
+1. To make changes to web pages on your desktop and commit them from the command line to GH, you will need a
+[GitHub personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens).
+2. Go to https://github.com/OBF/OBF.github.io and make a fork
+3. Then on your desktop (from the shell) do:
+```
+git clone  https://github.com/YOUR_GITHUB_ID/OBF.github.io
 ```
-git clone  https://github.com/OBF/OBF.github.io
+4. After you edit files on your desktop as desired, do:
+```
+git checkout -b BRANCH_NAME
+git add FILES
+git commit -m "my changes"
+git push    (or you might need to do git push --set-upstream origin BRANCH_NAME)
 ```
-3. Initialize hugo
+
+4. Then go to https://github.com/YOUR_GITHUB_ID/OBF.github.io to make a PR
+5. Once the PR is merged, your changes should be visible on [https://obf.github.io/](https://obf.github.io/)
+
+### Using hugo
+1. [Install hugo](https://gohugo.io/installation/)
+2. Initialize hugo
 ```
-cd OBF.github.io
 git submodule init
 git submodule update
 ```
-4. Run `hugo server` from the root folder of the project to get a
-local server that automatically rebuilds:
+4. Run `hugo server` from the root folder of the project to launch a local server that automatically rebuilds:
 ```
 hugo server &
 ```
 5. View the site in your web browser by going to [http://localhost:1313/](http://localhost:1313/)
 6. When you make changes, you should be able to reload http://localhost:1313/ to instantly see the changes!
-7. To push your changes back to the live site, remember to commit
-them. First you will need a
-[GitHub personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens). Then do:
-```
-git checkout -b BRANCH_NAME
-git add FILES
-git commit -m "my changes"
-git push    (or you might need to do git push --set-upstream origin BRANCH_NAME)
-```
-(Then go to https://github.com/OBF/OBF.github.io to make a PR)
-8. Once the PR is merged, your changes should be visible on [https://obf.github.io/](https://obf.github.io/)
 
 
 ## Steps taken to port content from old WP site