diff --git a/docs/documentation/build.md b/docs/documentation/build.md
index 3cbdc64d9916..afafb1ac2905 100644
--- a/docs/documentation/build.md
+++ b/docs/documentation/build.md
@@ -68,7 +68,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>aot</summary>
   <p>
-    `--aot` _default: false_
+    <code>--aot</code> <em>default value: false</em>
   </p>
   <p>
     Build using Ahead of Time compilation.
@@ -78,7 +78,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>app</summary>
   <p>
-    `--app` (aliases: `-a`)
+    <code>--app</code> (aliases: <code>-a</code>)
   </p>
   <p>
     Specifies app name or index to use.
@@ -88,7 +88,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>base-href</summary>
   <p>
-    `--base-href` (aliases: `-bh`)
+    <code>--base-href</code> (aliases: <code>-bh</code>)
   </p>
   <p>
     Base url for the application being built.
@@ -98,7 +98,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>deploy-url</summary>
   <p>
-    `--deploy-url` (aliases: `-d`)
+    <code>--deploy-url</code> (aliases: <code>-d</code>)
   </p>
   <p>
     URL where files will be deployed.
@@ -108,7 +108,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>output-path</summary>
   <p>
-    `--output-path` (aliases: `-op`)
+    <code>--output-path</code> (aliases: <code>-op</code>)
   </p>
   <p>
     Path where output will be placed
@@ -118,7 +118,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>environment</summary>
   <p>
-    `--environment` (aliases: `-e`)
+    <code>--environment</code> (aliases: <code>-e</code>)
   </p>
   <p>
     Defines the build environment.
@@ -128,7 +128,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>extract-css</summary>
   <p>
-    `--extract-css` (aliases: `-ec`)
+    <code>--extract-css</code> (aliases: <code>-ec</code>)
   </p>
   <p>
     Extract css from global styles onto css files instead of js ones.
@@ -138,7 +138,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>i18n-file</summary>
   <p>
-    `--i18n-file`
+    <code>--i18n-file</code>
   </p>
   <p>
     Localization file to use for i18n.
@@ -148,7 +148,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>i18n-format</summary>
   <p>
-    `--i18n-format`
+    <code>--i18n-format</code>
   </p>
   <p>
     Format of the localization file specified with --i18n-file.
@@ -158,7 +158,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>locale</summary>
   <p>
-    `--locale`
+    <code>--locale</code>
   </p>
   <p>
     Locale to use for i18n.
@@ -168,20 +168,20 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>output-hashing</summary>
   <p>
-    `--output-hashing` (aliases: `-oh`)
+    <code>--output-hashing</code> (aliases: <code>-oh</code>)
   </p>
   <p>
     Define the output filename cache-busting hashing mode.
   </p>
   <p>
-    Values: `none`, `all`, `media`, `bundles`
+    Values: <code>none</code>, <code>all</code>, <code>media</code>, <code>bundles</code>
   </p>
 </details>
 
 <details>
   <summary>output-path</summary>
   <p>
-    `--output-path` (aliases: `-op`)
+    <code>--output-path</code> (aliases: <code>-op</code>)
   </p>
   <p>
     Path where output will be placed.
@@ -191,7 +191,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>poll</summary>
   <p>
-    `--poll`
+    <code>--poll</code>
   </p>
   <p>
     Enable and define the file watching poll time period (milliseconds).
@@ -201,7 +201,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>progress</summary>
   <p>
-    `--progress` (aliases: `-pr`) _default value: true_
+    <code>--progress</code> (aliases: <code>-pr</code>) <em>default value: true</<em>
   </p>
   <p>
     Log progress to the console while building.
@@ -211,7 +211,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>sourcemap</summary>
   <p>
-    `--sourcemap` (aliases: `-sm`, `sourcemaps`)
+    <code>--sourcemap</code> (aliases: <code>-sm</code>, <code>sourcemaps</code>)
   </p>
   <p>
     Output sourcemaps.
@@ -221,17 +221,17 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>stats-json</summary>
   <p>
-    `--stats-json` (aliases: `-`)
+    <code>--stats-json</code>
   </p>
   <p>
-    Generates a `stats.json` file which can be analyzed using tools such as: `webpack-bundle-analyzer` or https://webpack.github.io/analyse.
+    Generates a <code>stats.json</code> file which can be analyzed using tools such as: <code>webpack-bundle-analyzer</code> or https://webpack.github.io/analyse.
   </p>
 </details>
 
 <details>
   <summary>target</summary>
   <p>
-    `--target` (aliases: `-t`, `-dev`, `-prod`) _default value: development_
+    <code>--target</code> (aliases: <code>-t</code>, <code>-dev</code>, <code>-prod</code>) <em>default value: development</em>
   </p>
   <p>
     Defines the build target.
@@ -241,7 +241,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>vendor-chunk</summary>
   <p>
-    `--vendor-chunk` (aliases: `-vc`) _default value: true_
+    <code>--vendor-chunk</code> (aliases: <code>-vc</code>) <em>default value: true</em>
   </p>
   <p>
     Use a separate bundle containing only vendor libraries.
@@ -251,7 +251,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>verbose</summary>
   <p>
-    `--verbose` (aliases: `-v`) _default value: false_
+    <code>--verbose</code> (aliases: <code>-v</code>) <em>default value: false</em>
   </p>
   <p>
     Adds more details to output logging.
@@ -261,7 +261,7 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 <details>
   <summary>watch</summary>
   <p>
-    `--watch` (aliases: `-w`)
+    <code>--watch</code> (aliases: <code>-w</code>)
   </p>
   <p>
     Run build when files change.
diff --git a/docs/documentation/config.md b/docs/documentation/config.md
index 04bea65a9fe8..7cad423de2c5 100644
--- a/docs/documentation/config.md
+++ b/docs/documentation/config.md
@@ -9,7 +9,7 @@
 <details>
   <summary>global</summary>
   <p>
-    `--global` _default value: false_
+    <code>--global</code> <em>default value: false</em>
   </p>
   <p>
     Get the value in the global configuration (in your home directory).
@@ -26,7 +26,7 @@
 <details>
   <summary>global</summary>
   <p>
-    `--global` _default value: false_
+    <code>--global</code> <em>default value: false</em>
   </p>
   <p>
     Get the value in the global configuration (in your home directory).
