From ce0354346cdace726b4edb2d35667566256b35ac Mon Sep 17 00:00:00 2001 From: fisherwebdev Date: Fri, 26 Sep 2014 07:03:37 -0700 Subject: [PATCH] Merge pull request #2236 from zpao/rm-flux-docs Conflicts: docs/docs/flux-todo-list.md --- docs/_data/nav_docs.yml | 2 + docs/_includes/nav_docs.html | 8 +- docs/_plugins/sidebar_item.rb | 14 + docs/_posts/2014-05-06-flux.md | 2 +- docs/docs/flux-overview.md | 92 +---- docs/docs/flux-todo-list.md | 666 +-------------------------------- 6 files changed, 21 insertions(+), 763 deletions(-) create mode 100644 docs/_plugins/sidebar_item.rb diff --git a/docs/_data/nav_docs.yml b/docs/_data/nav_docs.yml index 7eb71491c8..e7c71b68d5 100644 --- a/docs/_data/nav_docs.yml +++ b/docs/_data/nav_docs.yml @@ -81,5 +81,7 @@ items: - id: flux-overview title: Flux Overview + href: http://facebook.github.io/flux/docs/overview.html - id: flux-todo-list title: Flux TodoMVC Tutorial + href: http://facebook.github.io/flux/docs/todo-list.html diff --git a/docs/_includes/nav_docs.html b/docs/_includes/nav_docs.html index a66b822bce..1f33076ee5 100644 --- a/docs/_includes/nav_docs.html +++ b/docs/_includes/nav_docs.html @@ -6,16 +6,12 @@