Merge pull request #10606 from miaoyq/fix-oadm-policy-description

Merged by openshift-bot
openshift · Aug 24, 2016 · 914e576 · 914e576
2 parents dcacce6 + 9c69672
commit 914e576
Show file tree

Hide file tree

Showing 43 changed files with 119 additions and 119 deletions.
diff --git a/docs/generated/oadm_by_example_content.adoc b/docs/generated/oadm_by_example_content.adoc
@@ -458,16 +458,16 @@ Make project network global
 
 
 == oadm policy add-role-to-user
-Add users or serviceaccounts to a role in the current project
+Add a role to users or serviceaccounts for the current project
 
 ====
 
 [options="nowrap"]
 ----
-  # Add the 'view' role to user1 in the current project
+  # Add the 'view' role to user1 for the current project
   oadm policy add-role-to-user view user1
 
-  # Add the 'edit' role to serviceaccount1 in the current project
+  # Add the 'edit' role to serviceaccount1 for the current project
   oadm policy add-role-to-user edit -z serviceaccount1
 ----
 ====

diff --git a/docs/generated/oc_by_example_content.adoc b/docs/generated/oc_by_example_content.adoc
@@ -458,16 +458,16 @@ Make project network global
 
 
 == oc adm policy add-role-to-user
-Add users or serviceaccounts to a role in the current project
+Add a role to users or serviceaccounts for the current project
 
 ====
 
 [options="nowrap"]
 ----
-  # Add the 'view' role to user1 in the current project
+  # Add the 'view' role to user1 for the current project
   oc adm policy add-role-to-user view user1
 
-  # Add the 'edit' role to serviceaccount1 in the current project
+  # Add the 'edit' role to serviceaccount1 for the current project
   oc adm policy add-role-to-user edit -z serviceaccount1
 ----
 ====
@@ -1851,16 +1851,16 @@ Update field(s) of a resource using strategic merge patch.
 
 
 == oc policy add-role-to-user
-Add users or serviceaccounts to a role in the current project
+Add a role to users or serviceaccounts for the current project
 
 ====
 
 [options="nowrap"]
 ----
-  # Add the 'view' role to user1 in the current project
+  # Add the 'view' role to user1 for the current project
   oc policy add-role-to-user view user1
 
-  # Add the 'edit' role to serviceaccount1 in the current project
+  # Add the 'edit' role to serviceaccount1 for the current project
   oc policy add-role-to-user edit -z serviceaccount1
 ----
 ====

diff --git a/docs/man/man1/oadm-policy-add-cluster-role-to-group.1 b/docs/man/man1/oadm-policy-add-cluster-role-to-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oadm policy add\-cluster\-role\-to\-group \- Add groups to a role for all projects in the cluster
+oadm policy add\-cluster\-role\-to\-group \- Add a role to groups for all projects in the cluster
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oadm policy add\-cluster\-role\-to\-group \- Add groups to a role for all projec
 
 .SH DESCRIPTION
 .PP
-Add groups to a role for all projects in the cluster
+Add a role to groups for all projects in the cluster
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

diff --git a/docs/man/man1/oadm-policy-add-cluster-role-to-user.1 b/docs/man/man1/oadm-policy-add-cluster-role-to-user.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oadm policy add\-cluster\-role\-to\-user \- Add users to a role for all projects in the cluster
+oadm policy add\-cluster\-role\-to\-user \- Add a role to users for all projects in the cluster
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oadm policy add\-cluster\-role\-to\-user \- Add users to a role for all projects
 
 .SH DESCRIPTION
 .PP
-Add users to a role for all projects in the cluster
+Add a role to users for all projects in the cluster
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

diff --git a/docs/man/man1/oadm-policy-add-role-to-group.1 b/docs/man/man1/oadm-policy-add-role-to-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oadm policy add\-role\-to\-group \- Add groups to a role in the current project
+oadm policy add\-role\-to\-group \- Add a role to groups for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oadm policy add\-role\-to\-group \- Add groups to a role in the current project
 
 .SH DESCRIPTION
 .PP
-Add groups to a role in the current project
+Add a role to groups for the current project
 
 
 .SH OPTIONS

