Skip to content

Commit

Permalink
Merge pull request #3 from SRaddict/mine
Browse files Browse the repository at this point in the history
 'the', "a" and "an"
  • Loading branch information
xulike666 authored Dec 22, 2016
2 parents 5be27c3 + e0a6a2c commit 9993a4d
Show file tree
Hide file tree
Showing 18 changed files with 31 additions and 31 deletions.
6 changes: 3 additions & 3 deletions _includes/v1.3/extensions-v1beta1-definitions.html
Original file line number Diff line number Diff line change
Expand Up @@ -2079,7 +2079,7 @@ <h3 id="_v1_envvarsource">v1.EnvVarSource</h3>
<div class="sect2">
<h3 id="_v1_flexvolumesource">v1.FlexVolumeSource</h3>
<div class="paragraph">
<p>FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future.</p>
<p>FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>
Expand Down Expand Up @@ -2535,7 +2535,7 @@ <h3 id="_v1_volume">v1.Volume</h3>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">flexVolume</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_flexvolumesource">v1.FlexVolumeSource</a></p></td>
<td class="tableblock halign-left valign-top"></td>
Expand Down Expand Up @@ -5867,7 +5867,7 @@ <h3 id="_v1beta1_httpingresspath">v1beta1.HTTPIngressPath</h3>
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">path</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Path is a extended POSIX regex as defined by IEEE Std 1003.1, (i.e this follows the egrep/unix syntax, not the perl syntax) matched against the path of an incoming request. Currently it can contain characters disallowed from the conventional "path" part of a URL as defined by RFC 3986. Paths must begin with a <em>/</em>. If unspecified, the path defaults to a catch all sending traffic to the backend.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Path is an extended POSIX regex as defined by IEEE Std 1003.1, (i.e this follows the egrep/unix syntax, not the perl syntax) matched against the path of an incoming request. Currently it can contain characters disallowed from the conventional "path" part of a URL as defined by RFC 3986. Paths must begin with a <em>/</em>. If unspecified, the path defaults to a catch all sending traffic to the backend.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
Expand Down
4 changes: 2 additions & 2 deletions _includes/v1.3/extensions-v1beta1-operations.html
Original file line number Diff line number Diff line change
Expand Up @@ -5578,7 +5578,7 @@ <h4 id="_tags_42">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_create_a_ingress">create a Ingress</h3>
<h3 id="_create_a_ingress">create an Ingress</h3>
<div class="listingblock">
<div class="content">
<pre>POST /apis/extensions/v1beta1/namespaces/{namespace}/ingresses</pre>
Expand Down Expand Up @@ -5959,7 +5959,7 @@ <h4 id="_tags_45">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_delete_a_ingress">delete a Ingress</h3>
<h3 id="_delete_a_ingress">delete an Ingress</h3>
<div class="listingblock">
<div class="content">
<pre>DELETE /apis/extensions/v1beta1/namespaces/{namespace}/ingresses/{name}</pre>
Expand Down
6 changes: 3 additions & 3 deletions _includes/v1.3/v1-definitions.html
Original file line number Diff line number Diff line change
Expand Up @@ -2560,7 +2560,7 @@ <h3 id="_v1_secretvolumesource">v1.SecretVolumeSource</h3>
<div class="sect2">
<h3 id="_v1_flexvolumesource">v1.FlexVolumeSource</h3>
<div class="paragraph">
<p>FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future.</p>
<p>FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>
Expand Down Expand Up @@ -3268,7 +3268,7 @@ <h3 id="_v1_volume">v1.Volume</h3>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">flexVolume</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_flexvolumesource">v1.FlexVolumeSource</a></p></td>
<td class="tableblock halign-left valign-top"></td>
Expand Down Expand Up @@ -5555,7 +5555,7 @@ <h3 id="_v1_persistentvolumespec">v1.PersistentVolumeSpec</h3>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">flexVolume</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_flexvolumesource">v1.FlexVolumeSource</a></p></td>
<td class="tableblock halign-left valign-top"></td>
Expand Down
8 changes: 4 additions & 4 deletions _includes/v1.3/v1-operations.html
Original file line number Diff line number Diff line change
Expand Up @@ -2676,7 +2676,7 @@ <h4 id="_tags_20">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_create_a_endpoints">create a Endpoints</h3>
<h3 id="_create_a_endpoints">create an Endpoints</h3>
<div class="listingblock">
<div class="content">
<pre>POST /api/v1/namespaces/{namespace}/endpoints</pre>
Expand Down Expand Up @@ -3057,7 +3057,7 @@ <h4 id="_tags_23">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_delete_a_endpoints">delete a Endpoints</h3>
<h3 id="_delete_a_endpoints">delete an Endpoints</h3>
<div class="listingblock">
<div class="content">
<pre>DELETE /api/v1/namespaces/{namespace}/endpoints/{name}</pre>
Expand Down Expand Up @@ -3619,7 +3619,7 @@ <h4 id="_tags_27">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_create_a_event">create a Event</h3>
<h3 id="_create_a_event">create an Event</h3>
<div class="listingblock">
<div class="content">
<pre>POST /api/v1/namespaces/{namespace}/events</pre>
Expand Down Expand Up @@ -4000,7 +4000,7 @@ <h4 id="_tags_30">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_delete_a_event">delete a Event</h3>
<h3 id="_delete_a_event">delete an Event</h3>
<div class="listingblock">
<div class="content">
<pre>DELETE /api/v1/namespaces/{namespace}/events/{name}</pre>
Expand Down
4 changes: 2 additions & 2 deletions _includes/v1.4/extensions-v1beta1-operations.html
Original file line number Diff line number Diff line change
Expand Up @@ -5578,7 +5578,7 @@ <h4 id="_tags_42">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_create_a_ingress">create a Ingress</h3>
<h3 id="_create_a_ingress">create an Ingress</h3>
<div class="listingblock">
<div class="content">
<pre>POST /apis/extensions/v1beta1/namespaces/{namespace}/ingresses</pre>
Expand Down Expand Up @@ -5959,7 +5959,7 @@ <h4 id="_tags_45">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_delete_a_ingress">delete a Ingress</h3>
<h3 id="_delete_a_ingress">delete an Ingress</h3>
<div class="listingblock">
<div class="content">
<pre>DELETE /apis/extensions/v1beta1/namespaces/{namespace}/ingresses/{name}</pre>
Expand Down
10 changes: 5 additions & 5 deletions _includes/v1.4/v1-operations.html
Original file line number Diff line number Diff line change
Expand Up @@ -2676,7 +2676,7 @@ <h4 id="_tags_20">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_create_a_endpoints">create a Endpoints</h3>
<h3 id="_create_a_endpoints">create an Endpoints</h3>
<div class="listingblock">
<div class="content">
<pre>POST /api/v1/namespaces/{namespace}/endpoints</pre>
Expand Down Expand Up @@ -3057,7 +3057,7 @@ <h4 id="_tags_23">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_delete_a_endpoints">delete a Endpoints</h3>
<h3 id="_delete_a_endpoints">delete an Endpoints</h3>
<div class="listingblock">
<div class="content">
<pre>DELETE /api/v1/namespaces/{namespace}/endpoints/{name}</pre>
Expand Down Expand Up @@ -3619,7 +3619,7 @@ <h4 id="_tags_27">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_create_a_event">create a Event</h3>
<h3 id="_create_a_event">create an Event</h3>
<div class="listingblock">
<div class="content">
<pre>POST /api/v1/namespaces/{namespace}/events</pre>
Expand Down Expand Up @@ -4000,7 +4000,7 @@ <h4 id="_tags_30">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_delete_a_event">delete a Event</h3>
<h3 id="_delete_a_event">delete an Event</h3>
<div class="listingblock">
<div class="content">
<pre>DELETE /api/v1/namespaces/{namespace}/events/{name}</pre>
Expand Down Expand Up @@ -7885,7 +7885,7 @@ <h4 id="_tags_59">Tags</h4>
</div>
</div>
<div class="sect2">
<h3 id="_create_eviction_of_a_eviction">create eviction of a Eviction</h3>
<h3 id="_create_eviction_of_a_eviction">create eviction of an Eviction</h3>
<div class="listingblock">
<div class="content">
<pre>POST /api/v1/namespaces/{namespace}/pods/{name}/eviction</pre>
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/addons.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Add-ons in each section are sorted alphabetically - the ordering does not imply

