Merge pull request #483 from Kong/chore/public-merge-2.2prep

Chore/public merge - prep for Enterprise 2.2

.github/workflows/build-test.yml

@@ -3,6 +3,7 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v2
     - name: Clean environment and files

Gemfile

@@ -3,4 +3,4 @@ gem 'jekyll', '3.9.0'
 gem 'kramdown-parser-gfm'
 gem 'jekyll-redirect-from'
 gem 'redcarpet', '3.5.0'
-gem 'rouge', '3.23.0'
+gem 'rouge', '3.24.0'

Gemfile.lock

@@ -50,7 +50,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.5.0)
     rexml (3.2.4)
-    rouge (3.23.0)
+    rouge (3.24.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -66,7 +66,7 @@ DEPENDENCIES
   jekyll-redirect-from
   kramdown-parser-gfm
   redcarpet (= 3.5.0)
-  rouge (= 3.23.0)
+  rouge (= 3.24.0)
 
 BUNDLED WITH
    1.17.3

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2018 Kong Inc. (https://konghq.com)
+Copyright (c) 2015-2020 Kong Inc. (https://konghq.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app/1.1.x/db-less-and-declarative-config.md

@@ -34,7 +34,7 @@ may skip this section.</i>
 The key idea in declarative configuration is, as its name shows, the notion
 that it is *declarative*, as opposed to an *imperative* style of
 configuration. "Imperative" means that a configuration is given as a series of
-orders: "do this, then to that". "Declative" means that the configuration is
+orders: "do this, then to that". "Declarative" means that the configuration is
 given all at once: "I declare this to be the state of the world".
 
 The Kong Admin API is an example of an imperative configuration tool: the

app/1.2.x/db-less-and-declarative-config.md

@@ -33,7 +33,7 @@ may skip this section.</i>
 The key idea in declarative configuration is, as its name shows, the notion
 that it is _declarative_, as opposed to an _imperative_ style of
 configuration. "Imperative" means that a configuration is given as a series of
-orders: "do this, then to that". "Declative" means that the configuration is
+orders: "do this, then to that". "Declarative" means that the configuration is
 given all at once: "I declare this to be the state of the world".
 
 The Kong Admin API is an example of an imperative configuration tool: the

app/1.3.x/db-less-and-declarative-config.md

@@ -34,7 +34,7 @@ may skip this section.</i>
 The key idea in declarative configuration is, as its name shows, the notion
 that it is *declarative*, as opposed to an *imperative* style of
 configuration. "Imperative" means that a configuration is given as a series of
-orders: "do this, then to that". "Declative" means that the configuration is
+orders: "do this, then to that". "Declarative" means that the configuration is
 given all at once: "I declare this to be the state of the world".
 
 The Kong Admin API is an example of an imperative configuration tool: the

app/1.4.x/db-less-and-declarative-config.md

@@ -34,7 +34,7 @@ may skip this section.</i>
 The key idea in declarative configuration is, as its name shows, the notion
 that it is *declarative*, as opposed to an *imperative* style of
 configuration. "Imperative" means that a configuration is given as a series of
-orders: "do this, then to that". "Declative" means that the configuration is
+orders: "do this, then to that". "Declarative" means that the configuration is
 given all at once: "I declare this to be the state of the world".
 
 The Kong Admin API is an example of an imperative configuration tool: the

app/1.5.x/db-less-and-declarative-config.md

@@ -34,7 +34,7 @@ may skip this section.</i>
 The key idea in declarative configuration is, as its name shows, the notion
 that it is *declarative*, as opposed to an *imperative* style of
 configuration. "Imperative" means that a configuration is given as a series of
-orders: "do this, then to that". "Declative" means that the configuration is
+orders: "do this, then to that". "Declarative" means that the configuration is
 given all at once: "I declare this to be the state of the world".
 
 The Kong Admin API is an example of an imperative configuration tool: the

app/2.0.x/db-less-and-declarative-config.md

@@ -34,7 +34,7 @@ may skip this section.</i>
 The key idea in declarative configuration is, as its name shows, the notion
 that it is *declarative*, as opposed to an *imperative* style of
 configuration. "Imperative" means that a configuration is given as a series of
-orders: "do this, then to that". "Declative" means that the configuration is
+orders: "do this, then to that". "Declarative" means that the configuration is
 given all at once: "I declare this to be the state of the world".
 
 The Kong Admin API is an example of an imperative configuration tool: the

app/2.1.x/clustering.md

@@ -78,6 +78,23 @@ This makes Kong clusters **eventually consistent**.
 
 [Back to top](#introduction)
 
+### Use read-only replicas when deploying Kong clusters with Postgres
+
+When using Postgres as the backend storage, you can optionally enable
+Kong to serve read queries from a separate database instance.
+
+One of the common use cases of this feature is to deploy Kong with the
+Amazon Aurora service as backend storage. Because Aurora natively supports
+read-only instances, enabling the read-only connection support in Kong
+greatly reduces the load on the main database instance since read-only
+queries are no longer sent to it.
+
+To learn more about how to configure this feature, refer to the
+[Datastore section](/{{page.kong_version}}/configuration/#datastore-section)
+of the Configuration reference.
+
+[Back to top](#introduction)
+
 ## What is being cached?
 
 All of the core entities such as Services, Routes, Plugins, Consumers, Credentials are

app/2.1.x/db-less-and-declarative-config.md

@@ -34,7 +34,7 @@ may skip this section.</i>
 The key idea in declarative configuration is, as its name shows, the notion
 that it is *declarative*, as opposed to an *imperative* style of
 configuration. "Imperative" means that a configuration is given as a series of
-orders: "do this, then to that". "Declative" means that the configuration is
+orders: "do this, then to that". "Declarative" means that the configuration is
 given all at once: "I declare this to be the state of the world".
 
 The Kong Admin API is an example of an imperative configuration tool: the

app/2.1.x/proxy.md

@@ -781,16 +781,13 @@ allows routing via SNIs:
 
 Incoming requests with a matching hostname set in the TLS connection's SNI
 extension would be routed to this Route. As mentioned, SNI routing applies not
-only to TLS, but also to other protocols carried over TLS - such as HTTPS and
-If multiple SNIs are specified in the Route, any of them can match with the incoming request's SNI.
-with the incoming request (OR relationship between the names).
+only to TLS, but also to other protocols carried over TLS (for example, HTTPS), and
+if multiple SNIs are specified in the Route, any of them can match with the
+incoming request's SNI (there is an OR relationship between the names).
 
 The SNI is indicated at TLS handshake time and cannot be modified after the TLS connection has
 been established. This means, for example, that multiple requests reusing the same keepalive connection
 will have the same SNI hostname while performing router match, regardless of the `Host` header.
-has been established. This means keepalive connections that send multiple requests
-will have the same SNI hostnames while performing router match
-(regardless of the `Host` header).
 
 Please note that creating a route with mismatched SNI and `Host` header matcher
 is possible, but generally discouraged.