diff --git a/docs/man/man1/oadm-policy-add-role-to-user.1 b/docs/man/man1/oadm-policy-add-role-to-user.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oadm policy add\-role\-to\-user \- Add users or serviceaccounts to a role in the current project
+oadm policy add\-role\-to\-user \- Add a role to users or serviceaccounts for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oadm policy add\-role\-to\-user \- Add users or serviceaccounts to a role in the
 
 .SH DESCRIPTION
 .PP
-Add users or serviceaccounts to a role in the current project
+Add a role to users or serviceaccounts for the current project
 
 
 .SH OPTIONS
@@ -97,10 +97,10 @@ Add users or serviceaccounts to a role in the current project
 .RS
 
 .nf
-  # Add the 'view' role to user1 in the current project
+  # Add the 'view' role to user1 for the current project
   oadm policy add\-role\-to\-user view user1
 
-  # Add the 'edit' role to serviceaccount1 in the current project
+  # Add the 'edit' role to serviceaccount1 for the current project
   oadm policy add\-role\-to\-user edit \-z serviceaccount1
 
 .fi

diff --git a/docs/man/man1/oadm-policy-remove-cluster-role-from-group.1 b/docs/man/man1/oadm-policy-remove-cluster-role-from-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oadm policy remove\-cluster\-role\-from\-group \- Remove group from role for all projects in the cluster
+oadm policy remove\-cluster\-role\-from\-group \- Remove a role from groups for all projects in the cluster
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oadm policy remove\-cluster\-role\-from\-group \- Remove group from role for all
 
 .SH DESCRIPTION
 .PP
-Remove group from role for all projects in the cluster
+Remove a role from groups for all projects in the cluster
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

diff --git a/docs/man/man1/oadm-policy-remove-cluster-role-from-user.1 b/docs/man/man1/oadm-policy-remove-cluster-role-from-user.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oadm policy remove\-cluster\-role\-from\-user \- Remove user from role for all projects in the cluster
+oadm policy remove\-cluster\-role\-from\-user \- Remove a role from users for all projects in the cluster
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oadm policy remove\-cluster\-role\-from\-user \- Remove user from role for all p
 
 .SH DESCRIPTION
 .PP
-Remove user from role for all projects in the cluster
+Remove a role from users for all projects in the cluster
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

diff --git a/docs/man/man1/oadm-policy-remove-role-from-group.1 b/docs/man/man1/oadm-policy-remove-role-from-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oadm policy remove\-role\-from\-group \- Remove group from role in the current project
+oadm policy remove\-role\-from\-group \- Remove a role from groups for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oadm policy remove\-role\-from\-group \- Remove group from role in the current p
 
 .SH DESCRIPTION
 .PP
-Remove group from role in the current project
+Remove a role from groups for the current project
 
 
 .SH OPTIONS

diff --git a/docs/man/man1/oadm-policy-remove-role-from-user.1 b/docs/man/man1/oadm-policy-remove-role-from-user.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oadm policy remove\-role\-from\-user \- Remove user from role in the current project
+oadm policy remove\-role\-from\-user \- Remove a role from users for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oadm policy remove\-role\-from\-user \- Remove user from role in the current pro
 
 .SH DESCRIPTION
 .PP
-Remove user from role in the current project
+Remove a role from users for the current project
 
 
 .SH OPTIONS

diff --git a/docs/man/man1/oc-adm-policy-add-cluster-role-to-group.1 b/docs/man/man1/oc-adm-policy-add-cluster-role-to-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc adm policy add\-cluster\-role\-to\-group \- Add groups to a role for all projects in the cluster
+oc adm policy add\-cluster\-role\-to\-group \- Add a role to groups for all projects in the cluster
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc adm policy add\-cluster\-role\-to\-group \- Add groups to a role for all proj
 
 .SH DESCRIPTION
 .PP
-Add groups to a role for all projects in the cluster
+Add a role to groups for all projects in the cluster
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

diff --git a/docs/man/man1/oc-adm-policy-add-cluster-role-to-user.1 b/docs/man/man1/oc-adm-policy-add-cluster-role-to-user.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc adm policy add\-cluster\-role\-to\-user \- Add users to a role for all projects in the cluster
+oc adm policy add\-cluster\-role\-to\-user \- Add a role to users for all projects in the cluster
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc adm policy add\-cluster\-role\-to\-user \- Add users to a role for all projec
 
 .SH DESCRIPTION
 .PP
-Add users to a role for all projects in the cluster
+Add a role to users for all projects in the cluster
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