diff --git a/docs/documentation/e2e.md b/docs/documentation/e2e.md
index 9cefa3f3aa39..84b21fd14c36 100644
--- a/docs/documentation/e2e.md
+++ b/docs/documentation/e2e.md
@@ -17,7 +17,7 @@ End-to-end tests are run via [Protractor] (https://angular.github.io/protractor/
 <details>
   <summary>config</summary>
   <p>
-    `--config` (alias: `-c`)
+    <code>--config</code> (aliases: <code>-c</code>)
   </p>
   <p>
     Use a specific config file. Defaults to the protractor config file in `.angular-cli.json`.
@@ -27,7 +27,7 @@ End-to-end tests are run via [Protractor] (https://angular.github.io/protractor/
 <details>
   <summary>element-explorer</summary>
   <p>
-    `--element-explorer` (alias: `-ee`) _default value: false_
+    <code>--element-explorer</code> (aliases: <code>-ee</code>) <em>default value: false</em>
   </p>
   <p>
     Start Protractor's [Element Explorer](https://github.com/angular/protractor/blob/master/docs/debugging.md#testing-out-protractor-interactively) for debugging.
@@ -37,7 +37,7 @@ End-to-end tests are run via [Protractor] (https://angular.github.io/protractor/
 <details>
   <summary>serve</summary>
   <p>
-    `--serve` (alias: `-s`) _default value: true_
+    <code>--serve</code> (aliases: <code>-s</code>) <em>default value: true</em>
   </p>
   <p>
     Compile and Serve the app. All serve options are also available. The live-reload option defaults to false, and the default port will be random.
@@ -47,7 +47,7 @@ End-to-end tests are run via [Protractor] (https://angular.github.io/protractor/
 <details>
   <summary>specs</summary>
   <p>
-    `--specs` (alias: `-sp`) _default value: []_
+    <code>--specs</code> (aliases: <code>-sp</code>) <em>default value: []</em>
   </p>
   <p>
     Override specs in the protractor config. Can send in multiple specs by repeating flag (ng e2e --specs=spec1.ts --specs=spec2.ts).
@@ -57,7 +57,7 @@ End-to-end tests are run via [Protractor] (https://angular.github.io/protractor/
 <details>
   <summary>webdrive-update</summary>
   <p>
-    `--webdrive-update` (alias: `-wu`) _default value: true_
+    <code>--webdrive-update</code> (aliases: <code>-wu</code>) <em>default value: true</em>
   </p>
   <p>
     Try to update webdriver.
diff --git a/docs/documentation/eject.md b/docs/documentation/eject.md
index cde17cfefc97..eba0b0ff8a61 100644
--- a/docs/documentation/eject.md
+++ b/docs/documentation/eject.md
@@ -15,7 +15,7 @@ ng eject
 <details>
   <summary>aot</summary>
   <p>
-    `--aot`
+    <code>--aot</code>
   </p>
   <p>
     Build using Ahead of Time compilation.
@@ -25,7 +25,7 @@ ng eject
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
@@ -35,7 +35,7 @@ ng eject
 <details>
   <summary>base-href</summary>
   <p>
-    `--base-href` (alias: `-bh`)
+    <code>--base-href</code> (aliases: <code>-bh</code>)
   </p>
   <p>
     Base url for the application being built.
@@ -45,7 +45,7 @@ ng eject
 <details>
   <summary>deploy-url</summary>
   <p>
-    `--deploy-url` (alias: `-d`)
+    <code>--deploy-url</code> (aliases: <code>-d</code>)
   </p>
   <p>
     URL where files will be deployed.
@@ -55,7 +55,7 @@ ng eject
 <details>
   <summary>environment</summary>
   <p>
-    `--environment` (alias: `-e`)
+    <code>--environment</code> (aliases: <code>-e</code>)
   </p>
   <p>
     Defines the build environment.
@@ -65,7 +65,7 @@ ng eject
 <details>
   <summary>extract-css</summary>
   <p>
-    `--extract-css` (alias: `-ec`)
+    <code>--extract-css</code> (aliases: <code>-ec</code>)
   </p>
   <p>
     Extract css from global styles onto css files instead of js ones.
@@ -75,7 +75,7 @@ ng eject
 <details>
   <summary>force</summary>
   <p>
-    `--force` _default value: false_
+    <code>--force</code> <em>default value: false</em>
   </p>
   <p>
     Overwrite any webpack.config.js and npm scripts already existing.
@@ -85,7 +85,7 @@ ng eject
 <details>
   <summary>i18n-file</summary>
   <p>
-    `--i18n-file`
+    <code>--i18n-file</code>
   </p>
   <p>
     Localization file to use for i18n.
@@ -95,7 +95,7 @@ ng eject
 <details>
   <summary>i18n-format</summary>
   <p>
-    `--i18n-format`
+    <code>--i18n-format</code>
   </p>
   <p>
     Format of the localization file specified with --i18n-file.
@@ -105,7 +105,7 @@ ng eject
 <details>
   <summary>locale</summary>
   <p>
-    `--locale`
+    <code>--locale</code>
   </p>
   <p>
     Locale to use for i18n.
@@ -115,17 +115,17 @@ ng eject
 <details>
   <summary>output-hashing</summary>
   <p>
-    `--output-hashing` (alias: `-oh`) _default value: _
+    <code>--output-hashing</code> (aliases: <code>-oh</code>) <em>default value: </em>
   </p>
   <p>
-    Define the output filename cache-busting hashing mode. Possible values: `none`, `all`, `media`, `bundles`
+    Define the output filename cache-busting hashing mode. Possible values: <code>none</code>, <code>all</code>, <code>media</code>, <code>bundles</code>
   </p>
 </details>
 
 <details>
   <summary>output-path</summary>
   <p>
-    `--output-path` (alias: `-op`) _default value: _
+    <code>--output-path</code> (aliases: <code>-op</code>) <em>default value: </em>
   </p>
   <p>
     Path where output will be placed.
@@ -135,7 +135,7 @@ ng eject
 <details>
   <summary>poll</summary>
   <p>
-    `--poll`
+    <code>--poll</code>
   </p>
   <p>
     Enable and define the file watching poll time period (milliseconds) .
@@ -145,7 +145,7 @@ ng eject
 <details>
   <summary>progress</summary>
   <p>
-    `--progress` (alias: `-pr`) _default value: true_
+    <code>--progress</code> (aliases: <code>-pr</code>) <em>default value: true</em>
   </p>
   <p>
     Log progress to the console while building.
@@ -155,7 +155,7 @@ ng eject
 <details>
   <summary>sourcemap</summary>
   <p>
-    `--sourcemap` (alias: `-sm`, `sourcemaps`)
+    <code>--sourcemap</code> (aliases: <code>-sm</code>, <code>sourcemaps</code>)
   </p>
   <p>
     Output sourcemaps.
@@ -165,7 +165,7 @@ ng eject
 <details>
   <summary>target</summary>
   <p>
-    `--target` (aliases: `-t`, `-dev`, `-prod`) _default value: development_
+    <code>--target</code> (aliases: <code>-t</code>, <code>-dev</code>, <code>-prod</code>) <em>default value: development</em>
   </p>
   <p>
     Defines the build target.
@@ -175,7 +175,7 @@ ng eject
 <details>
   <summary>vendor-chunk</summary>
   <p>
-    `--vendor-chunk` (aliases: `-vc`) _default value: true_
+    <code>--vendor-chunk</code> (aliases: <code>-vc</code>) <em>default value: true</em>
   </p>
   <p>
     Use a separate bundle containing only vendor libraries.
@@ -185,7 +185,7 @@ ng eject
 <details>
   <summary>verbose</summary>
   <p>
-    `--verbose` (aliases: `-v`) _default value: false_
+    <code>--verbose</code> (aliases: <code>-v</code>) <em>default value: false</em>
   </p>
   <p>
     Adds more details to output logging.
@@ -195,7 +195,7 @@ ng eject
 <details>
   <summary>watch</summary>
   <p>
-    `--watch` (aliases: `-w`)
+    <code>--watch</code> (aliases: <code>-w</code>)
   </p>
   <p>
     Run build when files change.
diff --git a/docs/documentation/generate/class.md b/docs/documentation/generate/class.md
index 942b7c0b8e5c..e1ccd6f5c1b0 100644
--- a/docs/documentation/generate/class.md
+++ b/docs/documentation/generate/class.md
@@ -9,7 +9,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
@@ -19,7 +19,7 @@
 <details>
   <summary>spec</summary>
   <p>
-    `--spec`
+    <code>--spec</code>
   </p>
   <p>
     Specifies if a spec file is generated.
diff --git a/docs/documentation/generate/component.md b/docs/documentation/generate/component.md
index 3661e8f1a858..12ce166e1de8 100644
--- a/docs/documentation/generate/component.md
+++ b/docs/documentation/generate/component.md
@@ -9,7 +9,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
@@ -19,7 +19,7 @@
 <details>
   <summary>change-detection</summary>
   <p>
-    `--change-detection` (alias: `-cd`)
+    <code>--change-detection</code> (aliases: <code>-cd</code>)
   </p>
   <p>
     Specifies the change detection strategy.
@@ -29,7 +29,7 @@
 <details>
   <summary>flat</summary>
   <p>
-    `--flat` _default value: false_
+    <code>--flat</code> <em>default value: false</em>
   </p>
   <p>
     Flag to indicate if a dir is created.
@@ -39,7 +39,7 @@
 <details>
   <summary>export</summary>
   <p>
-    `--export` (alias: `-`) _default value: false_
+    <code>--export</code> <em>default value: false</em>
   </p>
   <p>
     Specifies if declaring module exports the component.
@@ -49,7 +49,7 @@
 <details>
   <summary>inline-style</summary>
   <p>
-    `--inline-style` (alias: `-is`) _default value: false_
+    <code>--inline-style</code> (aliases: <code>-is</code>) <em>default value: false</em>
   </p>
   <p>
     Specifies if the style will be in the ts file.
@@ -59,7 +59,7 @@
 <details>
   <summary>inline-template</summary>
   <p>
-    `--inline-template` (alias: `-it`) _default value: false_
+    <code>--inline-template</code> (aliases: <code>-it</code>) <em>default value: false</em>
   </p>
   <p>
     Specifies if the template will be in the ts file.
@@ -69,7 +69,7 @@
 <details>
   <summary>module</summary>
   <p>
-    `--module` (alias: `-m`)
+    <code>--module</code> (aliases: <code>-m</code>)
   </p>
   <p>
     Allows specification of the declaring module's file name (e.g `app.module.ts`).
@@ -79,7 +79,7 @@
 <details>
   <summary>prefix</summary>
   <p>
-    `--prefix`
+    <code>--prefix</code>
   </p>
   <p>
     Specifies whether to use the prefix.
@@ -89,7 +89,7 @@
 <details>
   <summary>skip-import</summary>
   <p>
-    `--skip-import` _default value: false_
+    <code>--skip-import</code> <em>default value: false</em>
   </p>
   <p>
     Allows for skipping the module import.
@@ -99,7 +99,7 @@
 <details>
   <summary>spec</summary>
   <p>
-    `--spec`
+    <code>--spec</code>
   </p>
   <p>
     Specifies if a spec file is generated.
@@ -109,7 +109,7 @@
 <details>
   <summary>view-encapsulation</summary>
   <p>
-    `--view-encapsulation` (alias: `-ve`)
+    <code>--view-encapsulation</code> (aliases: <code>-ve</code>)
   </p>
   <p>
     Specifies the view encapsulation strategy.
diff --git a/docs/documentation/generate/directive.md b/docs/documentation/generate/directive.md
index 90ecfadba7bc..9ed8f37046c7 100644
--- a/docs/documentation/generate/directive.md
+++ b/docs/documentation/generate/directive.md
@@ -9,7 +9,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
@@ -19,7 +19,7 @@
 <details>
   <summary>export</summary>
   <p>
-    `--export` _default value: false_
+    <code>--export</code> <em>default value: false</em>
   </p>
   <p>
     Specifies if declaring module exports the component.
@@ -29,7 +29,7 @@
 <details>
   <summary>flat</summary>
   <p>
-    `--flat`
+    <code>--flat</code>
   </p>
   <p>
     Flag to indicate if a dir is created.
@@ -39,7 +39,7 @@
 <details>
   <summary>module</summary>
   <p>
-    `--module` (alias: `-m`)
+    <code>--module</code> (aliases: <code>-m</code>)
   </p>
   <p>
     Allows specification of the declaring module.
@@ -49,7 +49,7 @@
 <details>
   <summary>prefix</summary>
   <p>
-    `--prefix`
+    <code>--prefix</code>
   </p>
   <p>
     Specifies whether to use the prefix.
@@ -59,7 +59,7 @@
 <details>
   <summary>skip-import</summary>
   <p>
-    `--skip-import`
+    <code>--skip-import</code>
   </p>
   <p>
     Allows for skipping the module import.
@@ -69,7 +69,7 @@
 <details>
   <summary>spec</summary>
   <p>
-    `--spec`
+    <code>--spec</code>
   </p>
   <p>
     Specifies if a spec file is generated.
diff --git a/docs/documentation/generate/enum.md b/docs/documentation/generate/enum.md
index 54e8a6bb3463..c7b4b66ff19f 100644
--- a/docs/documentation/generate/enum.md
+++ b/docs/documentation/generate/enum.md
@@ -9,7 +9,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
diff --git a/docs/documentation/generate/guard.md b/docs/documentation/generate/guard.md
index d1b9c2d8f90d..3435dd172f66 100644
--- a/docs/documentation/generate/guard.md
+++ b/docs/documentation/generate/guard.md
@@ -7,7 +7,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
@@ -17,7 +17,7 @@
 <details>
   <summary>flat</summary>
   <p>
-    `--flat`
+    <code>--flat</code>
   </p>
   <p>
     Indicate if a dir is created.
@@ -27,7 +27,7 @@
 <details>
   <summary>module</summary>
   <p>
-    `--module` (alias: `-m`)
+    <code>--module</code> (aliases: <code>-m</code>)
   </p>
   <p>
     Specifies where the guard should be provided.
@@ -37,7 +37,7 @@
 <details>
   <summary>spec</summary>
   <p>
-    `--spec`
+    <code>--spec</code>
   </p>
   <p>
     Specifies if a spec file is generated.
diff --git a/docs/documentation/generate/interface.md b/docs/documentation/generate/interface.md
index 38d8f19947e8..8aa09de4ca76 100644
--- a/docs/documentation/generate/interface.md
+++ b/docs/documentation/generate/interface.md
@@ -9,7 +9,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
diff --git a/docs/documentation/generate/module.md b/docs/documentation/generate/module.md
index eb64482f070c..24a4fe95a3af 100644
--- a/docs/documentation/generate/module.md
+++ b/docs/documentation/generate/module.md
@@ -9,7 +9,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
@@ -19,7 +19,7 @@
 <details>
   <summary>flat</summary>
   <p>
-    `--flat`
+    <code>--flat</code>
   </p>
   <p>
     Flag to indicate if a dir is created.
@@ -29,7 +29,7 @@
 <details>
   <summary>spec</summary>
   <p>
-    `--spec`
+    <code>--spec</code>
   </p>
   <p>
     Specifies if a spec file is generated.
@@ -39,7 +39,7 @@
 <details>
   <summary>routing</summary>
   <p>
-    `--routing`
+    <code>--routing</code>
   </p>
   <p>
     Specifies if a routing module file should be generated.
diff --git a/docs/documentation/generate/pipe.md b/docs/documentation/generate/pipe.md
index d39f15a81607..b8ee09497f3a 100644
--- a/docs/documentation/generate/pipe.md
+++ b/docs/documentation/generate/pipe.md
@@ -9,7 +9,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
@@ -19,7 +19,7 @@
 <details>
   <summary>export</summary>
   <p>
-    `--export`
+    <code>--export</code>
   </p>
   <p>
     Specifies if declaring module exports the pipe.
@@ -29,7 +29,7 @@
 <details>
   <summary>flat</summary>
   <p>
-    `--flat`
+    <code>--flat</code>
   </p>
   <p>
     Flag to indicate if a dir is created.
@@ -39,7 +39,7 @@
 <details>
   <summary>module</summary>
   <p>
-    `--module` (alias: `-m`)
+    <code>--module</code> (aliases: <code>-m</code>)
   </p>
   <p>
     Allows specification of the declaring module.
@@ -49,7 +49,7 @@
 <details>
   <summary>skip-import</summary>
   <p>
-    `--skip-import`
+    <code>--skip-import</code>
   </p>
   <p>
     Allows for skipping the module import.
@@ -59,7 +59,7 @@
 <details>
   <summary>spec</summary>
   <p>
-    `--spec`
+    <code>--spec</code>
   </p>
   <p>
     Specifies if a spec file is generated.
diff --git a/docs/documentation/generate/service.md b/docs/documentation/generate/service.md
index c048fac75072..eb94f5c5b9bc 100644
--- a/docs/documentation/generate/service.md
+++ b/docs/documentation/generate/service.md
@@ -9,7 +9,7 @@
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name to use.
@@ -19,7 +19,7 @@
 <details>
   <summary>flat</summary>
   <p>
-    `--flat`
+    <code>--flat</code>
   </p>
   <p>
     Flag to indicate if a dir is created.
@@ -29,7 +29,7 @@
 <details>
   <summary>module</summary>
   <p>
-    `--module` (alias: `-m`)
+    <code>--module</code> (aliases: <code>-m</code>)
   </p>
   <p>
     Specifies where the service should be provided.
@@ -39,7 +39,7 @@
 <details>
   <summary>spec</summary>
   <p>
-    `--spec`
+    <code>--spec</code>
   </p>
   <p>
     Specifies if a spec file is generated.
diff --git a/docs/documentation/lint.md b/docs/documentation/lint.md
index 814d072fd695..95d94bb5b73d 100644
--- a/docs/documentation/lint.md
+++ b/docs/documentation/lint.md
@@ -9,7 +9,7 @@
 <details>
   <summary>fix</summary>
   <p>
-    `--fix` _default value: false_
+    <code>--fix</code> <em>default value: false</em>
   </p>
   <p>
     Fixes linting errors (may overwrite linted files).
@@ -19,7 +19,7 @@
 <details>
   <summary>force</summary>
   <p>
-    `--force` _default value: false_
+    <code>--force</code> <em>default value: false</em>
   </p>
   <p>
     Succeeds even if there was linting errors.
@@ -29,7 +29,7 @@
 <details>
   <summary>type-check</summary>
   <p>
-    `--type-check` _default value: false_
+    <code>--type-check</code> <em>default value: false</em>
   </p>
   <p>
     Controls the type check for linting.
@@ -39,7 +39,7 @@
 <details>
   <summary>format</summary>
   <p>
-    `--format` (alias: `-t`) _default value: prose_
+    <code>--format</code> (aliases: <code>-t</code>) <em>default value: prose</em>
   </p>
   <p>
     Output format (prose, json, stylish, verbose, pmd, msbuild, checkstyle, vso, fileslist).
diff --git a/docs/documentation/new.md b/docs/documentation/new.md
index 886577ee8fb0..15121fff3c96 100644
--- a/docs/documentation/new.md
+++ b/docs/documentation/new.md
@@ -11,7 +11,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>directory</summary>
   <p>
-    `--directory` (alias: `-dir`) _default value: dir_
+    <code>--directory</code> (aliases: <code>-dir</code>) <em>default value: dir</em>
   </p>
   <p>
     The directory name to create the app in.
@@ -21,7 +21,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>dry-run</summary>
   <p>
-    `--dry-run` (alias: `-d`) _default value: false_
+    <code>--dry-run</code> (aliases: <code>-d</code>) <em>default value: false</em>
   </p>
   <p>
     Run through without making any changes.
@@ -31,7 +31,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>inline-style</summary>
   <p>
-    `--inline-style` (alias: `-is`) _default value: false_
+    <code>--inline-style</code> (aliases: <code>-is</code>) <em>default value: false</em>
   </p>
   <p>
     Should have an inline style.
@@ -41,7 +41,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>inline-template</summary>
   <p>
-    `--inline-template` (alias: `-it`) _default value: false_
+    <code>--inline-template</code> (aliases: <code>-it</code>) <em>default value: false</em>
   </p>
   <p>
     Should have an inline template.
@@ -51,7 +51,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>prefix</summary>
   <p>
-    `--prefix` (alias: `-p`) _default value: app_
+    <code>--prefix</code> (aliases: <code>-p</code>) <em>default value: app</em>
   </p>
   <p>
     The prefix to use for all component selectors.
@@ -61,7 +61,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>routing</summary>
   <p>
-    `--routing` _default value: false_
+    <code>--routing</code> <em>default value: false</em>
   </p>
   <p>
     Generate a routing module.
@@ -71,7 +71,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-commit</summary>
   <p>
-    `--skip-commit` (alias: `-sc`) _default value: false_
+    <code>--skip-commit</code> (aliases: <code>-sc</code>) <em>default value: false</em>
   </p>
   <p>
     Skip committing the first commit to git.
@@ -81,7 +81,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-git</summary>
   <p>
-    `--skip-git` (alias: `-sg`) _default value: false_
+    <code>--skip-git</code> (aliases: <code>-sg</code>) <em>default value: false</em>
   </p>
   <p>
     Skip initializing a git repository.
@@ -91,7 +91,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-install</summary>
   <p>
-    `--skip-install` (alias: `-si`) _default value: false_
+    <code>--skip-install</code> (aliases: <code>-si</code>) <em>default value: false</em>
   </p>
   <p>
     Skip installing packages.
@@ -101,17 +101,27 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-tests</summary>
   <p>
-    `--skip-tests` (alias: `-st`) _default value: false_
+    <code>--skip-tests</code> (aliases: <code>-st</code>) <em>default value: false</em>
   </p>
   <p>
     Skip creating spec files.
   </p>
 </details>
 
+<details>
+  <summary>skip-e2e</summary>
+  <p>
+    `--skip-e2e` (alias: `-se`) _default value: false_
+  </p>
+  <p>
+    Skip including e2e functionality.
+  </p>
+</details>
+
 <details>
   <summary>source-dir</summary>
   <p>
-    `--source-dir` (alias: `-sd`) _default value: src_
+    <code>--source-dir</code> (aliases: <code>-sd</code>) <em>default value: src</em>
   </p>
   <p>
     The name of the source directory.
@@ -121,7 +131,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>style</summary>
   <p>
-    `--style` _default value: css_
+    <code>--style</code> <em>default value: css</em>
   </p>
   <p>
     The style file default extension.
@@ -131,7 +141,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>verbose</summary>
   <p>
-    `--verbose` (alias: `-v`) _default value: false_
+    <code>--verbose</code> (aliases: <code>-v</code>) <em>default value: false</em>
   </p>
   <p>
     Adds more details to output logging.
diff --git a/docs/documentation/serve.md b/docs/documentation/serve.md
index acfb9dd00d7c..0de32c40c72e 100644
--- a/docs/documentation/serve.md
+++ b/docs/documentation/serve.md
@@ -11,7 +11,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>host</summary>
   <p>
-    `--host` (alias: `-H`) _default value: localhost_
+    <code>--host</code> (aliases: <code>-H</code>) <em>default value: localhost</em>
   </p>
   <p>
     Listens only on localhost by default.
@@ -21,7 +21,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>hmr</summary>
   <p>
-    `--hmr` _default value: false_
+    <code>--hmr</code> <em>default value: false</em>
   </p>
   <p>
     Enable hot module replacement.
@@ -31,7 +31,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>live-reload</summary>
   <p>
-    `--live-reload` (alias: `-lr`) _default value: true_
+    <code>--live-reload</code> (aliases: <code>-lr</code>) <em>default value: true</em>
   </p>
   <p>
     Whether to reload the page on change, using live-reload.
@@ -41,7 +41,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>live-reload-client</summary>
   <p>
-    `--live-reload-client`
+    <code>--live-reload-client</code>
   </p>
   <p>
     Specify the URL that the live reload browser client will use.
@@ -51,7 +51,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>open</summary>
   <p>
-    `--open` (alias: `-o`) _default value: false_
+    <code>--open</code> (aliases: <code>-o</code>) <em>default value: false</em>
   </p>
   <p>
     Opens the url in default browser.
@@ -61,7 +61,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>port</summary>
   <p>
-    `--port` (alias: `-p`) _default value: 4200_
+    <code>--port</code> (aliases: <code>-p</code>) <em>default value: 4200</em>
   </p>
   <p>
     Port to listen to for serving.
@@ -71,7 +71,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>ssl</summary>
   <p>
-    `--ssl`
+    <code>--ssl</code>
   </p>
   <p>
     Serve using HTTPS.
@@ -81,7 +81,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>ssl-cert</summary>
   <p>
-    `--ssl-cert` (alias: `-`) _default value: _
+    <code>--ssl-cert</code> (aliases: <code>-</code>) <em>default value: </em>
   </p>
   <p>
     SSL certificate to use for serving HTTPS.
@@ -91,7 +91,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>ssl-key</summary>
   <p>
-    `--ssl-key`
+    <code>--ssl-key</code>
   </p>
   <p>
     SSL key to use for serving HTTPS.
@@ -101,7 +101,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>aot</summary>
   <p>
-    `--aot`
+    <code>--aot</code>
   </p>
   <p>
     Build using Ahead of Time compilation.
@@ -111,7 +111,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>base-href</summary>
   <p>
-    `--base-href` (alias: `-bh`)
+    <code>--base-href</code> (aliases: <code>-bh</code>)
   </p>
   <p>
     Base url for the application being built.
@@ -121,7 +121,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>deploy-url</summary>
   <p>
-    `--deploy-url` (alias: `-d`)
+    <code>--deploy-url</code> (aliases: <code>-d</code>)
   </p>
   <p>
     URL where files will be deployed.
@@ -131,7 +131,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>environment</summary>
   <p>
-    `--environment` (alias: `-e`)
+    <code>--environment</code> (aliases: <code>-e</code>)
   </p>
   <p>
     Defines the build environment.
@@ -141,7 +141,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>extract-css</summary>
   <p>
-    `--extract-css` (alias: `-ec`)
+    <code>--extract-css</code> (aliases: <code>-ec</code>)
   </p>
   <p>
     Extract css from global styles onto css files instead of js ones.
@@ -151,7 +151,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>i18n-file</summary>
   <p>
-    `--i18n-file`
+    <code>--i18n-file</code>
   </p>
   <p>
     Localization file to use for i18n.
@@ -161,7 +161,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>i18n-format</summary>
   <p>
-    `--i18n-format`
+    <code>--i18n-format</code>
   </p>
   <p>
     Format of the localization file specified with --i18n-file.
@@ -171,7 +171,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>locale</summary>
   <p>
-    `--locale`
+    <code>--locale</code>
   </p>
   <p>
     Locale to use for i18n.
@@ -181,17 +181,17 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>output-hashing</summary>
   <p>
-    `--output-hashing` (alias: `-oh`) _default value: _
+    <code>--output-hashing</code> (aliases: <code>-oh</code>) <em>default value: </em>
   </p>
   <p>
-    Define the output filename cache-busting hashing mode. Possible values: `none`, `all`, `media`, `bundles`
+    Define the output filename cache-busting hashing mode. Possible values: <code>none</code>, <code>all</code>, <code>media</code>, <code>bundles</code>
   </p>
 </details>
 
 <details>
   <summary>output-path</summary>
   <p>
-    `--output-path` (alias: `-op`) _default value: _
+    <code>--output-path</code> (aliases: <code>-op</code>) <em>default value: </em>
   </p>
   <p>
     Path where output will be placed.
@@ -201,7 +201,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>poll</summary>
   <p>
-    `--poll`
+    <code>--poll</code>
   </p>
   <p>
     Enable and define the file watching poll time period (milliseconds) .
@@ -211,7 +211,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>progress</summary>
   <p>
-    `--progress` (alias: `-pr`) _default value: true_
+    <code>--progress</code> (aliases: <code>-pr</code>) <em>default value: true</em>
   </p>
   <p>
     Log progress to the console while building.
@@ -221,7 +221,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>sourcemap</summary>
   <p>
-    `--sourcemap` (alias: `-sm`, `sourcemaps`)
+    <code>--sourcemap</code> (aliases: <code>-sm</code>, <code>sourcemaps</code>)
   </p>
   <p>
     Output sourcemaps.
@@ -231,7 +231,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>target</summary>
   <p>
-    `--target` (aliases: `-t`, `-dev`, `-prod`) _default value: development_
+    <code>--target</code> (aliases: <code>-t</code>, <code>-dev</code>, <code>-prod</code>) <em>default value: development</em>
   </p>
   <p>
     Defines the build target.
@@ -241,7 +241,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>vendor-chunk</summary>
   <p>
-    `--vendor-chunk` (aliases: `-vc`) _default value: true_
+    <code>--vendor-chunk</code> (aliases: <code>-vc</code>) <em>default value: true</em>
   </p>
   <p>
     Use a separate bundle containing only vendor libraries.
@@ -251,7 +251,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>verbose</summary>
   <p>
-    `--verbose` (aliases: `-v`) _default value: false_
+    <code>--verbose</code> (aliases: <code>-v</code>) <em>default value: false</em>
   </p>
   <p>
     Adds more details to output logging.
@@ -261,7 +261,7 @@ All the build Options are available in serve, below are the additional options.
 <details>
   <summary>watch</summary>
   <p>
-    `--watch` (aliases: `-w`)
+    <code>--watch</code> (aliases: <code>-w</code>)
   </p>
   <p>
     Run build when files change.
diff --git a/docs/documentation/test.md b/docs/documentation/test.md
index f03c23b713e1..dacf81a5960f 100644
--- a/docs/documentation/test.md
+++ b/docs/documentation/test.md
@@ -19,7 +19,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>app</summary>
   <p>
-    `--app` (alias: `-a`) _default value: 1st app_
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
   </p>
   <p>
     Specifies app name or index to use.
@@ -29,7 +29,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>browsers</summary>
   <p>
-    `--browsers`
+    <code>--browsers</code>
   </p>
   <p>
     Override which browsers tests are run against.
@@ -39,7 +39,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>code-coverage</summary>
   <p>
-    `--code-coverage` (alias: `-cc`) _default value: false_
+    <code>--code-coverage</code> (aliases: <code>-cc</code>) <em>default value: false</em>
   </p>
   <p>
     Coverage report will be in the coverage/ directory.
@@ -49,7 +49,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>colors</summary>
   <p>
-    `--colors`
+    <code>--colors</code>
   </p>
   <p>
     Enable or disable colors in the output (reporters and logs).
@@ -59,7 +59,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>config</summary>
   <p>
-    `--config` (alias: `-c`)
+    <code>--config</code> (aliases: <code>-c</code>)
   </p>
   <p>
     Use a specific config file. Defaults to the protractor config file in angular-cli.json.
@@ -69,7 +69,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>log-level</summary>
   <p>
-    `--log-level`
+    <code>--log-level</code>
   </p>
   <p>
     Level of logging.
@@ -79,7 +79,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>poll</summary>
   <p>
-    `--poll`
+    <code>--poll</code>
   </p>
   <p>
     Enable and define the file watching poll time period (milliseconds).
@@ -89,7 +89,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>port</summary>
   <p>
-    `--port`
+    <code>--port</code>
   </p>
   <p>
     Port where the web server will be listening.
@@ -99,7 +99,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>progress</summary>
   <p>
-    `--progress` _default value: true_
+    <code>--progress</code> <em>default value: true</em>
   </p>
   <p>
     Log progress to the console while in progress.
@@ -109,7 +109,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>reporters</summary>
   <p>
-    `--reporters`
+    <code>--reporters</code>
   </p>
   <p>
     List of reporters to use.
@@ -119,7 +119,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>single-run</summary>
   <p>
-    `--single-run` (alias: `-sr`) _default value: false_
+    <code>--single-run</code> (aliases: <code>-sr</code>) <em>default value: false</em>
   </p>
   <p>
     Run tests a single time.
@@ -129,7 +129,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>sourcemap</summary>
   <p>
-    `--sourcemap` (alias: `-sm`, `sourcemaps`)
+    <code>--sourcemap</code> (aliases: <code>-sm</code>, <code>sourcemaps</code>)
   </p>
   <p>
     Output sourcemaps.
@@ -139,7 +139,7 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 <details>
   <summary>watch</summary>
   <p>
-    `--watch` (aliases: `-w`)
+    <code>--watch</code> (aliases: <code>-w</code>)
   </p>
   <p>
     Run build when files change.
diff --git a/docs/documentation/xi18n.md b/docs/documentation/xi18n.md
index 1e3fe3fbb200..0a350c9b9853 100644
--- a/docs/documentation/xi18n.md
+++ b/docs/documentation/xi18n.md
@@ -6,16 +6,72 @@
 `ng xi18n` Extracts i18n messages from the templates.
 
 ## Options
-`--app` (`-a`) Specifies app name to use.
+<details>
+  <summary>app</summary>
+  <p>
+    <code>--app</code> (aliases: <code>-a</code>) <em>default value: 1st app</em>
+  </p>
+  <p>
+    Specifies app name to use.
+  </p>
+</details>
 
-`--i18n-format` (`-f`) Output format for the generated file: either `xmb` or `xlf`.
+<details>
+  <summary>i18n-format</summary>
+  <p>
+    <code>--i18n-format</code> (aliases: <code>-f</code>)
+  </p>
+  <p>
+    Output format for the generated file: either `xmb` or `xlf`.
+  </p>
+</details>
 
-`--locale` (`-l`) Specifies the source language of the application.
+<details>
+  <summary>locale</summary>
+  <p>
+    <code>--locale</code> (aliases: <code>-l</code>)
+  </p>
+  <p>
+    Specifies the source language of the application.
+  </p>
+</details>
 
-`--outfile` (`-of`)  Name of the file to output.
+<details>
+  <summary>outfile</summary>
+  <p>
+    <code>--outfile</code> (aliases: <code>-of</code>)
+  </p>
+  <p>
+    Name of the file to output.
+  </p>
+</details>
 
-`--output-path` (`-op`) Path where output will be placed.
+<details>
+  <summary>output-path</summary>
+  <p>
+    <code>--output-path</code> (aliases: <code>-op</code>)
+  </p>
+  <p>
+    Path where output will be placed.
+  </p>
+</details>
 
-`--progress` Log progress to the console while running.
+<details>
+  <summary>progress</summary>
+  <p>
+    <code>--progress</code>
+  </p>
+  <p>
+    Log progress to the console while running.
+  </p>
+</details>
 
-`--verbose` Adds more details to output logging.
+<details>
+  <summary>verbose</summary>
+  <p>
+    <code>--verbose</code>
+  </p>
+  <p>
+    Adds more details to output logging.
+  </p>
+</details>
diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json
index 810087dccb0f..b12fb3dbd234 100644
--- a/packages/@angular/cli/blueprints/ng/files/package.json
+++ b/packages/@angular/cli/blueprints/ng/files/package.json
@@ -37,9 +37,9 @@
     "karma-cli": "~1.0.1",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^0.2.0",
+    "karma-coverage-istanbul-reporter": "^0.2.0",<% if(e2e) { %>
     "protractor": "~5.1.0",
-    "ts-node": "~2.0.0",
+    "ts-node": "~2.0.0",<% } %>
     "tslint": "~4.5.0",
     "typescript": "~2.2.0"
   }
diff --git a/packages/@angular/cli/blueprints/ng/index.ts b/packages/@angular/cli/blueprints/ng/index.ts
index 53516a38fe38..2fb760175ead 100644
--- a/packages/@angular/cli/blueprints/ng/index.ts
+++ b/packages/@angular/cli/blueprints/ng/index.ts
@@ -35,6 +35,7 @@ export default Blueprint.extend({
     // set this.tests to opposite of skipTest options,
     // meaning if tests are being skipped then the default.spec.BLUEPRINT will be false
     this.tests = options.skipTests ? false : true;
+    this.e2e = options.skipE2e ? false : true;
 
     // Split/join with / not path.sep as reference to typings require forward slashes.
     const relativeRootPath = options.sourceDir.split('/').map(() => '..').join('/');
@@ -54,7 +55,8 @@ export default Blueprint.extend({
       routing: options.routing,
       inlineStyle: options.inlineStyle,
       inlineTemplate: options.inlineTemplate,
-      tests: this.tests
+      tests: this.tests,
+      e2e: this.e2e,
     };
   },
 
@@ -78,6 +80,13 @@ export default Blueprint.extend({
       fileList = fileList.filter(p => p.indexOf('app.component.spec.ts') < 0);
     }
 
+    if (this.options && this.options.skipE2e) {
+      fileList = fileList
+        .filter(p => p.indexOf('protractor.conf.js') < 0)
+        .filter(p => p.indexOf('app.po.ts') < 0)
+        .filter(p => p.indexOf('app.e2e-spec.ts') < 0);
+    }
+
     const cliConfig = CliConfig.fromProject();
     const ngConfig = cliConfig && cliConfig.config;
     if (!ngConfig || ngConfig.packageManager != 'yarn') {
diff --git a/packages/@angular/cli/commands/new.ts b/packages/@angular/cli/commands/new.ts
index 18a3503a8edf..cdc6a8edd578 100644
--- a/packages/@angular/cli/commands/new.ts
+++ b/packages/@angular/cli/commands/new.ts
@@ -62,6 +62,13 @@ const NewCommand = Command.extend({
       aliases: ['st'],
       description: 'Skip creating spec files.'
     },
+    {
+      name: 'skip-e2e',
+      type: Boolean,
+      default: false,
+      aliases: ['s2'],
+      description: 'Skip creating e2e files.'
+    },
     {
       name: 'skip-commit',
       type: Boolean,
diff --git a/packages/@angular/cli/tasks/e2e.ts b/packages/@angular/cli/tasks/e2e.ts
index 0fddde01d585..002be3f0f539 100644
--- a/packages/@angular/cli/tasks/e2e.ts
+++ b/packages/@angular/cli/tasks/e2e.ts
@@ -32,6 +32,8 @@ export const E2eTask = Task.extend({
           hostname: e2eTaskOptions.host,
           port: e2eTaskOptions.port.toString()
         });
+      } else if (e2eTaskOptions.baseHref) {
+        additionalProtractorConfig.baseUrl = e2eTaskOptions.baseHref;
       }
 
       if (e2eTaskOptions.specs.length !== 0) {
diff --git a/packages/@angular/cli/tasks/init.ts b/packages/@angular/cli/tasks/init.ts
index 1bd981a8bb12..742605e010b5 100644
--- a/packages/@angular/cli/tasks/init.ts
+++ b/packages/@angular/cli/tasks/init.ts
@@ -78,7 +78,8 @@ export default Task.extend({
       inlineTemplate: commandOptions.inlineTemplate,
       ignoredUpdateFiles: ['favicon.ico'],
       skipGit: commandOptions.skipGit,
-      skipTests: commandOptions.skipTests
+      skipTests: commandOptions.skipTests,
+      skipE2e: commandOptions.skipE2e
     };
 
     validateProjectName(packageName);
diff --git a/tests/e2e/tests/commands/new/new-skip-e2e.ts b/tests/e2e/tests/commands/new/new-skip-e2e.ts
new file mode 100644
index 000000000000..ee140c4016e2
--- /dev/null
+++ b/tests/e2e/tests/commands/new/new-skip-e2e.ts
@@ -0,0 +1,11 @@
+import {createProject} from '../../../utils/project';
+import {expectFileNotToExist} from '../../../utils/fs';
+
+
+export default function() {
+  return Promise.resolve()
+    .then(() => createProject('new-project-skip-e2e', '--skip-e2e'))
+    .then(() => expectFileNotToExist('e2e/app.e2e-spec.ts'))
+    .then(() => expectFileNotToExist('e2e/app.po.ts'))
+    .then(() => expectFileNotToExist('protractor.conf.js'));
+}
diff --git a/tests/e2e/tests/commands/new/new-skip-tests.ts b/tests/e2e/tests/commands/new/new-skip-tests.ts
new file mode 100644
index 000000000000..95dde0a38e88
--- /dev/null
+++ b/tests/e2e/tests/commands/new/new-skip-tests.ts
@@ -0,0 +1,9 @@
+import {createProject} from '../../../utils/project';
+import {expectFileNotToExist} from '../../../utils/fs';
+
+
+export default function() {
+  return Promise.resolve()
+    .then(() => createProject('new-project-skip-tests', '--skip-tests'))
+    .then(() => expectFileNotToExist('src/app/app.component.spec.ts'));
+}
diff --git a/tests/e2e/tests/test/e2e-baseurl.ts b/tests/e2e/tests/test/e2e-baseurl.ts
new file mode 100644
index 000000000000..02ccb97db4b3
--- /dev/null
+++ b/tests/e2e/tests/test/e2e-baseurl.ts
@@ -0,0 +1,20 @@
+import { ng, killAllProcesses } from '../../utils/process';
+import { expectToFail } from '../../utils/utils';
+import { ngServe } from '../../utils/project';
+import { updateJsonFile } from '../../utils/project';
+
+export default function () {
+  return Promise.resolve()
+    .then(() => expectToFail(() => ng('e2e', '--no-serve')))
+    .then(() => updateJsonFile('.angular-cli.json', configJson => {
+      const app = configJson.defaults;
+      app.serve = { port: 4400 };
+    }))
+    .then(() => ngServe())
+    .then(() => expectToFail(() => ng('e2e', '--no-serve')))
+    .then(() => ng('e2e', '--no-serve', '--base-href=http://localhost:4400'))
+    .then(() => killAllProcesses(), (err: any) => {
+      killAllProcesses();
+      throw err;
+    });
+}
diff --git a/tests/e2e/utils/fs.ts b/tests/e2e/utils/fs.ts
index 0a621f2c32fc..0ffba4787393 100644
--- a/tests/e2e/utils/fs.ts
+++ b/tests/e2e/utils/fs.ts
@@ -130,6 +130,18 @@ export function expectFileMatchToExist(dir: string, regex: RegExp) {
   });
 }
 
+export function expectFileNotToExist(fileName: string) {
+  return new Promise((resolve, reject) => {
+    fs.exists(fileName, (exist) => {
+      if (exist) {
+        reject(new Error(`File ${fileName} was expected not to exist but found...`));
+      } else {
+        resolve();
+      }
+    });
+  });
+}
+
 export function expectFileToExist(fileName: string) {
   return new Promise((resolve, reject) => {
     fs.exists(fileName, (exist) => {