diff --git a/Gemfile.lock b/Gemfile.lock
index efc28841..1667e7a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,15 +15,15 @@ GEM
colorator (0.1)
ethon (0.9.0)
ffi (>= 1.3.0)
- execjs (2.6.0)
+ execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.10-x64-mingw32)
gemoji (2.1.0)
- github-pages (78)
+ github-pages (80)
github-pages-health-check (= 1.1.0)
- jekyll (= 3.0.5)
+ jekyll (= 3.1.6)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
@@ -47,11 +47,11 @@ GEM
octokit (~> 4.0)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
- html-pipeline (2.4.0)
+ html-pipeline (2.4.1)
activesupport (>= 2, < 5)
nokogiri (>= 1.4)
i18n (0.7.0)
- jekyll (3.0.5)
+ jekyll (3.1.6)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
@@ -92,7 +92,7 @@ GEM
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.0.0)
- minitest (5.8.4)
+ minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
@@ -117,7 +117,6 @@ GEM
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- wdm (0.1.1)
PLATFORMS
ruby
@@ -125,7 +124,6 @@ PLATFORMS
DEPENDENCIES
github-pages
- wdm (~> 0.1.0)
BUNDLED WITH
1.11.2
diff --git a/_config.yml b/_config.yml
index bc86fcdb..d3932ea6 100644
--- a/_config.yml
+++ b/_config.yml
@@ -179,10 +179,10 @@ whitelist:
# - /tags/my-awesome-tag/index.html ~> path: /tags/
# - path: /categories/
# - path: /
-categories:
+category_archive:
type: liquid
path: /categories/
-tags:
+tag_archive:
type: liquid
path: /tags/
# https://github.com/jekyll/jekyll-archives
diff --git a/_includes/category-list.html b/_includes/category-list.html
index 2347133f..77b13547 100644
--- a/_includes/category-list.html
+++ b/_includes/category-list.html
@@ -2,14 +2,14 @@
{% include base_path %}
-{% case site.categories.type %}
+{% case site.category_archive.type %}
{% when "liquid" %}
{% assign path_type = "#" %}
{% when "jekyll-archives" %}
{% assign path_type = nil %}
{% endcase %}
-{% if site.categories.path %}
+{% if site.category_archive.path %}
{% comment %}
@@ -23,7 +23,7 @@
{% for hash in category_hashes %}
{% assign keyValue = hash | split: '#' %}
{% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
- {{ category_word }}{% unless forloop.last %}, {% endunless %}
+ {{ category_word }}{% unless forloop.last %}, {% endunless %}
{% endfor %}
diff --git a/_includes/page__taxonomy.html b/_includes/page__taxonomy.html
index 53b5b805..5a0c39fc 100644
--- a/_includes/page__taxonomy.html
+++ b/_includes/page__taxonomy.html
@@ -1,9 +1,9 @@
{% include base_path %}
-{% if site.tags.type and page.tags[0] %}
+{% if site.tag_archive.type and page.tags[0] %}
{% include tag-list.html %}
{% endif %}
-{% if site.categories.type and page.categories[0] %}
+{% if site.category_archive.type and page.categories[0] %}
{% include category-list.html %}
{% endif %}
\ No newline at end of file
diff --git a/_includes/tag-list.html b/_includes/tag-list.html
index 96fde1f4..6e801f25 100644
--- a/_includes/tag-list.html
+++ b/_includes/tag-list.html
@@ -1,13 +1,13 @@
{% include base_path %}
-{% case site.tags.type %}
+{% case site.tag_archive.type %}
{% when "liquid" %}
{% assign path_type = "#" %}
{% when "jekyll-archives" %}
{% assign path_type = nil %}
{% endcase %}
-{% if site.tags.path %}
+{% if site.tag_archive.path %}
{% comment %}
@@ -21,7 +21,7 @@
{% for hash in tag_hashes %}
{% assign keyValue = hash | split: '#' %}
{% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
- {{ tag_word }}{% unless forloop.last %}, {% endunless %}
+ {{ tag_word }}{% unless forloop.last %}, {% endunless %}
{% endfor %}