Merge branch 'master' into feat/htmlAst-reparse-raw

gatsbyjs · Jan 27, 2018 · b7c88be · b7c88be
2 parents ece8677 + 0896e85
commit b7c88be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -144,6 +144,8 @@ Websites built with Gatsby:
 * [several levels](https://severallevels.io/) ([source](https://github.com/Harrison1/several-levels))
 * [Flooring Factories Outlets](https://www.flooringfactoriesoutlets.com/)
 * [Nortcast](https://nortcast.com/)
+* [VisitGemer](https://visitgemer.sk/)
+* [Nexit](https://nexit.sk/)
 
 ## Docs
 

diff --git a/docs/docs/querying-with-graphql.md b/docs/docs/querying-with-graphql.md
@@ -164,7 +164,7 @@ markdownRemark {
 
 Gatsby has rich support for processing images. Responsive images are a big part of the modern web and typically involve creating 5+ sized thumbnails per photo. With Gatsby's [`gatsby-transformer-sharp`](/packages/gatsby-transformer-sharp/), you can _query_ your images for responsive versions. The query automatically creates all the needed responsive thumbnails and returns `src` and `srcSet` fields to add to your image element.
 
-Combined with a special Gatsby image component, [gatsby-image](/packages/gatsby-image/), you have a very powerful set of primatives for building sites with images.
+Combined with a special Gatsby image component, [gatsby-image](/packages/gatsby-image/), you have a very powerful set of primitives for building sites with images.
 
 This is what a component using `gatsby-image` looks like:
 

diff --git a/packages/gatsby-plugin-netlify/README.md b/packages/gatsby-plugin-netlify/README.md
@@ -39,7 +39,7 @@ plugins: [
       headers: {}, // option to add more headers. `Link` headers are transformed by the below criteria
       allPageHeaders: [], // option to add headers for all pages. `Link` headers are transformed by the below criteria
       mergeSecurityHeaders: true, // boolean to turn off the default security headers
-      mergeLinkHeaders: false, // boolean to turn off the default gatsby js headers (disabled by default, until gzip is fixed for server push)
+      mergeLinkHeaders: true, // boolean to turn off the default gatsby js headers
       mergeCachingHeaders: true, // boolean to turn off the default caching headers
       transformHeaders: (headers, path) => headers, // optional transform for manipulating headers under each path (e.g.sorting), etc.
     },