From 24d53c1c3736f7d74e9aeee95813484e884f1e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Tue, 19 Jul 2016 15:08:58 -0700 Subject: [PATCH] Finish Jekyll 3 Upgrade - Reverts change to use sectionid on layouts (was unreliable), using config to make sure that's specified on all pages that need it - Adds permalinks to all other pages so that og data is correct - Corrects some permalinks that were in correct (translations) --- 404.md | 1 + Gemfile.lock | 41 ++++++++++--------- _config.yml | 17 ++++++++ _layouts/default.html | 4 +- acknowledgements.md | 1 + contributing/design-principles.md | 2 +- docs/01-why-react.ru-RU.md | 2 +- docs/01-why-react.zh-TW.md | 2 +- docs/02-displaying-data.ru-RU.md | 2 +- .../03-interactivity-and-dynamic-uis.ru-RU.md | 2 +- docs/error-decoder.md | 2 +- docs/getting-started.md | 1 + docs/thinking-in-react.it-IT.md | 1 + docs/thinking-in-react.ja-JP.md | 1 + docs/thinking-in-react.md | 1 + docs/thinking-in-react.zh-CN.md | 2 +- docs/tutorial.it-IT.md | 1 + docs/tutorial.md | 1 + docs/tutorial.zh-CN.md | 2 +- downloads.md | 1 + feed.xml | 1 - jsx-compiler.md | 1 + support.md | 1 + warnings/legacy-factories.md | 1 + warnings/refs-must-have-owner.md | 1 + warnings/special-props.md | 1 + warnings/unknown-prop.md | 1 + 27 files changed, 63 insertions(+), 31 deletions(-) diff --git a/404.md b/404.md index 6d4039fb..ab9ba1d6 100644 --- a/404.md +++ b/404.md @@ -1,6 +1,7 @@ --- layout: single title: Page Not Found +permalink: 404.html --- We couldn't find what you were looking for. diff --git a/Gemfile.lock b/Gemfile.lock index e2d31911..bd775465 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,9 +2,9 @@ GEM remote: https://rubygems.org/ specs: colorator (0.1) - ffi (1.9.10) - ffi (1.9.10-x64-mingw32) - jekyll (3.1.3) + ffi (1.9.14) + ffi (1.9.14-x64-mingw32) + jekyll (3.1.6) colorator (~> 0.1) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -14,39 +14,41 @@ GEM rouge (~> 1.7) safe_yaml (~> 1.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.10.0) + jekyll-redirect-from (0.11.0) jekyll (>= 2.0) jekyll-sass-converter (1.4.0) sass (~> 3.4) - jekyll-watch (1.3.1) - listen (~> 3.0) - json (1.8.3) - kramdown (1.10.0) + jekyll-watch (1.4.0) + listen (~> 3.0, < 3.1) + json (2.0.1) + kramdown (1.11.1) liquid (3.0.6) - listen (3.1.1) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) - mini_portile2 (2.0.0) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - nokogiri (1.6.7.2-x64-mingw32) - mini_portile2 (~> 2.0.0.rc2) + mini_portile2 (2.1.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + nokogiri (1.6.8-x64-mingw32) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) posix-spawn (0.3.11) pygments.rb (0.6.3) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.2.0) - rake (11.1.2) + rake (11.2.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) redcarpet (3.3.4) - rouge (1.10.1) + rouge (1.11.1) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) sass (3.4.22) - wdm (0.1.1) yajl-ruby (1.2.1) PLATFORMS @@ -63,7 +65,6 @@ DEPENDENCIES rb-fsevent redcarpet sanitize (~> 2.0) - wdm (>= 0.1.0) BUNDLED WITH 1.11.2 diff --git a/_config.yml b/_config.yml index 2a46105a..4571003a 100644 --- a/_config.yml +++ b/_config.yml @@ -14,11 +14,28 @@ defaults: type: posts values: layout: post + sectionid: blog +- scope: + path: blog + type: pages + values: + sectionid: blog - scope: path: docs type: pages values: layout: docs + sectionid: docs +- scope: + path: tips + type: pages + values: + sectionid: docs +- scope: + path: contributing + type: pages + values: + sectionid: docs exclude: - Gemfile - Gemfile.lock diff --git a/_layouts/default.html b/_layouts/default.html index 82659d8f..d42b8b15 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -50,10 +50,10 @@ React