diff --git a/docs/man/man1/oc-adm-policy-add-role-to-group.1 b/docs/man/man1/oc-adm-policy-add-role-to-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc adm policy add\-role\-to\-group \- Add groups to a role in the current project
+oc adm policy add\-role\-to\-group \- Add a role to groups for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc adm policy add\-role\-to\-group \- Add groups to a role in the current projec
 
 .SH DESCRIPTION
 .PP
-Add groups to a role in the current project
+Add a role to groups for the current project
 
 
 .SH OPTIONS

diff --git a/docs/man/man1/oc-adm-policy-add-role-to-user.1 b/docs/man/man1/oc-adm-policy-add-role-to-user.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc adm policy add\-role\-to\-user \- Add users or serviceaccounts to a role in the current project
+oc adm policy add\-role\-to\-user \- Add a role to users or serviceaccounts for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc adm policy add\-role\-to\-user \- Add users or serviceaccounts to a role in t
 
 .SH DESCRIPTION
 .PP
-Add users or serviceaccounts to a role in the current project
+Add a role to users or serviceaccounts for the current project
 
 
 .SH OPTIONS
@@ -97,10 +97,10 @@ Add users or serviceaccounts to a role in the current project
 .RS
 
 .nf
-  # Add the 'view' role to user1 in the current project
+  # Add the 'view' role to user1 for the current project
   oc adm policy add\-role\-to\-user view user1
 
-  # Add the 'edit' role to serviceaccount1 in the current project
+  # Add the 'edit' role to serviceaccount1 for the current project
   oc adm policy add\-role\-to\-user edit \-z serviceaccount1
 
 .fi

diff --git a/docs/man/man1/oc-adm-policy-remove-cluster-role-from-group.1 b/docs/man/man1/oc-adm-policy-remove-cluster-role-from-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc adm policy remove\-cluster\-role\-from\-group \- Remove group from role for all projects in the cluster
+oc adm policy remove\-cluster\-role\-from\-group \- Remove a role from groups for all projects in the cluster
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc adm policy remove\-cluster\-role\-from\-group \- Remove group from role for a
 
 .SH DESCRIPTION
 .PP
-Remove group from role for all projects in the cluster
+Remove a role from groups for all projects in the cluster
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

diff --git a/docs/man/man1/oc-adm-policy-remove-cluster-role-from-user.1 b/docs/man/man1/oc-adm-policy-remove-cluster-role-from-user.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc adm policy remove\-cluster\-role\-from\-user \- Remove user from role for all projects in the cluster
+oc adm policy remove\-cluster\-role\-from\-user \- Remove a role from users for all projects in the cluster
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc adm policy remove\-cluster\-role\-from\-user \- Remove user from role for all
 
 .SH DESCRIPTION
 .PP
-Remove user from role for all projects in the cluster
+Remove a role from users for all projects in the cluster
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

diff --git a/docs/man/man1/oc-adm-policy-remove-role-from-group.1 b/docs/man/man1/oc-adm-policy-remove-role-from-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc adm policy remove\-role\-from\-group \- Remove group from role in the current project
+oc adm policy remove\-role\-from\-group \- Remove a role from groups for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc adm policy remove\-role\-from\-group \- Remove group from role in the current
 
 .SH DESCRIPTION
 .PP
-Remove group from role in the current project
+Remove a role from groups for the current project
 
 
 .SH OPTIONS

diff --git a/docs/man/man1/oc-adm-policy-remove-role-from-user.1 b/docs/man/man1/oc-adm-policy-remove-role-from-user.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc adm policy remove\-role\-from\-user \- Remove user from role in the current project
+oc adm policy remove\-role\-from\-user \- Remove a role from users for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc adm policy remove\-role\-from\-user \- Remove user from role in the current p
 
 .SH DESCRIPTION
 .PP
-Remove user from role in the current project
+Remove a role from users for the current project
 
 
 .SH OPTIONS

diff --git a/docs/man/man1/oc-policy-add-role-to-group.1 b/docs/man/man1/oc-policy-add-role-to-group.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 .PP
-oc policy add\-role\-to\-group \- Add groups to a role in the current project
+oc policy add\-role\-to\-group \- Add a role to groups for the current project
 
 
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ oc policy add\-role\-to\-group \- Add groups to a role in the current project
 
 .SH DESCRIPTION
 .PP
-Add groups to a role in the current project
+Add a role to groups for the current project
 
 
 .SH OPTIONS