Merge remote-tracking branch 'origin/master'

This commit is contained in:
scotty
2016-03-04 17:07:10 -08:00
+2 -3
View File
@@ -51,7 +51,7 @@ You should see a special-to-you version of the site.
## Editing and staging the site locally ## Editing and staging the site locally
If you have files to upload, or just want to work offline, run the below commands to setup If you want to work offline, run the below commands to setup
your environment for running GitHub pages locally. Then, any edits you make will be viewable your environment for running GitHub pages locally. Then, any edits you make will be viewable
on a lightweight webserver that runs on your local machine. on a lightweight webserver that runs on your local machine.
@@ -107,8 +107,7 @@ If you're a bit rusty with git/GitHub, you might wanna read
[this](http://readwrite.com/2013/10/02/github-for-beginners-part-2) for a refresher. [this](http://readwrite.com/2013/10/02/github-for-beginners-part-2) for a refresher.
The above instructions work on Mac and Linux. The above instructions work on Mac and Linux.
[These instructions ](https://martinbuberl.com/blog/setup-jekyll-on-windows-and-host-it-on-github-pages/) Windows users, follow [these instructions](https://martinbuberl.com/blog/setup-jekyll-on-windows-and-host-it-on-github-pages/).
might help for Windows users.
## Thank you! ## Thank you!