Merge branch 'master' into webpack-update-instructions

Author: filipesilva

.github/ISSUE_TEMPLATE.md

@@ -1,12 +1,11 @@
 > Please provide us with the following information:
 > ---------------------------------------------------------------
+
 1. OS?  Windows 7, 8 or 10. Linux (which distribution). Mac OSX (Yosemite? El Capitan?)
 
 
-2. Versions. Please run `ng --version`. If there's nothing outputted, please
-   run in a Terminal: 
-        node --version
-   And paste the result here.
+2. Versions. Please run `ng --version`. If there's nothing outputted, please run
+in a Terminal: `node --version` and paste the result here:
 
 
 3. Repro steps. Was this an app that wasn't created using the CLI? What change did you
@@ -18,5 +17,6 @@
 
 
 5. Mention any other details that might be useful.
+
 > ---------------------------------------------------------------
-> > Thanks! We'll be in touch soon.
+> Thanks! We'll be in touch soon.

README.md

@@ -168,7 +168,7 @@ ng e2e
 
 Before running the tests make sure you are serving the app via `ng serve`.
 
-End-to-end tests are ran via [Protractor](https://angular.github.io/protractor/).
+End-to-end tests are run via [Protractor](https://angular.github.io/protractor/).
 
 
 ### Deploying the app via GitHub Pages
@@ -240,12 +240,12 @@ source ~/.bash_profile
 ### CSS Preprocessor integration
 
 Angular-CLI supports all major CSS preprocessors:
-- sass (node-sass)
-- less (less)
-- compass (compass-importer + node-sass)
-- stylus (stylus)
+- sass/scss ([http://sass-lang.com/](http://sass-lang.com/))
+- less ([http://lesscss.org/](http://lesscss.org/))
+- compass ([http://compass-style.org/](http://compass-style.org/))
+- stylus ([http://stylus-lang.com/](http://stylus-lang.com/))
 
-To use these prepocessors simply add the file to your component's `styreUrl`:
+To use these prepocessors simply add the file to your component's `styleUrls`:
 
 ```
 @Component({
@@ -264,18 +264,23 @@ style files:
 
 ```bash
 ng new sassy-project --style=sass
+```
+
+Or set the default style on an existing project:
 
+```bash
+ng set defaults.styleExt scss
 ```
 
 ### 3rd Party Library Installation
 
-Simply install your library via `npm install lib-name` and import it in your code.
+Simply install your library via `npm install lib-name --save` and import it in your code.
 
 If the library does not include typings, you can install them using npm:
 
 ```bash
-npm install moment
-npm install @types/moment
+npm install moment --save
+npm install @types/moment --save-dev
 ```
 
 ### Updating angular-cli

bin/ng

@@ -13,14 +13,14 @@ resolve('angular-cli', { basedir: process.cwd() },
   function (error, projectLocalCli) {
     var cli;
     if (error) {
-      // If there is an error, resolve could not find the ember-cli
+      // If there is an error, resolve could not find the ng-cli
       // library from a package.json. Instead, include it from a relative
       // path to this script file (which is likely a globally installed
-      // npm package). Most common cause for hitting this is `ember new`
+      // npm package). Most common cause for hitting this is `ng new`
       cli = require('../lib/cli');
     } else {
       // No error implies a projectLocalCli, which will load whatever
-      // version of ember-cli you have installed in a local package.json
+      // version of ng-cli you have installed in a local package.json
       cli = require(projectLocalCli);
     }