Merge branch 'pr/2' into fix-styleguide-trigger-positioning

Author: Jacob Müller

.eslintrc.js

@@ -0,0 +1,30 @@
+module.exports = {
+    "globals": {
+        "describe": true,
+        "beforeEach": true,
+        "it": true,
+        "expect": true
+    },
+    "env": {
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "indent": [
+            "error",
+            2
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+};

.firebaserc

@@ -0,0 +1,6 @@
+{
+  "projects": {
+    "live": "angular-io",
+    "ngdocsdev": "ngdocsdev"
+  }
+}

.gitignore

@@ -21,10 +21,12 @@ _.*
 **/resources/zips
 public/docs/xref-*.*
 _zip-output
-www
+www*
 npm-debug*.log*
 *.plnkr.html
 plnkr.html
+*.eplnkr.html
+eplnkr.html
 *plnkr.no-link.html
 public/docs/*/latest/guide/cheatsheet.json
 protractor-results.txt

.nvmrc

@@ -1 +1 @@
-5
+6

.travis.yml

@@ -2,28 +2,28 @@ dist: trusty
 sudo: required
 language: node_js
 node_js:
-  - "5"
+  - "6"
 os:
   - linux
 env:
   global:
     - DBUS_SESSION_BUS_ADDRESS=/dev/null
     - DISPLAY=:99.0
     - CHROME_BIN=chromium-browser
-    - LATEST_RELEASE=2.0.0-rc.4
+    # using SHA instead of version to fix build-compile issue
+    - LATEST_RELEASE=cfc12c653970c9ad6d807a6a8ebff58edbc568a0
     - TASK_FLAGS="--dgeni-log=warn"
-    # - TASK_FLAGS=""
   matrix:
     - TASK=lint
     - TASK="run-e2e-tests --fast" SCRIPT=examples-install.sh
     - TASK="run-e2e-tests --fast" SCRIPT=examples-install-preview.sh
-    - TASK=build-compile SCRIPT=deploy-install.sh WAIT="travis_wait 50"
-    - TASK=build-compile SCRIPT=deploy-install-preview.sh WAIT="travis_wait 50"
+    - TASK=build-compile SCRIPT=deploy-install.sh WAIT="travis_wait 50" POST_SCRIPT="check-docs.sh -v"
+    - TASK=build-compile SCRIPT=deploy-install-preview.sh WAIT="travis_wait 50" POST_SCRIPT="check-docs.sh -v"
 matrix:
   fast_finish: true
   allow_failures:
     - env: TASK="run-e2e-tests --fast" SCRIPT=examples-install-preview.sh
-    - env: TASK=build-compile SCRIPT=deploy-install-preview.sh WAIT="travis_wait 50"
+    - env: TASK=build-compile SCRIPT=deploy-install-preview.sh WAIT="travis_wait 50" POST_SCRIPT="check-docs.sh -v"
 before_install:
   - source ./scripts/env-set.sh
   - ./scripts/before-install.sh
@@ -34,3 +34,4 @@ before_script:
   - sh -e /etc/init.d/xvfb start
 script:
   - $WAIT gulp $TASK $TASK_FLAGS
+  - if [[ -n "$POST_SCRIPT" ]]; then ./scripts/$POST_SCRIPT; fi

README.md

@@ -1,7 +1,7 @@
 # Angular.io
 [![Build Status][travis-badge]][travis-badge-url]
 
-Angular.io is site for Angular 2 **documentation** . 
+Angular.io is site for Angular **documentation** . 
 
 This site also includes links to other helpful angular resources including 
 Angular 2, Angular 1, Angular Material, and AngularFire.
@@ -21,16 +21,18 @@ Filing issues is helpful but **pull requests** that improve the docs are even be
 
 Learn how to [contribute to Angular.io](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
 
+> **IMPORTANT**: Do _NOT_ make changes to cached files under `public/docs/ts/_cache`. Cached files are updated through a separate workflow.
+
 ## Development Setup
 This site relies heavily on node and npm.
 
 1. Make sure you are using at least node v.5+ and latest npm; 
 if not install [nvm](https://github.com/creationix/nvm) to get node going on your machine.
 
-1. install these npm packages *globally*: `npm install -g harp gulp`
+1. Install these npm packages *globally*: `npm install -g harp gulp`
 
-1. clone this repo and the [angular source code repo](https://github.com/angular/angular) to the same parent directory.
-The two cloned repo directories must be sibling.
+1. Clone this repo, the [angular/angular source code repo](https://github.com/angular/angular), and the [dart-lang/angular2 source code repo](https://github.com/dart-lang/angular2) to the same parent directory.
+The three cloned repo directories must be siblings, with the latter two repo directories named **angular** and **angular-dart**, respectively.
 
 1. cd into root directory `angular.io/`
 
@@ -71,11 +73,11 @@ If you are only going to work on a specific part of the docs, such as the dev gu
 ## Code Sample Development
 
 All documentation is supported by sample code and plunkers. 
-Such code resides in the `public/docs/_examples` directory, under chapter-specific directories, further divided by language track.
+Such code resides in the `public/docs/_examples` directory, under page-specific directories, further divided by language track.
 
 For example, the TypeScript QuickStart sample is in `public/docs/_examples/quickstart/ts`.
 
-All samples are in a consistent directory structure using the same styles and the same npm packages, including the latest release of Angular 2.
+All samples are in a consistent directory structure using the same styles and the same npm packages, including the latest release of Angular.
 This consistency is possible in part thanks to gulp-driven tooling. 
 To run the samples locally and confirm that they work properly, 
 take the following extra steps to prepare the environment: