Merge pull request #58 from Shopify/revert-docs-config

[Docs] Revert Jekyll config change
Shopify · Nov 29, 2016 · 83fc43e · 83fc43e
2 parents 079aac7 + 3515ef5
commit 83fc43e
Show file tree

Hide file tree

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

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`
-If you get a permission error, try `bundle exec jekyll serve`
+- `jekyll serve -s docs`
+If you get a permission error, try `bundle exec jekyll serve -s docs`
 
 View locally at [http://127.0.0.1:4000/slate/](http://127.0.0.1:4000/slate/).
 

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