Merge branch 'canary' into canary

Author: shianqi

contributing.md

@@ -16,7 +16,7 @@ Our Commitment to Open Source can be found [here](https://zeit.co/blog/oss)
 
 Make sure you have `chromedriver` installed for your Chrome version. You can install it with
 
-- `brew install chromedriver` on Mac OS X
+- `brew cask install chromedriver` on Mac OS X
 - `chocolatey install chromedriver` on Windows
 - Or manually downloading it from the [chromedriver repo](https://chromedriver.storage.googleapis.com/index.html) and adding the binary to `<next-repo>/node_modules/.bin`
 

docs/advanced-features/amp-support/adding-amp-components.md

@@ -1,3 +1,7 @@
+---
+description: Add components from the AMP community to AMP pages, and make your pages more interactive.
+---
+
 # Adding AMP Components
 
 The AMP community provide [many components](https://amp.dev/documentation/components/) to make AMP pages more interactive. You can add these components to your page by using `next/head`, as in the following example:

docs/advanced-features/amp-support/amp-in-static-html-export.md

@@ -1,3 +1,7 @@
+---
+description: Learn how AMP pages are created when used together with `next export`.
+---
+
 # AMP in Static HTML export
 
 When using `next export` to do [Static HTML export](/docs/advanced-features/static-html-export.md) statically prerender pages, Next.js will detect if the page supports AMP and change the exporting behavior based on that.

docs/advanced-features/amp-support/amp-validation.md

@@ -1,3 +1,7 @@
+---
+description: AMP pages are automatically validated by Next.js during development and on build. Learn more about it here.
+---
+
 # AMP Validation
 
 AMP pages are automatically validated with [amphtml-validator](https://www.npmjs.com/package/amphtml-validator) during development. Errors and warnings will appear in the terminal where you started Next.js.

docs/advanced-features/amp-support/introduction.md

@@ -1,3 +1,7 @@
+---
+description: With minimal config, and without leaving React, you can start adding AMP and improve the performance and speed of your pages.
+---
+
 # AMP Support
 
 <details>

docs/advanced-features/amp-support/typescript.md

@@ -1,3 +1,7 @@
+---
+description: Using AMP with TypeScript? Extend your typings to allow AMP components.
+---
+
 # TypeScript
 
 AMP currently doesn't have built-in types for TypeScript, but it's in their roadmap ([#13791](https://github.com/ampproject/amphtml/issues/13791)).

docs/advanced-features/automatic-static-optimization.md

@@ -1,3 +1,7 @@
+---
+description: Next.js automatically optimizes your app to be static HTML whenever possible. Learn how it works here.
+---
+
 # Automatic Static Optimization
 
 Next.js automatically determines that a page is static (can be prerendered) if it has no blocking data requirements. This determination is made by the absence of `getInitialProps` in the page.
@@ -6,7 +10,7 @@ This feature allows Next.js to emit hybrid applications that contain **both serv
 
 > Statically generated pages are still reactive: Next.js will hydrate your application client-side to give it full interactivity.
 
-One of the main benefits this feature is that optimized pages require no server-side computation, and can be instantly streamed to the end-user from multiple CDN locations. The result is an _ultra fast_ loading experience for your users.
+One of the main benefits of this feature is that optimized pages require no server-side computation, and can be instantly streamed to the end-user from multiple CDN locations. The result is an _ultra fast_ loading experience for your users.
 
 ## How it works
 

docs/advanced-features/custom-app.md

@@ -1,3 +1,7 @@
+---
+description: Control page initialization and add a layout that persists for all pages by overriding the default App component used by Next.js.
+---
+
 # Custom `App`
 
 Next.js uses the `App` component to initialize pages. You can override it and control the page initialization. Which allows you to do amazing things like:

docs/advanced-features/custom-document.md

@@ -1,3 +1,7 @@
+---
+description: Extend the default document markup added by Next.js.
+---
+
 # Custom `Document`
 
 A custom `Document` is commonly used to augment your application's `<html>` and `<body>` tags. This is necessary because Next.js pages skip the definition of the surrounding document's markup.

docs/advanced-features/custom-error-page.md

@@ -1,3 +1,7 @@
+---
+description: Override and extend the built-in Error page to handle custom errors.
+---
+
 # Custom Error Page
 
 **404** or **500** errors are handled both client-side and server-side by the `Error` component. If you wish to override it, define the file `pages/_error.js` and add the following code: