Repository: hadoop
Updated Branches:
  refs/heads/trunk 16bd79ee8 -> 208430a15


HADOOP-11625. Minor fixes to command manual & SLA doc (aw)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/208430a1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/208430a1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/208430a1

Branch: refs/heads/trunk
Commit: 208430a15d68aa44346150884a13712f2381d593
Parents: 16bd79e
Author: Allen Wittenauer <[email protected]>
Authored: Mon Feb 23 17:23:32 2015 -0800
Committer: Allen Wittenauer <[email protected]>
Committed: Mon Feb 23 17:23:43 2015 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt      |  2 ++
 .../src/site/markdown/CommandsManual.md              | 15 +++++++++------
 .../src/site/markdown/ServiceLevelAuth.md            |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/208430a1/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5ad5d44..f75986e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -407,6 +407,8 @@ Trunk (Unreleased)
 
     HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa)
 
+    HADOOP-11625. Minor fixes to command manual & SLA doc (aw)
+
   OPTIMIZATIONS
 
     HADOOP-7761. Improve the performance of raw comparisons. (todd)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/208430a1/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
----------------------------------------------------------------------
diff --git 
a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md 
b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
index 62235c5..33986ae 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
@@ -140,7 +140,7 @@ indicates that the current user's credentials file should 
be consulted through t
 
 When utilizing the credential command it will often be for provisioning a 
password or secret to a particular credential store provider. In order to 
explicitly indicate which provider store to use the `-provider` option should 
be used. Otherwise, given a path of multiple providers, the first non-transient 
provider will be used. This may or may not be the one that you intended.
 
-Example: `-provider jceks://file/tmp/test.jceks`
+Example: `hadoop credential list -provider jceks://file/tmp/test.jceks`
 
 ### `distch`
 
@@ -178,12 +178,12 @@ Print the computed java.library.path.
 
 ### `kerbname`
 
-    Usage: <<<hadoop kerbname principal>>>
+Usage: `hadoop kerbname principal`
 
-    Convert the named principal via the auth_to_local rules to the Hadoop
-    user name.
+Convert the named principal via the auth_to_local rules to the Hadoop
+user name.
 
-    Example: <<<hadoop kerbname [email protected]>>>
+Example: `hadoop kerbname [email protected]`
 
 ### `key`
 
@@ -212,7 +212,10 @@ Commands useful for administrators of a hadoop cluster.
 
 ### `daemonlog`
 
-Usage: `hadoop daemonlog -getlevel <host:httpport> <classname> ` Usage: 
`hadoop daemonlog -setlevel <host:httpport> <classname> <level> `
+Usage:
+
+    hadoop daemonlog -getlevel <host:httpport> <classname>
+    hadoop daemonlog -setlevel <host:httpport> <classname> <level>
 
 | COMMAND\_OPTION | Description |
 |:---- |:---- |

http://git-wip-us.apache.org/repos/asf/hadoop/blob/208430a1/hadoop-common-project/hadoop-common/src/site/markdown/ServiceLevelAuth.md
----------------------------------------------------------------------
diff --git 
a/hadoop-common-project/hadoop-common/src/site/markdown/ServiceLevelAuth.md 
b/hadoop-common-project/hadoop-common/src/site/markdown/ServiceLevelAuth.md
index 8b4a10f..ae41b47 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/ServiceLevelAuth.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/ServiceLevelAuth.md
@@ -90,7 +90,7 @@ If access control list is not defined for a service, the 
value of `security.serv
 
 * Blocked Access Control ListsIn some cases, it is required to specify blocked 
access control list for a service. This specifies the list of users and groups 
who are not authorized to access the service. The format of the blocked access 
control list is same as that of access control list. The blocked access control 
list can be specified via `$HADOOP_CONF_DIR/hadoop-policy.xml`. The property 
name is derived by suffixing with ".blocked".
 
-    Example: The property name of blocked access control list for 
`security.client.protocol.acl>> will be <<<security.client.protocol.acl.blocked`
+    Example: The property name of blocked access control list for 
`security.client.protocol.acl` will be `security.client.protocol.acl.blocked`
 
     For a service, it is possible to specify both an access control list and a 
blocked control list. A user is authorized to access the service if the user is 
in the access control and not in the blocked access control list.
 

Reply via email to