prettier · ikatyang · Nov 7, 2018 · Oct 25, 2018 · Oct 25, 2018 · Oct 25, 2018
diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml
@@ -5,6 +5,7 @@
   files: "\\.(\
     css|less|scss\
     |graphql|gql\
+    |html\
     |js|jsx\
     |json\
     |md|markdown|mdown|mkdn\

diff --git a/README.md b/README.md
@@ -4,19 +4,33 @@
 
 <p align="center">
   <em>
-  JavaScript
-  · Flow
-  · TypeScript
-  · CSS
-  · SCSS
-  · Less
-  · JSX
-  · Vue
-  · GraphQL
-  · JSON
-  · Markdown
-  · YAML
-  · <a href="https://prettier.io/docs/en/plugins.html">
+    JavaScript
+    · TypeScript
+    · Flow
+    · JSX
+    · JSON
+  </em>
+  <br />
+  <em>
+    CSS
+    · SCSS
+    · Less
+  </em>
+  <br />
+  <em>
+    HTML
+    · Vue
+    · Angular
+  </em>
+  <br />
+  <em>
+    GraphQL
+    · Markdown
+    · YAML
+  </em>
+  <br />
+  <em>
+    <a href="https://prettier.io/docs/en/plugins.html">
       Your favorite language?
     </a>
   </em>

diff --git a/docs/ignore.md b/docs/ignore.md
@@ -53,6 +53,25 @@ matrix(
 </div>
 ```
 
+## HTML
+
+```html
+<!-- prettier-ignore -->
+<div         class="x"       >hello world</div            >
+
+<!-- prettier-ignore-attribute -->
+<div
+  (mousedown)="       onStart    (    )         "
+  (mouseup)="         onEnd      (    )         "
+></div>
+
+<!-- prettier-ignore-attribute (mouseup) -->
+<div
+  (mousedown)="onStart()"
+  (mouseup)="         onEnd      (    )         "
+></div>
+```
+
 ## CSS
 
 ```css

diff --git a/docs/language-support.md b/docs/language-support.md
@@ -7,6 +7,6 @@ Prettier attempts to support all JavaScript language features, including non-sta
 
 All of JSX and Flow syntax is supported. In fact, the test suite in `tests/flow` _is_ the entire Flow test suite and they all pass.
 
-Prettier also supports [TypeScript](https://www.typescriptlang.org/), CSS, [Less](http://lesscss.org/), [SCSS](http://sass-lang.com), [Vue](https://vuejs.org/), [JSON](http://json.org/), [GraphQL](http://graphql.org/), [Markdown](http://commonmark.org), and [YAML](http://yaml.org/).
+Prettier also supports [TypeScript](https://www.typescriptlang.org/), CSS, [Less](http://lesscss.org/), [SCSS](http://sass-lang.com), HTML, [Vue](https://vuejs.org/), [Angular](https://angular.io/), [JSON](http://json.org/), [GraphQL](http://graphql.org/), [Markdown](http://commonmark.org), and [YAML](http://yaml.org/).
 
 The minimum version of TypeScript supported is 2.1.3 as it introduces the ability to have leading `|` for type definitions which prettier outputs.
diff --git a/docs/options.md b/docs/options.md
@@ -183,13 +183,12 @@ Valid options:
 - `"json-stringify"` (same parser as `"json"`, but outputs like `JSON.stringify`) _Since v1.13.0_
 - `"graphql"` (via [graphql/language](https://github.com/graphql/graphql-js/tree/master/src/language)) _Since v1.5.0_
 - `"markdown"` (via [remark-parse](https://github.com/wooorm/remark/tree/master/packages/remark-parse)) _Since v1.8.0_
-- `"vue"` (uses several parsers) _Since 1.10.0_
+- `"mdx"` (via [remark-parse](https://github.com/wooorm/remark/tree/master/packages/remark-parse) and [@mdx-js/mdx](https://github.com/mdx-js/mdx/tree/master/packages/mdx)) _Since v1.15.0_
+- `"html"` (via [angular-html-parser](https://github.com/ikatyang/angular-html-parser/tree/master/packages/angular-html-parser)) _Since 1.15.0_
+- `"vue"` (same parser as `"html"`, but also formats vue-specific syntax) _Since 1.10.0_
+- `"angular"` (same parser as `"html"`, but also formats angular-specific syntax via [angular-estree-parser](https://github.com/ikatyang/angular-estree-parser)) _Since 1.15.0_
 - `"yaml"` (via [yaml](https://github.com/eemeli/yaml) and [yaml-unist-parser](https://github.com/ikatyang/yaml-unist-parser)) _Since 1.14.0_
 
-<!-- TODO: Uncomment and move below "markdown" above when 1.15.0 is released.
-- `"mdx"` (same parser as `"markdown"`, with some custom overrides) _Since 1.15.0_
--->
-
 [Custom parsers](api.md#custom-parser-api) are also supported. _Since v1.5.0_
 
 | Default | CLI Override                                    | API Override                                               |
@@ -263,3 +262,23 @@ Valid options:
 | Default      | CLI Override                                                | API Override                                                |
 | ------------ | ----------------------------------------------------------- | ----------------------------------------------------------- |
 | `"preserve"` | <code>--prose-wrap <always&#124;never&#124;preserve></code> | <code>proseWrap: "<always&#124;never&#124;preserve>"</code> |
+
+## HTML Whitespace Sensitivity
+
+_available in v1.15.0+_
+
+Specify the global whitespace sensitivity for HTML files, see [whitespace-sensitive formatting] for more info.
+
+TODO: update the blog post link
+
+[whitespace-sensitive formatting]: https://prettier.io/blog/2018/10/00/1.15.0.html#whitespace-sensitive-formatting
+
+Valid options:
+
+- `"css"` - Respect the default value of CSS `display` property.
+- `"strict"` - Whitespaces are considered sensitive.
+- `"ignore"` - Whitespaces are considered insensitive.
+
+| Default | CLI Override                                                             | API Override                                                            |
+| ------- | ------------------------------------------------------------------------ | ----------------------------------------------------------------------- |
+| `"css"` | <code>--html-whitespace-sensitivity <css&#124;strict&#124;ignore></code> | <code>htmlWhitespaceSensitivity: "<css&#124;strict&#124;ignore>"</code> |