updates for 6.0 release start here. see the release notes for all the…

… details in 6.0

404.md

@@ -3,4 +3,4 @@ title: "Page Not Found"
 search: exclude
 ---  
 
-Sorry, but the page you were trying to view does not exist — perhaps you can try searching for it.
+Sorry, but the page you were trying to view does not exist. Try searching for it or looking at the URL to see if it looks correct.

_config.yml

@@ -1,39 +1,47 @@
-permalink: /:year/:month/:day/:title/
-# this sets the style for permalinks. The date formatting (/:year/:month/:day/) will only apply to blog posts, while the pages will just show the title.
-url: http://idratherbewriting.com
-# where you plan to publish your site
-baseurl: "/documentation-theme-jekyll"
-# any subdirectory that appears after the domain where you're publishing your site
+
+include: ['_pages']
+# this tag includes all pages from the pages directory and puts them into the root directory
+
 output: web
 # this property is useful for conditional filtering of content that is separate from the PDF.
+
 topnav_title: Jekyll Documentation Theme
 # this appears on the top navigation bar next to the home button
-site_title: Jekyll theme for designers
+
+site_title: Jekyll theme for documentation
 # this appears in the html browser tab for the site title (seen mostly by search engines, not users)
+
 company_name: Your company
 # this appears in the footer
-github_editme_path: tomjohnson1492/documentation-theme-jekyll/blob/gh-pages
+
+github_editme_path: tomjohnson1492/documentation-theme-jekyll/blob/gh-pages/_pages/
 # if you're using Github, provide the basepath to the branch you've created for reviews, following the sample here. if not, leave this value blank.
+
 disqus_shortname: idrbwjekyll
 # if you're using disqus for comments, add the shortname here. if not, leave this value blank.
+
 host: 127.0.0.1
 # the preview server used. Leave as is.
+
 port: 4005
-# the port where the preview is rendered. You can leave this as is unless you have other Jekyll builds using this same port that might cause conflicts.
+# the port where the preview is rendered. You can leave this as is unless you have other Jekyll builds using this same port that might cause conflicts. in that case, use another port such as 4006.
 
 exclude:
-  - _site
-  - _drafts/
   - .idea/
+  - .gitignore
 # these are the files and directories that jekyll will exclude from the build
 
 feedback_email: tomjohnson1492@gmail.com
 # used as a contact email for the Feedback link in the top navigation bar
 
-#feedback_disable: true
-#feedback_text: "Need help?"
-#feedback_link: "http://helpy.io/"
-# change feedback link behaviour if you use a support ticketing system or something else
+# feedback_disable: true
+# if you uncomment the previous line, the Feedback link gets removed
+
+# feedback_text: "Need help?"
+# if you uncomment the previous line, it changes the Feedback text
+
+# feedback_link: "http://helpy.io/"
+# if you uncomment the previous line, it changes where the feedback link points to
 
 highlighter: rouge
 # library used for syntax highlighting
@@ -49,7 +57,7 @@ kramdown:
 collections:
   tooltips:
     output: false
-# collection declared here. this renders the content in _tooltips and processes it, but doesn't output it as actual files in the output.
+# collections are declared here. this renders the content in _tooltips and processes it, but doesn't output it as actual files in the output unless you change output to true
 
 defaults:
   -
@@ -79,10 +87,15 @@ defaults:
       layout: "post"
       comments: true
       search: true
-      sidebar: tags_sidebar
+      sidebar: home_sidebar
 
 # these are defaults used for the frontmatter for these file types
 
+sidebars:
+- home_sidebar
+- mydoc_sidebar
+- product1_sidebar
+- product2_sidebar
 
 description: "Intended as a documentation theme based on Jekyll for technical writers documenting software and other technical products, this theme has all the elements you would need to handle multiple products with both multi-level sidebar navigation, tags, and other documentation features."
 # the description is used in the feed.xml file