finish table of contents

Author: jenweber

guides/advanced-use/asset-pipeline.md

@@ -0,0 +1 @@
+<!-- Cover very very basic Broccoli info. Link to Oli's tutorials. See the Ember Times Readers questions for a great writeup of what broccoli is -->

guides/advanced-use/blueprints.md

@@ -0,0 +1 @@
+<!-- cover what blueprints are and how to modify them. Can be ported from the existing site -->

guides/advanced-use/configurations.md

@@ -0,0 +1 @@
+<!-- Should cover at least minification and fingerprinting -->

guides/advanced-use/file-layout.md

@@ -0,0 +1 @@
+<!-- A place to talk about the resolver (see ember-cli.com), module imports, and eventually, Module Unification when it becomes a thing -->

guides/advanced-use/stylesheets.md

@@ -0,0 +1 @@
+<!-- Should cover similar topics as ember-cli.com -->

guides/basic-use/configurations.md

@@ -0,0 +1 @@
+<!-- The bare minimum explanation of what to do with ember-cli-build.js -->

guides/basic-use/deploying.md

@@ -0,0 +1 @@
+<!-- should show ember build, link to ember-cli-deploy, Guides tutorial -->

guides/basic-use/index.md

@@ -18,29 +18,21 @@ npm install -g ember-cli
 
 This will make the `ember` command available throughout your project folders. The installation is successful if `ember -v` returns a version number. When it is run inside of an Ember app directory, it will show the version of the app, otherwise it will show the globally installed version of the CLI.
 
-### Additional steps for Mac users
+### Additional steps for Mac and Linux users
 
-Mac users may need to install [Watchman](https://facebook.github.io/watchman/) via [Homebrew](http://brew.sh/). Watchman helps correct for some buggy file watching behavior in MacOS. Do not use the `npm` package by the same name.
+Mac and Linux users may need to install [Watchman](https://facebook.github.io/watchman/). Watchman helps correct for some buggy and inefficient file watching behavior. Do not use the `npm` package by the same name.
+
+Mac users cann install via [Homebrew](http://brew.sh/):
 
 ```bash
 brew install watchman
 ```
 
-## Versioning
-
-The Ember CLI is backwards compatible, meaning that the latest CLI can be used on older app versions. New versions of the CLI are released roughly every 6 weeks, in step with versions of Ember.js itself.
-
-A list of CLI releases and their features can be found on the GitHub repository for [ember-cli](https://github.com/ember-cli/ember-cli/releases).
-
-## Upgrading the CLI version
-
-The Ember CLI can be updated independently of the apps it is used with.
-Upgrade instructions are published with [each release](https://github.com/ember-cli/ember-cli/releases).
+Linux users should follow the steps on the [Watchman](https://facebook.github.io/watchman/) website to build from the source.
 
-## Upgrading the Ember app itself
+### Installing for Windows
 
-There are automated Ember CLI tools available to help upgrade Ember apps, including codemods that help with syntax changes. Visit
-[ember-cli-update](https://github.com/ember-cli/ember-cli-update for the latest instructions.
+<!-- copy over from ember-cli.com -->
 
 ## Getting help
 

guides/basic-use/upgrading.md

@@ -0,0 +1,30 @@
+There are three kinds of upgrades for normal Ember app development: 
+
+1. The version of the CLI that you are using
+2. The version of the app itself
+3. Addons used by an app
+
+## Upgrading the CLI version
+
+The Ember CLI is backwards compatible, meaning that the latest CLI can be used on older app versions. New versions of the CLI are released roughly every 6 weeks, in step with versions of Ember.js itself.
+
+Upgrade instructions are published with [each release](https://github.com/ember-cli/ember-cli/releases).
+
+In general, here's how to upgrade the version of the CLI and verify that the upgrade worked:
+
+```bash
+npm uninstall -g ember-cli
+npm install -g ember-cli
+ember --version
+```
+
+## Upgrading an Ember app itself
+
+There are automated Ember CLI tools available to help upgrade Ember apps, including codemods that help with syntax changes. Visit
+[ember-cli-update](https://github.com/ember-cli/ember-cli-update for the latest instructions.
+
+<!-- Needs a section that describes a common upgrade experience, explains deprecations, links to Deprecations site, and hints that upgrades to get new features or jump major versions require changes to the codebase. Common misconception is that you can just jump versions in package.json. Pull in info from https://ember-cli.com/user-guide/#upgrading  -->
+
+## Upgrading Addon Dependencies
+
+<!-- very brief guidance on how to approach addons, and a note that sometimes deprecation warnings come from outdated addons rather than your app -->

guides/pages.yml

@@ -7,14 +7,20 @@
 - title: 'Basic Use'
   url: 'basic-use'
   pages:
-    - title: 'Installing and upgrading'
+    - title: 'Installing'
       url: 'index'
     - title: 'CLI commands'
       url: 'cli-commands'
     - title: 'Using addons'
       url: 'using-addons'
     - title: 'Using npm packages'
       url: 'using-npm-packages'
+    - title: 'Deploying an Ember app'
+      url: 'deploying'
+    - title: 'Upgrading'
+      url: 'upgrading'
+    - title: 'Common configurations'
+      url: 'configurations'
 
 - title: 'Writing addons'
   url: 'writing-addons'
@@ -25,12 +31,44 @@
     url: 'tutorial'
   - title: 'Testing'
     url: 'testing'
+  - title: 'Writing documentation'
+    url: 'documenting'
+  - title: 'Deploying an addon'
+    url: 'deploying'
+  - title: 'Wrapping existing libraries'
+    url: 'wrappers'
+  - title: 'Managing addon dependencies'
+    url: 'dependencies'
 
 - title: 'Advanced use'
   url: 'advanced-use'
   pages:
   - title: 'Overview'
     url: 'index'
+  - title: 'Advanced configurations'
+    url: 'configurations'
+  - title: 'Broccoli asset pipeline'
+    url: 'asset-pipeline'
+  - title: 'Creating blueprints'
+    url: 'blueprints'
+  - title: 'Stylesheet compilation'
+    url: 'stylesheets'
+  - title: 'File layout and the resolver'
+    url: 'file-layout'
+
+- title: 'Reference'
+  url: 'reference'
+  pages:
+  - title: 'Overview'
+    url: 'index'
+  - title: 'Windows support'
+    url: 'windows'
+  - title: 'Code Editor Integrations'
+    url: 'dev-tools'
+  - title: 'Common issues'
+    url: 'common-issues'
+  - title: 'Frequently Asked Questions'
+    url: 'faq'
 
 - title: 'API Documentation'
   url: 'api-documentation'

guides/reference/common-issues.md

@@ -0,0 +1 @@
+<!-- copy over from ember-cli.com -->

guides/reference/dev-tools.md

@@ -0,0 +1 @@
+<!-- Copy over code editor content -->

guides/reference/faq.md

@@ -0,0 +1 @@
+<!-- Do I need to use the CLI, why broccoli instead of webpack, node version compatibility? -->

guides/reference/index.md

@@ -0,0 +1 @@
+<!-- Brief description of what goes in the reference section. Mostly edge case stuff -->

guides/reference/windows.md

@@ -0,0 +1 @@
+<!-- Port over info from existing site -->

guides/writing-addons/dependencies.md

@@ -0,0 +1 @@
+<!-- Should cover where to put dependencies in package.json, how to export specific assets -->

guides/writing-addons/deploying.md

@@ -0,0 +1 @@
+<!-- This section should at least give people some clues about how to do a local production build, try it out locally, and then link to resources on publishing to npm -->

guides/writing-addons/documenting.md

@@ -0,0 +1 @@
+<!-- Should mention that many authors use the dummy app for their documentation. Should link to ember-cli-addon-docs, with clear indication of its status as a community project -->

guides/writing-addons/testing.md

@@ -1 +1 @@
-<!-- Help Wanted -->
+<!-- Should cover ember-try, tests, and using the dummy app in testing. See ember-styleguide and popular addons for inspiration -->

guides/writing-addons/wrappers.md

@@ -0,0 +1 @@
+<!-- Supplemental information to help someone write an Ember wrapper. Do not repeat content from the tutorial. -->