Skip to content

Commit

Permalink
Merge pull request #10810 from lixiaobing10051267/masterTypo
Browse files Browse the repository at this point in the history
Fix some typos for router_sharding.md
  • Loading branch information
danmcp authored Sep 7, 2016
2 parents 884520c + 3fb2e08 commit 31f2273
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docs/router_sharding.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The following use cases should be satisfied by this proposal:
## Configuring Routers

Administering routers as a top level object allows administrators to use custom commands specific
to routers. This provides a more use friendly mechanism of configuration and customizing routers.
to routers. This provides a more user friendly mechanism of configuration and customizing routers.
However, this also introduces more code for an object that will likely be dealt with as a pod
anyway. Routers should be a low touch configuration item that do not require many custom commands
for daily administration.
Expand All @@ -44,7 +44,7 @@ Pros:
- Routers are known to OpenShift; the system ensures the proper configuration is running
- Custom administration syntax
- Deal with routers as infra
- The system knows about routers for route route binding and visualization with no extra effort
- The system knows about routers for route binding and visualization with no extra effort

Cons:

Expand Down Expand Up @@ -100,7 +100,7 @@ The `Route` REST API will be changed to validate that:
1. The `DNS` and `Phase` fields of a `Route` are not set during create
2. The value of `DNS` and `Phase` fields do not change during update
3. The `RouteDNS` represents the final DNS name that will be used for the requested route. For example
if the user requests the route `test` for their app in namespace `myapp` they will be allocted to a shard
if the user requests the route `test` for their app in namespace `myapp` they will be allocated to a shard
and given a name in the form of `myapp-test.shard1.v3.rhcloud.com`. This field may only change during
router allocation or reallocation and is only changed by the system. If the user owns their own
domain then this field will be populated from `Route.Host` and remain unchanged during allocation.
Expand Down

0 comments on commit 31f2273

Please sign in to comment.