Merge branch '4.3' into 4.4

OskarStark · OskarStark · commit 25ff056592e3 · 2019-09-02T08:14:16.000+02:00
* 4.3:
  fix word: domain =&gt; subdomain
diff --git a/routing.rst b/routing.rst
@@ -1635,7 +1635,7 @@ multi-tenant applications) and these parameters can be validated too with
             ;
         };
 
-In the above example, the ``domain`` parameter defines a default value because
+In the above example, the ``subdomain`` parameter defines a default value because
 otherwise you need to include a domain value each time you generate a URL using
 these routes.
 

Original file line number	Diff line number	Diff line change
`@@ -1635,7 +1635,7 @@ multi-tenant applications) and these parameters can be validated too with`
`1635`	`1635`	`;`
`1636`	`1636`	`};`
`1637`	`1637`
`1638`		-In the above example, the ``domain`` parameter defines a default value because
	`1638`	+In the above example, the ``subdomain`` parameter defines a default value because
`1639`	`1639`	`otherwise you need to include a domain value each time you generate a URL using`
`1640`	`1640`	`these routes.`
`1641`	`1641`