From 2248770ec569ef37985d75d51bd7575708b93011 Mon Sep 17 00:00:00 2001 From: Dan Haywood Date: Mon, 9 Jan 2017 08:18:10 +0000 Subject: [PATCH 1/2] updates README.md --- README.md | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c029d97..0ffffa1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,30 @@ -# haywood-associates.github.io -Haywood Associates Ltd. website +# restfulobjects.github.io + +This site holds the Restful Objects Specification. + + +## Prep + +The `master` branch has the generated site, while the `pages` site has the source. + +The `pages` branch can be created in a worktree using: + + git worktree add -b pages ../restfulobjects.github.io-pages master + + +## Generating and Committing + +In this `pages` worktree, use: + + bundle exec jekyll serve + +This will recreate the site in the `_site` subdirectory, and allow the generated site to be viewed (at [http://localhost:4000](http://localhost:4000). + + +Once happy, copy over the `_site` subdirectory over the `master` worktree, eg: + + cd ../restfulobjects.github.io + cp -R ../restfulobjects.github.io-pages/_site/* . + + + From e4a6ba5bbb7b84db9339dc1820696dbd88106789 Mon Sep 17 00:00:00 2001 From: Dan Haywood Date: Mon, 9 Jan 2017 14:49:29 +0000 Subject: [PATCH 2/2] dummy edit --- index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.md b/index.md index a809a91..78945c1 100644 --- a/index.md +++ b/index.md @@ -2,6 +2,8 @@ layout: default --- + + The Restful Objects specification defines a set of RESTful resources, and corresponding JSON representations, for accessing and manipulating a domain object model. The current version of the spec is **v1.0.0**. ![Resources and Representations](images/resources-and-representations/v1.0-450px.png)