diff --git a/multi/multi__configuration.html b/multi/multi__configuration.html
index f978c0ca..275d6896 100644
--- a/multi/multi__configuration.html
+++ b/multi/multi__configuration.html
@@ -9,7 +9,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: setstatus_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
diff --git a/multi/multi_gateway-request-predicates-factories.html b/multi/multi_gateway-request-predicates-factories.html
index 7a59d002..e26d3674 100644
--- a/multi/multi_gateway-request-predicates-factories.html
+++ b/multi/multi_gateway-request-predicates-factories.html
@@ -5,7 +5,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: after_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -15,7 +14,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: before_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -25,7 +23,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: between_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -35,7 +32,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: cookie_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -45,7 +41,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: header_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -55,7 +50,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: host_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -65,7 +59,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: method_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -75,7 +68,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: host_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -85,7 +77,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: query_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -95,7 +86,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: query_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -105,7 +95,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: remoteaddr_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
diff --git a/multi/multi_gateway-route-filters.html b/multi/multi_gateway-route-filters.html
index f0d78312..81bd1452 100644
--- a/multi/multi_gateway-route-filters.html
+++ b/multi/multi_gateway-route-filters.html
@@ -5,7 +5,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: add_request_header_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -15,7 +14,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: add_request_parameter_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -25,7 +23,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: add_request_header_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -35,17 +32,29 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: hytstrix_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        - Hystrix</span>=myCommandName</pre><p>
-</p><p>This wraps the remaining filters in a <code class="literal">HystrixCommand</code> with command name <code class="literal">myCommandName</code>.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="_prefixpath_gatewayfilter_factory" href="#_prefixpath_gatewayfilter_factory"></a>5.5&nbsp;PrefixPath GatewayFilter Factory</h2></div></div></div><p>The PrefixPath GatewayFilter Factory takes a single <code class="literal">prefix</code> parameter.</p><p><b>application.yml.&nbsp;</b>
+</p><p>This wraps the remaining filters in a <code class="literal">HystrixCommand</code> with command name <code class="literal">myCommandName</code>.</p><p>The Hystrix filter takes an optional <code class="literal">fallbackUri</code> parameter. Currently, only <code class="literal">forward:</code> schemed URIs are supported. If the fallback is called, the request will be forwarded to the controller matched by the URI.</p><p><b>application.yml.&nbsp;</b>
+</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">spring</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: hytstrix_route
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        - name</span>: Hystrix
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">          args</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">            name</span>: fallbackcmd
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">            fallbackUri</span>: forward:/fallbackcontroller
+
+This will forward to the `/fallbackcontroller` when the Hystrix fallback is called.</pre><p>
+</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="_prefixpath_gatewayfilter_factory" href="#_prefixpath_gatewayfilter_factory"></a>5.5&nbsp;PrefixPath GatewayFilter Factory</h2></div></div></div><p>The PrefixPath GatewayFilter Factory takes a single <code class="literal">prefix</code> parameter.</p><p><b>application.yml.&nbsp;</b>
 </p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">spring</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: prefixpath_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -55,7 +64,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: preserve_host_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -69,7 +77,6 @@
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: requestratelimiter_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -84,7 +91,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: prefixpath_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -94,7 +100,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: removerequestheader_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -104,7 +109,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: removeresponseheader_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -114,7 +118,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: rewritepath_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -126,7 +129,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: setpath_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -138,7 +140,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: setresponseheader_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -148,7 +149,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: setstatusstring_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
diff --git a/single/spring-cloud-gateway.html b/single/spring-cloud-gateway.html
index 66a98775..207c23e1 100644
--- a/single/spring-cloud-gateway.html
+++ b/single/spring-cloud-gateway.html
@@ -7,7 +7,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: after_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -17,7 +16,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: before_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -27,7 +25,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: between_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -37,7 +34,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: cookie_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -47,7 +43,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: header_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -57,7 +52,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: host_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -67,7 +61,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: method_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -77,7 +70,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: host_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -87,7 +79,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: query_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -97,7 +88,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: query_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -107,7 +97,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: remoteaddr_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -117,7 +106,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: add_request_header_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -127,7 +115,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: add_request_parameter_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -137,7 +124,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: add_request_header_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -147,17 +133,29 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: hytstrix_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        - Hystrix</span>=myCommandName</pre><p>
-</p><p>This wraps the remaining filters in a <code class="literal">HystrixCommand</code> with command name <code class="literal">myCommandName</code>.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="_prefixpath_gatewayfilter_factory" href="#_prefixpath_gatewayfilter_factory"></a>5.5&nbsp;PrefixPath GatewayFilter Factory</h2></div></div></div><p>The PrefixPath GatewayFilter Factory takes a single <code class="literal">prefix</code> parameter.</p><p><b>application.yml.&nbsp;</b>
+</p><p>This wraps the remaining filters in a <code class="literal">HystrixCommand</code> with command name <code class="literal">myCommandName</code>.</p><p>The Hystrix filter takes an optional <code class="literal">fallbackUri</code> parameter. Currently, only <code class="literal">forward:</code> schemed URIs are supported. If the fallback is called, the request will be forwarded to the controller matched by the URI.</p><p><b>application.yml.&nbsp;</b>
+</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">spring</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: hytstrix_route
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        - name</span>: Hystrix
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">          args</span>:
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">            name</span>: fallbackcmd
+<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">            fallbackUri</span>: forward:/fallbackcontroller
+
+This will forward to the `/fallbackcontroller` when the Hystrix fallback is called.</pre><p>
+</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="_prefixpath_gatewayfilter_factory" href="#_prefixpath_gatewayfilter_factory"></a>5.5&nbsp;PrefixPath GatewayFilter Factory</h2></div></div></div><p>The PrefixPath GatewayFilter Factory takes a single <code class="literal">prefix</code> parameter.</p><p><b>application.yml.&nbsp;</b>
 </p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">spring</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: prefixpath_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -167,7 +165,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: preserve_host_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -181,7 +178,6 @@ for details on setting up your build system with the current Spring Cloud Releas
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: requestratelimiter_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -196,7 +192,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: prefixpath_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -206,7 +201,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: removerequestheader_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -216,7 +210,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: removeresponseheader_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -226,7 +219,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: rewritepath_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -238,7 +230,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: setpath_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        predicates</span>:
@@ -250,7 +241,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: setresponseheader_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -260,7 +250,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: setstatusstring_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
@@ -278,7 +267,6 @@ KeyResolver userKeyResolver() {
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  cloud</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    gateway</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      routes</span>:
-<span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      # </span>=====================================
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">      - id</span>: setstatus_route
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        uri</span>: http://example.org
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">        filters</span>:
diff --git a/spring-cloud-gateway.xml b/spring-cloud-gateway.xml
index 22383dad..8cbfb789 100644
--- a/spring-cloud-gateway.xml
+++ b/spring-cloud-gateway.xml
@@ -57,7 +57,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: after_route
         uri: http://example.org
         predicates:
@@ -76,7 +75,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: before_route
         uri: http://example.org
         predicates:
@@ -95,7 +93,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: between_route
         uri: http://example.org
         predicates:
@@ -114,7 +111,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: cookie_route
         uri: http://example.org
         predicates:
@@ -133,7 +129,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: header_route
         uri: http://example.org
         predicates:
@@ -152,7 +147,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: host_route
         uri: http://example.org
         predicates:
@@ -171,7 +165,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: method_route
         uri: http://example.org
         predicates:
@@ -190,7 +183,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: host_route
         uri: http://example.org
         predicates:
@@ -210,7 +202,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: query_route
         uri: http://example.org
         predicates:
@@ -225,7 +216,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: query_route
         uri: http://example.org
         predicates:
@@ -244,7 +234,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: remoteaddr_route
         uri: http://example.org
         predicates:
@@ -267,7 +256,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: add_request_header_route
         uri: http://example.org
         filters:
@@ -286,7 +274,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: add_request_parameter_route
         uri: http://example.org
         filters:
@@ -305,7 +292,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: add_request_header_route
         uri: http://example.org
         filters:
@@ -324,7 +310,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: hytstrix_route
         uri: http://example.org
         filters:
@@ -332,6 +317,25 @@ for details on setting up your build system with the current Spring Cloud Releas
 </para>
 </formalpara>
 <simpara>This wraps the remaining filters in a <literal>HystrixCommand</literal> with command name <literal>myCommandName</literal>.</simpara>
+<simpara>The Hystrix filter takes an optional <literal>fallbackUri</literal> parameter. Currently, only <literal>forward:</literal> schemed URIs are supported. If the fallback is called, the request will be forwarded to the controller matched by the URI.</simpara>
+<formalpara>
+<title>application.yml</title>
+<para>
+<programlisting language="yaml" linenumbering="unnumbered">spring:
+  cloud:
+    gateway:
+      routes:
+      - id: hytstrix_route
+        uri: http://example.org
+        filters:
+        - name: Hystrix
+          args:
+            name: fallbackcmd
+            fallbackUri: forward:/fallbackcontroller
+
+This will forward to the `/fallbackcontroller` when the Hystrix fallback is called.</programlisting>
+</para>
+</formalpara>
 </section>
 <section xml:id="_prefixpath_gatewayfilter_factory">
 <title>PrefixPath GatewayFilter Factory</title>
@@ -343,7 +347,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: prefixpath_route
         uri: http://example.org
         filters:
@@ -362,7 +365,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: preserve_host_route
         uri: http://example.org
         filters:
@@ -394,7 +396,6 @@ for details on setting up your build system with the current Spring Cloud Releas
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: requestratelimiter_route
         uri: http://example.org
         filters:
@@ -422,7 +423,6 @@ KeyResolver userKeyResolver() {
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: prefixpath_route
         uri: http://example.org
         filters:
@@ -473,7 +473,6 @@ KeyResolver userKeyResolver() {
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: removerequestheader_route
         uri: http://example.org
         filters:
@@ -492,7 +491,6 @@ KeyResolver userKeyResolver() {
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: removeresponseheader_route
         uri: http://example.org
         filters:
@@ -511,7 +509,6 @@ KeyResolver userKeyResolver() {
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: rewritepath_route
         uri: http://example.org
         predicates:
@@ -591,7 +588,6 @@ KeyResolver userKeyResolver() {
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: setpath_route
         uri: http://example.org
         predicates:
@@ -612,7 +608,6 @@ KeyResolver userKeyResolver() {
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: setresponseheader_route
         uri: http://example.org
         filters:
@@ -631,7 +626,6 @@ KeyResolver userKeyResolver() {
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: setstatusstring_route
         uri: http://example.org
         filters:
@@ -697,7 +691,6 @@ KeyResolver userKeyResolver() {
   cloud:
     gateway:
       routes:
-      # =====================================
       - id: setstatus_route
         uri: http://example.org
         filters: