Merge branch 'master' into v2-branch

humanmade · Aug 14, 2019 · 5f155f8 · 5f155f8
2 parents a6cc558 + 72ee222
commit 5f155f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -14,7 +14,7 @@ Most of the features require no configuration, you can dig in further to learn m
 - Scalable multi-threaded scheduled tasks
 - S3 storage for media assets
 - [Geo targeting](geo-targeting.md)
-- [Customisable nginx configuration](nginx-configuration.md)
+- [Customizable nginx configuration](nginx-configuration.md)
 - [Page caching](page-caching.md)
 - Database caching
 - Database replication, load-balancing and failover

diff --git a/docs/https.md b/docs/https.md
@@ -6,7 +6,7 @@ If you wish to bring your own HTTP certificate, you must provide a single certif
 
 In cases where Human Made registers HTTPS certificates, we will manage auto-renewals on a yearly basis and will provide your team with DNS verification records to validate the certificate request. All certificates are RSA 2048-bit with signature algorithm `SHA256WITHRSA` by the root CA "Amazon Root CA 1".
 
-HTTPS on Cloud requires user-agents support SNI (Server Name Indication). The follow protocols are supported:
+HTTPS on Cloud requires user-agents support SNI (Server Name Indication). The following protocols are supported:
 
 - TLS 1.2
 - TLS 1.1

diff --git a/docs/page-caching.md b/docs/page-caching.md
@@ -1,6 +1,6 @@
 # Page Caching
 
-The majority of the pages viewed on Altis will be cached to improve performance and delivery time to the user. Its necessary to take into account the page cache when developing - considerations are listed at the bottom of this page. All pages are cached by default, and the following rules excluded specific cases:
+The majority of the pages viewed on Altis will be cached to improve performance and delivery time to the user. It is necessary to take into account the page cache when developing - considerations are listed at the bottom of this page. All pages are cached by default, and the following rules excluded specific cases:
 
 - All `POST` requests are not cached
 - Any requests with cookies matching the patterns `wordpress_*`, `wp-*`, `wp_*`, `comment_*` and `hm_*`are not cached.
-Original file line number
+Diff line change
@@ Expand Up @@
     In cases where Human Made registers HTTPS certificates, we will manage auto-renewals on a yearly basis and will provide your team with DNS verification records to validate the certificate request. All certificates are RSA 2048-bit with signature algorithm `SHA256WITHRSA` by the root CA "Amazon Root CA 1".
-    HTTPS on Cloud requires user-agents support SNI (Server Name Indication). The follow protocols are supported:
+    HTTPS on Cloud requires user-agents support SNI (Server Name Indication). The following protocols are supported:
     - TLS 1.2
     - TLS 1.1
@@ Expand Down @@