Getting new-docs ready for launch

docs/_config.yml

@@ -32,12 +32,6 @@ defaults:
   values:
     layout: docs
     sectionid: docs
-- scope:
-    path: docs-old
-    type: pages
-  values:
-    layout: docs-old
-    sectionid: docs-old
 - scope:
     path: contributing
     type: pages

docs/_data/nav_docs.yml

@@ -12,10 +12,12 @@
       title: Components and Props
     - id: state-and-lifecycle
       title: State and Lifecycle
-    - id: lists-conditional-rendering
-      title: Lists & Conditional Rendering
     - id: handling-events
       title: Handling Events
+    - id: conditional-rendering
+      title: Conditional Rendering
+    - id: lists-and-keys
+      title: Lists and Keys
     - id: forms
       title: Forms
     - id: lifting-state-up
@@ -34,16 +36,31 @@
       title: Refs and the DOM
     - id: optimizing-performance
       title: Optimizing Performance
-    - id: context
-      title: Context
-    - id: reconciliation
-      title: Reconciliation
     - id: react-without-es6
       title: React Without ES6
     - id: react-without-jsx
       title: React Without JSX
+    - id: reconciliation
+      title: Reconciliation
+    - id: context
+      title: Context
     - id: web-components
       title: Web Components
+- title: Reference
+  items:
+    - id: react-api
+      title: React
+      subitems:
+        - id: react-component
+          title: React.Component
+    - id: react-dom
+      title: ReactDOM
+    - id: react-dom-server
+      title: ReactDOMServer
+    - id: dom-elements
+      title: DOM Elements
+    - id: events
+      title: SyntheticEvent
     - id: addons
       title: Add-Ons
       subitems:
@@ -63,18 +80,4 @@
           title: Shallow Compare
         - id: two-way-binding-helpers
           title: Two-way Binding Helpers
-- title: Reference
-  items:
-    - id: react-api
-      title: React
-      subitems:
-        - id: react-component
-          title: React.Component
-    - id: react-dom
-      title: ReactDOM
-    - id: react-dom-server
-      title: ReactDOMServer
-    - id: dom-elements
-      title: DOM Elements
-    - id: events
-      title: SyntheticEvent
+

docs/_includes/footer.html

@@ -4,7 +4,7 @@
     </a>
     <div>
       <h5><a href="/react/docs/">Docs</a></h5>
-      <a href="/react/docs/installation.html">Quick Start</a>
+      <a href="/react/docs/hello-world.html">Quick Start</a>
       <a href="/react/docs/thinking-in-react.html">Thinking in React</a>
       <a href="/react/tutorial/tutorial.html">Tutorial</a>
       <a href="/react/docs/jsx-in-depth.html">Advanced Guides</a>

docs/_includes/hero.html

@@ -6,7 +6,7 @@
     </div>
 
     <div class="buttons-unit">
-      <a href="/react/docs/installation.html" class="button">Get Started</a>
+      <a href="/react/docs/hello-world.html" class="button">Get Started</a>
       <a href="/react/tutorial/tutorial.html" class="button">Take the Tutorial</a>
     </div>
   </div>

docs/_includes/nav_docs.html

@@ -36,42 +36,4 @@ <h3>{{ section.title }}</h3>
     </div>
   {% endfor %}
 
-  <!-- Old Docs Nav -->
-  <!-- TODO: remove it when new docs are ready -->
-  {% for section in site.data.nav_docs_old %}
-    <div class="nav-docs-section">
-      <h3>{{ section.title }}</h3>
-      <ul>
-        {% for item in section.items %}
-          <li>
-            {{ item | docs_old_sidebar_link }}
-            {% if item.subitems %}
-              <ul>
-                {% for subitem in item.subitems %}
-                  <li>
-                    {{ subitem | docs_old_sidebar_link }}
-                  </li>
-                {% endfor %}
-              </ul>
-            {% endif %}
-          </li>
-        {% endfor %}
-      </ul>
-    </div>
-  {% endfor %}
-
-  <!-- Old Tips Nav -->
-  <!-- TODO: remove it when new docs are ready -->
-  {% for section in site.data.nav_tips %}
-    <div class="nav-docs-section">
-      <h3>{{ section.title }}</h3>
-      <ul>
-        {% for item in section.items %}
-          <li>
-            <a href="/react/tips/{{ item.id }}.html"{% if page.id == item.id %} class="active"{% endif %}>{{ item.title }}</a>
-          </li>
-        {% endfor %}
-      </ul>
-    </div>
-  {% endfor %}
 </div>

docs/_includes/navigation.html

@@ -6,7 +6,7 @@
     </a>
     <div class="nav-lists">
       <ul class="nav-site nav-site-internal">
-        <li><a href="/react/docs/installation.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
+        <li><a href="/react/docs/hello-world.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
         <li><a href="/react/tutorial/tutorial.html"{% if page.sectionid == 'tutorial' %} class="active"{% endif %}>Tutorial</a></li>
         <li><a href="/react/community/support.html"{% if page.sectionid == 'community' %} class="active"{% endif %}>Community</a></li>
         <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>

docs/_posts/2014-01-06-community-roundup-14.md

@@ -28,7 +28,7 @@ React is only one-piece of your web application stack. [Mark Lussier](https://gi
 
 ## React Rails Tutorial
 
-[Selem Delul](http://selem.im) bundled the [React Tutorial](/react/docs/tutorial.html) into a rails app. This is a good example on how to get started with a rails project.
+[Selem Delul](http://selem.im) bundled the [React Tutorial](/react/tutorial/tutorial.html) into a rails app. This is a good example on how to get started with a rails project.
 
 > ```
 git clone https://github.com/necrodome/react-rails-tutorial

docs/contributing/how-to-contribute.md

@@ -4,6 +4,7 @@ title: How to Contribute
 layout: contributing
 permalink: contributing/how-to-contribute.html
 next: codebase-overview.html
+redirect_from: "/tips/introduction.html"
 ---
 
 React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on [facebook.com](https://www.facebook.com). We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and answers some questions that you may have.
@@ -26,7 +27,7 @@ If you send a pull request, please do it against the `master` branch. We maintai
 
 React follows [semantic versioning](http://semver.org/). We release patch versions for bugfixes, minor versions for new features, and major versions for any breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance.
 
-We tag every pull request with a label marking whether the change should go in the next [patch](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-patch), [minor](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-minor), or a [major](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-major) version. We release new patch versions every few weeks, minor versions every few months, and major versions one or two times a year. 
+We tag every pull request with a label marking whether the change should go in the next [patch](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-patch), [minor](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-minor), or a [major](https://github.com/facebook/react/pulls?q=is%3Aopen+is%3Apr+label%3Asemver-major) version. We release new patch versions every few weeks, minor versions every few months, and major versions one or two times a year.
 
 Every significant change is documented in the [changelog file](https://github.com/facebook/react/blob/master/CHANGELOG.md).
 
@@ -38,7 +39,7 @@ We are using [GitHub Issues](https://github.com/facebook/react/issues) for our p
 
 #### Reporting New Issues
 
-The best way to get your bug fixed is to provide a reduced test case. This [JSFiddle template](https://jsfiddle.net/reactjs/69z2wepo/) is a great starting point. 
+The best way to get your bug fixed is to provide a reduced test case. This [JSFiddle template](https://jsfiddle.net/reactjs/69z2wepo/) is a great starting point.
 
 #### Security Bugs
 

docs/css/react.scss

@@ -369,13 +369,13 @@ h1, h2, h3, h4, h5, h6 {
     width: 100%;
     padding-bottom: 40px;
   }
-   
+
   ul {
     list-style: none;
     margin: 0;
   }
   ul ul {
-    margin: 6px 0 0 20px;
+    margin: 0 0 6px 20px;
   }
   li {
     line-height: 16px;