* [Calico](http://docs.projectcalico.org/v2.0/getting-started/kubernetes/installation/hosted/) is a secure L3 networking and network policy provider.
* [Canal](https://github.com/tigera/canal/tree/master/k8s-install/kubeadm) unites Flannel and Calico, providing networking and network policy.
* [Flannel](https://github.com/coreos/flannel/blob/master/Documentation/kube-flannel.yml) is a overlay network provider that can be used with Kubernetes.
* [Flannel](https://github.com/coreos/flannel/blob/master/Documentation/kube-flannel.yml) is an overlay network provider that can be used with Kubernetes.
* [Romana](http://romana.io) is a Layer 3 networking solution for pod networks that also supports the [NetworkPolicy API](/docs/user-guide/networkpolicies/). Kubeadm add-on installation details available [here](https://github.com/romana/romana/tree/master/containerize).
* [Weave Net](https://www.weave.works/docs/net/latest/kube-addon/) provides networking and network policy, will carry on working on both sides of a network partition, and does not require an external database.

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/ha-master-gce.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ If true, reads will be directed to leader etcd replica.
Setting this value to true is optional: reads will be more reliable but will also be slower.

Optionally, you can specify a GCE zone where the first master replica is to be created.
Set the the following flag:
Set the following flag:

* `KUBE_GCE_ZONE=zone` - zone where the first master replica will run.

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/kubelet.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ kubelet
--experimental-bootstrap-kubeconfig string <Warning: Experimental feature> Path to a kubeconfig file that will be used to get client certificate for kubelet. If the file specified by --kubeconfig does not exist, the bootstrap kubeconfig is used to request a client certificate from the API server. On success, a kubeconfig file referencing the generated key and obtained certificate is written to the path specified by --kubeconfig. The certificate and key file will be stored in the directory pointed by --cert-dir.
--experimental-cgroups-per-qos Enable creation of QoS cgroup hierarchy, if true top level QoS and pod cgroups are created.
--experimental-check-node-capabilities-before-mount [Experimental] if set true, the kubelet will check the underlying node for required componenets (binaries, etc.) before performing the mount
--experimental-cri [Experimental] Enable the Container Runtime Interface (CRI) integration. If --container-runtime is set to "remote", Kubelet will communicate with the runtime/image CRI server listening on the endpoint specified by --remote-runtime-endpoint/--remote-image-endpoint. If --container-runtime is set to "docker", Kubelet will launch a in-process CRI server on behalf of docker, and communicate over a default endpoint.
--experimental-cri [Experimental] Enable the Container Runtime Interface (CRI) integration. If --container-runtime is set to "remote", Kubelet will communicate with the runtime/image CRI server listening on the endpoint specified by --remote-runtime-endpoint/--remote-image-endpoint. If --container-runtime is set to "docker", Kubelet will launch an in-process CRI server on behalf of docker, and communicate over a default endpoint.
--experimental-fail-swap-on Makes the Kubelet fail to start if swap is enabled on the node. This is a temporary opton to maintain legacy behavior, failing due to swap enabled will happen by default in v1.6.
--experimental-kernel-memcg-notification If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling.
--experimental-mounter-path string [Experimental] Path of mounter binary. Leave empty to use the default mount.
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/libvirt-coreos.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Another difference is that no security is enforced on `libvirt-coreos` at all. F
* Kubernetes secrets are not protected as securely as they are on production environments;
* etc.

So, an k8s application developer should not validate its interaction with Kubernetes on `libvirt-coreos` because he might technically succeed in doing things that are prohibited on a production environment like:
So, a k8s application developer should not validate its interaction with Kubernetes on `libvirt-coreos` because he might technically succeed in doing things that are prohibited on a production environment like:

* un-authenticated access to Kube API server;
* Access to Kubernetes private data structures inside etcd;
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/mesos/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ We assume that kube-dns will use

Note that we have passed these two values already as parameter to the apiserver above.

A template for an replication controller spinning up the pod with the 3 containers can be found at [cluster/addons/dns/skydns-rc.yaml.in][11] in the repository. The following steps are necessary in order to get a valid replication controller yaml file:
A template for a replication controller spinning up the pod with the 3 containers can be found at [cluster/addons/dns/skydns-rc.yaml.in][11] in the repository. The following steps are necessary in order to get a valid replication controller yaml file:

- replace `{% raw %}{{ pillar['dns_replicas'] }}{% endraw %}` with `1`
- replace `{% raw %}{{ pillar['dns_domain'] }}{% endraw %}` with `cluster.local.`
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/rackspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ There is a specific `cluster/rackspace` directory with the scripts for the follo

1. A cloud network will be created and all instances will be attached to this network.
- flanneld uses this network for next hop routing. These routes allow the containers running on each node to communicate with one another on this private network.
2. A SSH key will be created and uploaded if needed. This key must be used to ssh into the machines (we do not capture the password).
2. An SSH key will be created and uploaded if needed. This key must be used to ssh into the machines (we do not capture the password).
3. The master server and additional nodes will be created via the `nova` CLI. A `cloud-config.yaml` is generated and provided as user-data with the entire configuration for the systems.
4. We then boot as many nodes as defined via `$NUM_NODES`.

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/services/source-ip.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This document makes use of the following terms:

You must have a working Kubernetes 1.5 cluster to run the examples in this
document. The examples use a small nginx webserver that echoes back the source
IP of requests it receives through a HTTP header. You can create it as follows:
IP of requests it receives through an HTTP header. You can create it as follows:

```console
$ kubectl run source-ip-app --image=gcr.io/google_containers/echoserver:1.4
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/connecting-applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ default-token-il9rc kubernetes.io/service-account-token 1
nginxsecret Opaque 2
```

Now modify your nginx replicas to start a https server using the certificate in the secret, and the Service, to expose both ports (80 and 443):
Now modify your nginx replicas to start an https server using the certificate in the secret, and the Service, to expose both ports (80 and 443):

{% include code.html language="yaml" file="nginx-secure-app.yaml" ghlink="/docs/user-guide/nginx-secure-app" %}

Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/jobs/work-queue-2/rediswq.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def lease(self, lease_secs=60, block=True, timeout=None):
# Record that we (this session id) are working on a key. Expire that
# note after the lease timeout.
# Note: if we crash at this line of the program, then GC will see no lease
# for this item an later return it to the main queue.
# for this item a later return it to the main queue.
itemkey = self._itemkey(item)
self._db.setex(self._lease_key_prefix + itemkey, lease_secs, self._session)
return item
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/load-balancer.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Due to the implementation of this feature, the source IP for sessions as seen in
that will preserve the client Source IP for GCE/GKE environments. This feature will be phased in for other cloud providers in subsequent releases.

## Annotation to modify the LoadBalancer behavior for preservation of Source IP
In 1.5, an Beta feature has been added that changes the behavior of the external LoadBalancer feature.
In 1.5, a Beta feature has been added that changes the behavior of the external LoadBalancer feature.

This feature can be activated by adding the beta annotation below to the metadata section of the Service Configuration file.

Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/petset.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Only use PetSet if your application requires some or all of these properties. Ma

Example workloads for PetSet:

* Databases like MySQL or PostgreSQL that require a single instance attached to a NFS persistent volume at any time
* Databases like MySQL or PostgreSQL that require a single instance attached to an NFS persistent volume at any time
* Clustered software like Zookeeper, Etcd, or Elasticsearch that require stable membership.

## Alpha limitations
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/pods/init-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ If the pod is [restarted](#pod-restart-reasons) all init containers must
execute again.
Changes to the init container spec are limited to the container image field.
Altering a init container image field is equivalent to restarting the pod.
Altering an init container image field is equivalent to restarting the pod.
Because init containers can be restarted, retried, or reexecuted, init container
code should be idempotent. In particular, code that writes to files on EmptyDirs
Expand Down

0 comments on commit 9993a4d

Please sign in to comment.