Coby Chapple 6a57d5248b merge in changes from latest master ...

conflicts:
- site/_posts/2012-07-01-permalinks.md
- site/css/style.css
- site/index.html

2013-05-02 21:16:47 +01:00

..

2012-07-01-configuration.md

merge in changes from latest master

2013-05-02 21:16:47 +01:00

2012-07-01-contributing.md

Tell people to update the site not the wiki.

2013-04-18 23:17:09 -05:00

2012-07-01-deployment-methods.md

Using build and serve sub-commands in docs

2013-01-11 23:50:13 -08:00

2012-07-01-extras.md

Fix the link to the Homebrew wiki

2013-04-18 23:17:09 -05:00

2012-07-01-frontmatter.md

merge in changes from latest master

2013-05-02 21:16:47 +01:00

2012-07-01-github-pages.md

Update GH Pages docs for github.io change.

2013-04-07 15:33:21 -07:00

2012-07-01-heroku.md

Update site dir with contents of #583 at rev cb19367.

2012-12-31 12:48:04 -08:00

2012-07-01-home.md

Fix up some verbiage that didn't jive quite right.

2013-04-18 23:17:08 -05:00

2012-07-01-installation.md

Add a word that was missing

2013-04-18 23:17:08 -05:00

2012-07-01-migrations.md

Don't end an independent thought with a preposition.

2013-04-19 22:56:19 -05:00

2012-07-01-pages.md

Wrap at 80 columns

2013-04-18 23:16:53 -05:00

2012-07-01-pagination.md

Wrap at 80 columns

2013-04-18 23:16:53 -05:00

2012-07-01-permalinks.md

merge in changes from latest master

2013-05-02 21:16:47 +01:00

2012-07-01-plugins.md

merge in changes from latest master

2013-05-02 21:16:47 +01:00

2012-07-01-posts.md

Clean up site docs to prepare for 1.0 release.

2013-04-03 19:06:05 +02:00

2012-07-01-resources.md

Update site dir with contents of #583 at rev cb19367.

2012-12-31 12:48:04 -08:00

2012-07-01-sites.md

Changed 'six' to 'some' on Sites page

2013-01-15 14:56:04 -08:00

2012-07-01-structure.md

merge in changes from latest master

2013-05-02 21:16:47 +01:00

2012-07-01-templates.md

merge in changes from latest master

2013-05-02 21:16:47 +01:00

2012-07-01-troubleshooting.md

Using build and serve sub-commands in docs

2013-01-11 23:50:13 -08:00

2012-07-01-usage.md

Fix a verb tense mismatch

2013-04-18 23:17:08 -05:00

2012-07-01-variables.md

merge in changes from latest master

2013-05-02 21:16:47 +01:00