From 51df0efe343fc4d662abe91bd280cc42149ab426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Wed, 13 Aug 2014 11:48:09 -0700 Subject: [PATCH] Use jekyll-redirect-from instead of our other redirect method --- docs/Gemfile | 3 +++ docs/Gemfile.lock | 3 +++ docs/_config.yml | 2 ++ docs/_layouts/redirect.html | 6 ------ docs/docs/getting-started.md | 1 + docs/docs/index.html | 4 ---- docs/docs/ref-01-top-level-api.md | 1 + docs/docs/reference.html | 4 ---- 8 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 docs/_layouts/redirect.html delete mode 100644 docs/docs/index.html delete mode 100644 docs/docs/reference.html diff --git a/docs/Gemfile b/docs/Gemfile index 56b9cdeeb5..4f4991e3b2 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -6,6 +6,9 @@ gem 'rake' # 2.0 includes sass processing gem 'jekyll', '~>2.0' +# Auto redirect pages +gem 'jekyll-redirect-from' + # JSON gem 'json' diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index cd585ba5aa..a520567cf1 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -33,6 +33,8 @@ GEM coffee-script (~> 2.2) jekyll-gist (1.1.0) jekyll-paginate (1.0.0) + jekyll-redirect-from (0.5.0) + jekyll (~> 2.0) jekyll-sass-converter (1.2.0) sass (~> 3.2) jekyll-watch (1.1.0) @@ -73,6 +75,7 @@ PLATFORMS DEPENDENCIES jekyll (~> 2.0) + jekyll-redirect-from json rake rb-fsevent diff --git a/docs/_config.yml b/docs/_config.yml index e05686801f..75ca27e233 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -32,4 +32,6 @@ redcarpet: sass: style: :compressed sass_dir: _css +gems: +- jekyll-redirect-from react_version: 0.11.1 diff --git a/docs/_layouts/redirect.html b/docs/_layouts/redirect.html deleted file mode 100644 index c24f817484..0000000000 --- a/docs/_layouts/redirect.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/docs/getting-started.md b/docs/docs/getting-started.md index 57a2002431..36c3a59be0 100644 --- a/docs/docs/getting-started.md +++ b/docs/docs/getting-started.md @@ -2,6 +2,7 @@ id: getting-started title: Getting Started next: tutorial.html +redirect_from: "docs/index.html" --- ## JSFiddle diff --git a/docs/docs/index.html b/docs/docs/index.html deleted file mode 100644 index 4ea0787d5e..0000000000 --- a/docs/docs/index.html +++ /dev/null @@ -1,4 +0,0 @@ ---- -layout: redirect -destination: getting-started.html ---- diff --git a/docs/docs/ref-01-top-level-api.md b/docs/docs/ref-01-top-level-api.md index c31e9acbed..5e93c65164 100644 --- a/docs/docs/ref-01-top-level-api.md +++ b/docs/docs/ref-01-top-level-api.md @@ -3,6 +3,7 @@ id: top-level-api title: Top-Level API permalink: top-level-api.html next: component-api.html +redirect_from: "/docs/reference.html" --- ## React diff --git a/docs/docs/reference.html b/docs/docs/reference.html deleted file mode 100644 index 0d21cd16f4..0000000000 --- a/docs/docs/reference.html +++ /dev/null @@ -1,4 +0,0 @@ ---- -layout: redirect -destination: top-level-api.html ----