Changed plugin to plug-in, where applicable

Timothy Poitras · Timothy Poitras · commit 18e233f9ad2d · 2016-06-07T15:20:47.000+10:00
diff --git a/admin_guide/sdn_troubleshooting.adoc b/admin_guide/sdn_troubleshooting.adoc
@@ -355,8 +355,8 @@ These are the interfaces that the OpenShift SDN creates:
 
 * `br0`: The OVS bridge device that containers will be attached to.
 OpenShift SDN also configures a set of non-subnet-specific flow rules
-on this bridge. (The `multitenant` plugin does this immediately; the
-`ovssubnet` plugin waits until the SDN master announces the creation
+on this bridge. (The `multitenant` plug-in does this immediately; the
+`ovssubnet` plug-in waits until the SDN master announces the creation
 of the new node subnet.)
 * `lbr0`: A Linux bridge device, which is configured as Docker's bridge and
 given the cluster subnet gateway address (eg, 10.128.x.1/23).
@@ -491,7 +491,7 @@ table=0, priority=100, ip, nw_dst=10.128.2.10    actions=output:12
 table=0, priority=100,arp,arp_tpa=10.128.2.10    actions=output:12
 ....
 
-The SDN networking plugin configures two entries (one for arp and one
+The SDN networking plug-in configures two entries (one for arp and one
 for ip) with `output=1` per peer endpoint (i.e. if there are five
 nodes, then there should be 4 * 2 rules; In the example above we have
 3 nodes total, so there are four entries above).  It also sets up the
diff --git a/contributing_to_docs/tools_and_setup.adoc b/contributing_to_docs/tools_and_setup.adoc
@@ -119,7 +119,7 @@ $ asciibinder watch
 This utility will run in the terminal where you started it, so you should leave
 it running and open new terminal windows for other tasks.
 
-4. In your browser, enable the LiveReload plugin in the same tab where the
+4. In your browser, enable the LiveReload plug-in in the same tab where the
 preview file is open; the icon should change color once activated. The following
 message will also display in your terminal window:
 +
diff --git a/rest_api/kubernetes_v1.adoc b/rest_api/kubernetes_v1.adoc
@@ -10285,7 +10285,7 @@ FSGroupStrategyOptions is the strategy that will dictate what fs group is used b
 === v1.FinalizerName
 === v1.FlexVolumeSource
 :hardbreaks:
-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.
+FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plug-in. This is an alpha feature and may change in future.
 
 [options="header"]
 |===
@@ -10886,11 +10886,11 @@ PersistentVolumeSpec is the specification of a persistent volume.
 |cephfs|CephFS represents a Ceph FS mount on the host that shares a pod's lifetime|false|<<v1.CephFSVolumeSource>>|
 |fc|FC represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod.|false|<<v1.FCVolumeSource>>|
 |flocker|Flocker represents a Flocker volume attached to a kubelet's host machine and exposed to the pod for its usage. This depends on the Flocker control service being running|false|<<v1.FlockerVolumeSource>>|
-|flexVolume|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.|false|<<v1.FlexVolumeSource>>|
+|flexVolume|FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plug-in. This is an alpha feature and may change in future.|false|<<v1.FlexVolumeSource>>|
 |azureFile|AzureFile represents an Azure File Service mount on the host and bind mount to the pod.|false|<<v1.AzureFileVolumeSource>>|
 |accessModes|AccessModes contains all ways the volume can be mounted. More info: http://releases.k8s.io/release-1.2/docs/user-guide/persistent-volumes.md#access-modes|false|<<v1.PersistentVolumeAccessMode>> array|
 |claimRef|ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim. Expected to be non-nil when bound. claim.VolumeName is the authoritative bind between PV and PVC. More info: http://releases.k8s.io/release-1.2/docs/user-guide/persistent-volumes.md#binding|false|<<v1.ObjectReference>>|
-|persistentVolumeReclaimPolicy|What happens to a persistent volume when released from its claim. Valid options are Retain (default) and Recycle. Recyling must be supported by the volume plugin underlying this persistent volume. More info: http://releases.k8s.io/release-1.2/docs/user-guide/persistent-volumes.md#recycling-policy|false|string|
+|persistentVolumeReclaimPolicy|What happens to a persistent volume when released from its claim. Valid options are Retain (default) and Recycle. Recyling must be supported by the volume plug-in underlying this persistent volume. More info: http://releases.k8s.io/release-1.2/docs/user-guide/persistent-volumes.md#recycling-policy|false|string|
 |===
 
 === v1.PersistentVolumeStatus
@@ -11342,7 +11342,7 @@ SecurityContextConstraints governs the ability to make requests that affect the
 |defaultAddCapabilities|DefaultAddCapabilities is the default set of capabilities that will be added to the container unless the pod spec specifically drops the capability.  You may not list a capabiility in both DefaultAddCapabilities and RequiredDropCapabilities.|true|<<v1.Capability>> array|
 |requiredDropCapabilities|RequiredDropCapabilities are the capabilities that will be dropped from the container.  These are required to be dropped and cannot be added.|true|<<v1.Capability>> array|
 |allowedCapabilities|AllowedCapabilities is a list of capabilities that can be requested to add to the container. Capabilities in this field maybe added at the pod author's discretion. You must not list a capability in both AllowedCapabilities and RequiredDropCapabilities.|true|<<v1.Capability>> array|
-|allowHostDirVolumePlugin|AllowHostDirVolumePlugin determines if the policy allow containers to use the HostDir volume plugin|true|boolean|
+|allowHostDirVolumePlugin|AllowHostDirVolumePlugin determines if the policy allow containers to use the HostDir volume plug-in|true|boolean|
 |allowHostNetwork|AllowHostNetwork determines if the policy allows the use of HostNetwork in the pod spec.|true|boolean|
 |allowHostPorts|AllowHostPorts determines if the policy allows host ports in the containers.|true|boolean|
 |allowHostPID|AllowHostPID determines if the policy allows host pid in the containers.|true|boolean|
@@ -11511,7 +11511,7 @@ Volume represents a named volume in a pod that may be accessed by any container
 |glusterfs|Glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. More info: http://releases.k8s.io/release-1.2/examples/glusterfs/README.md|false|<<v1.GlusterfsVolumeSource>>|
 |persistentVolumeClaim|PersistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace. More info: http://releases.k8s.io/release-1.2/docs/user-guide/persistent-volumes.md#persistentvolumeclaims|false|<<v1.PersistentVolumeClaimVolumeSource>>|
 |rbd|RBD represents a Rados Block Device mount on the host that shares a pod's lifetime. More info: http://releases.k8s.io/release-1.2/examples/rbd/README.md|false|<<v1.RBDVolumeSource>>|
-|flexVolume|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.|false|<<v1.FlexVolumeSource>>|
+|flexVolume|FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plug-in. This is an alpha feature and may change in future.|false|<<v1.FlexVolumeSource>>|
 |cinder|Cinder represents a cinder volume attached and mounted on kubelets host machine More info: http://releases.k8s.io/release-1.2/examples/mysql-cinder-pd/README.md|false|<<v1.CinderVolumeSource>>|
 |cephfs|CephFS represents a Ceph FS mount on the host that shares a pod's lifetime|false|<<v1.CephFSVolumeSource>>|
 |flocker|Flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running|false|<<v1.FlockerVolumeSource>>|
diff --git a/rest_api/openshift_v1.adoc b/rest_api/openshift_v1.adoc
@@ -10995,7 +10995,7 @@ Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as
 === v1.FinalizerName
 === v1.FlexVolumeSource
 :hardbreaks:
-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.
+FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plug-in. This is an alpha feature and may change in future.
 
 [options="header"]
 |===
@@ -11654,7 +11654,7 @@ NamedTagEventList relates a tag to its image history.
 
 === v1.NetNamespace
 :hardbreaks:
-NetNamespace represents a segregated network namespace for an entire cluster. When a group of pods, or a project, or a group of projects get a NetNamespace assigned then the openshift-sdn's multitenant plugin ensures network layer isolation of traffic from other NetNamespaces.
+NetNamespace represents a segregated network namespace for an entire cluster. When a group of pods, or a project, or a group of projects get a NetNamespace assigned then the openshift-sdn's multitenant plug-in ensures network layer isolation of traffic from other NetNamespaces.
 
 [options="header"]
 |===
@@ -11668,7 +11668,7 @@ NetNamespace represents a segregated network namespace for an entire cluster. Wh
 
 === v1.NetNamespaceList
 :hardbreaks:
-NetNamespaceList represents a list of NetNamespace objects. NetNamespace catpures information about a segregated network namespace for an entire cluster. When a group of pods, or a project, or a group of projects get a NetNamespace assigned then the openshift-sdn's multitenant plugin ensures network layer isolation of traffic from other NetNamespaces.
+NetNamespaceList represents a list of NetNamespace objects. NetNamespace catpures information about a segregated network namespace for an entire cluster. When a group of pods, or a project, or a group of projects get a NetNamespace assigned then the openshift-sdn's multitenant plug-in ensures network layer isolation of traffic from other NetNamespaces.
 
 [options="header"]
 |===
@@ -12677,7 +12677,7 @@ Volume represents a named volume in a pod that may be accessed by any container
 |glusterfs|Glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. More info: http://releases.k8s.io/release-1.2/examples/glusterfs/README.md|false|<<v1.GlusterfsVolumeSource>>|
 |persistentVolumeClaim|PersistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace. More info: http://releases.k8s.io/release-1.2/docs/user-guide/persistent-volumes.md#persistentvolumeclaims|false|<<v1.PersistentVolumeClaimVolumeSource>>|
 |rbd|RBD represents a Rados Block Device mount on the host that shares a pod's lifetime. More info: http://releases.k8s.io/release-1.2/examples/rbd/README.md|false|<<v1.RBDVolumeSource>>|
-|flexVolume|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.|false|<<v1.FlexVolumeSource>>|
+|flexVolume|FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plug-in. This is an alpha feature and may change in future.|false|<<v1.FlexVolumeSource>>|
 |cinder|Cinder represents a cinder volume attached and mounted on kubelets host machine More info: http://releases.k8s.io/release-1.2/examples/mysql-cinder-pd/README.md|false|<<v1.CinderVolumeSource>>|
 |cephfs|CephFS represents a Ceph FS mount on the host that shares a pod's lifetime|false|<<v1.CephFSVolumeSource>>|
 |flocker|Flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running|false|<<v1.FlockerVolumeSource>>|
diff --git a/using_images/other_images/jenkins.adoc b/using_images/other_images/jenkins.adoc
@@ -127,16 +127,16 @@ To customize the official OpenShift Jenkins image, you have two options:
 
 You can use link:../../architecture/core_concepts/builds_and_image_streams.html#source-build[S2I]
 to copy your custom Jenkins Jobs definitions, additional
-plugins or replace the provided *_config.xml_* file with your own, custom, configuration.
+plug-ins or replace the provided *_config.xml_* file with your own, custom, configuration.
 
 In order to include your modifications in the Jenkins image, you need to have a Git
 repository with the following directory structure:
 
 *_plugins_*::
-This directory contains those binary Jenkins plugins you want to copy into Jenkins.
+This directory contains those binary Jenkins plug-ins you want to copy into Jenkins.
 
 *_plugins.txt_*::
-This file lists the plugins you want to install (see the section above).
+This file lists the plug-ins you want to install (see the section above).
 
 *_configuration/jobs_*::
 This directory contains the Jenkins job definitions.
@@ -213,18 +213,18 @@ slave.
 For more details on the sample job included in this image, see this link:https://github.com/openshift/origin/blob/master/examples/jenkins/README.md[tutorial].
 
 ifdef::openshift-origin[]
-== OpenShift Pipeline Plugin
+== OpenShift Pipeline Plug-in
 
-The Jenkins image's list of pre-installed plugins includes a plugin which assists in the creating of CI/CD workflows that run against
+The Jenkins image's list of pre-installed plug-ins includes a plug-in which assists in the creating of CI/CD workflows that run against
 an OpenShift server.  A series of build steps, post-build actions, as well as SCM-style polling are provided which equate to administrative
 and operational actions on the OpenShift server and the API artifacts hosted there.
 
-In addition to being accessible from the classic "freestyle" form of Jenkins job, the build steps as of version 1.0.14 of the OpenShift Pipeline Plugin
-are also avaible to Jenkins Pipeline jobs via the DSL extension points provided by the Jenkins Pipeline Plugin.
+In addition to being accessible from the classic "freestyle" form of Jenkins job, the build steps as of version 1.0.14 of the OpenShift Pipeline Plug-in
+are also avaible to Jenkins Pipeline jobs via the DSL extension points provided by the Jenkins Pipeline Plug-in.
 
-The https://github.com/openshift/jenkins/tree/master/1/contrib/openshift/configuration/jobs/OpenShift%20Sample[sample Jenkins job] that is pre-configured in the Jenkins image utilizes the OpenShift pipeline plugin and serves as an example of
-how to leverage the plugin for creating CI/CD flows for OpenShift in Jenkins.
+The https://github.com/openshift/jenkins/tree/master/1/contrib/openshift/configuration/jobs/OpenShift%20Sample[sample Jenkins job] that is pre-configured in the Jenkins image utilizes the OpenShift pipeline plug-in and serves as an example of
+how to leverage the plug-in for creating CI/CD flows for OpenShift in Jenkins.
 
-See the https://github.com/openshift/jenkins-plugin/[the plugin's README] for a detailed description of what is available.
+See the https://github.com/openshift/jenkins-plugin/[the plug-in's README] for a detailed description of what is available.
 
 endif::openshift-origin[]

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ $ asciibinder watch`
`119`	`119`	`This utility will run in the terminal where you started it, so you should leave`
`120`	`120`	`it running and open new terminal windows for other tasks.`
`121`	`121`
`122`		`-4. In your browser, enable the LiveReload plugin in the same tab where the`
	`122`	`+4. In your browser, enable the LiveReload plug-in in the same tab where the`
`123`	`123`	`preview file is open; the icon should change color once activated. The following`
`124`	`124`	`message will also display in your terminal window:`
`125`	`125`	`+`