Merge pull request #57 from Shopify/docs-config

[Docs] Move Jekyll config to root and add source
Shopify · Nov 29, 2016 · 079aac7 · 079aac7
2 parents 78849e5 + 3ed4ce6
commit 079aac7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -60,7 +60,7 @@ bundle install
 
 Generate the docs:
 ```
-jekyll serve -s docs
+jekyll serve
 ```
 If you get a permission error, try `bundle exec jekyll serve -s docs`
 

diff --git a/docs/_config.yml → _config.yml b/docs/_config.yml → _config.yml
@@ -7,6 +7,7 @@ baseurl: "/slate"
 url: "https://shopify.github.io"
 sass:
   cache: true
+source: docs
 
 # Build settings
 markdown: kramdown

diff --git a/docs/README.md b/docs/README.md
@@ -8,8 +8,8 @@
 *If you are having troubles setting up jekyll, see https://jekyllrb.com/docs/installation/*
 
 ### Serve the documentation
-- `jekyll serve -s docs`
-If you get a permission error, try `bundle exec jekyll serve -s docs`
+- `jekyll serve`
+If you get a permission error, try `bundle exec jekyll serve`
 
 View locally at [http://127.0.0.1:4000/slate/](http://127.0.0.1:4000/slate/).