syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [2/3] syncope git commit: [SYNCOPE-700] Reviwing CLI
Date Thu, 25 Aug 2016 10:20:42 GMT
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java
index 50ccd74..2c479a4 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java
@@ -39,7 +39,7 @@ public class UserResultManager extends CommonsResultManager {
     }
 
     private void printUser(final UserTO userTO) {
-        System.out.println(" > USER ID: " + userTO.getKey());
+        System.out.println(" > USER KEY: " + userTO.getKey());
         System.out.println("    username: " + userTO.getUsername());
         System.out.println("    realm: " + userTO.getRealm());
         System.out.println("    status: " + userTO.getStatus());
@@ -64,8 +64,8 @@ public class UserResultManager extends CommonsResultManager {
         System.out.println("    failed logins: " + userTO.getFailedLogins());
         System.out.println("RELATIONSHIPS:");
         printRelationships(userTO.getRelationships());
-        System.out.println("    security question id: " + userTO.getSecurityQuestion());
-        System.out.println("    security question answer id: " + userTO.getSecurityAnswer());
+        System.out.println("    security question key: " + userTO.getSecurityQuestion());
+        System.out.println("    security question answer key: " + userTO.getSecurityAnswer());
         System.out.println("");
     }
 
@@ -103,7 +103,7 @@ public class UserResultManager extends CommonsResultManager {
 
     public void printFailedUsers(final Map<String, String> users) {
         final Table.TableBuilder tableBuilder =
-                new Table.TableBuilder("Users not deleted").header("user id").header("cause");
+                new Table.TableBuilder("Users not deleted").header("user key").header("cause");
         for (final Map.Entry<String, String> entrySet : users.entrySet()) {
             tableBuilder.rowValues(new LinkedList<>(Arrays.asList(entrySet.getKey(),
entrySet.getValue())));
         }

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
index abf3811..83af7ed 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
@@ -30,7 +30,7 @@ public class UserSearchByResource extends AbstractUserCommand {
 
     private static final Logger LOG = LoggerFactory.getLogger(UserSearchByResource.class);
 
-    private static final String SEARCH_HELP_MESSAGE = "user --search-by-resource {REALM}
{RESOURCE-NAME}";
+    private static final String SEARCH_HELP_MESSAGE = "user --search-by-resource {REALM}
{RESOURCE-KEY}";
 
     private final Input input;
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
index 6674966..10c760e 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
@@ -30,7 +30,7 @@ public class UserSearchByRole extends AbstractUserCommand {
 
     private static final Logger LOG = LoggerFactory.getLogger(UserSearchByRole.class);
 
-    private static final String SEARCH_HELP_MESSAGE = "user --search-by-role {REALM} {ROLE-NAME}";
+    private static final String SEARCH_HELP_MESSAGE = "user --search-by-role {REALM} {ROLE-KEY}";
 
     private final Input input;
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/messages.properties b/client/cli/src/main/resources/messages.properties
index 05ef8ad..0e47a36 100644
--- a/client/cli/src/main/resources/messages.properties
+++ b/client/cli/src/main/resources/messages.properties
@@ -14,22 +14,22 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-anyObject.help.message=\nUsage: any [options]\n   Options:\n     --help \n     --details
\n     --list \n     --read \n        Syntax: --read {ANY-ID} {ANY-ID} [...]\n     --read-attr-by-schema-type
{ANY-ID} {SCHEMA-TYPE}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n     --read-attr-by-schema
{ANY-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n   
 --delete \n        Syntax: --delete {ANY-ID} {ANY-ID} [...]\n
+anyObject.help.message=\nUsage: any [options]\n   Options:\n     --help \n     --details
\n     --list \n     --read \n        Syntax: --read {ANY_OBJECT-KEY} {ANY_OBJECT-KEY} [...]\n
    --read-attr-by-schema-type {ANY_OBJECT-KEY} {SCHEMA-TYPE}\n        Schema type: PLAIN
/ DERIVED / VIRTUAL\n     --read-attr-by-schema {ANY_OBJECT-KEY} {SCHEMA-TYPE} {SCHEMA-KEY}\n
       Schema type: PLAIN / DERIVED / VIRTUAL\n     --delete \n        Syntax: --delete {ANY_OBJECT-KEY}
{ANY_OBJECT-KEY} [...]\n
 configuration.help.message=\nUsage: configuration [options]\n  Options:\n    --help \n  
 --get \n    --read \n       Syntax: --read {CONF-NAME} {CONF-NAME} [...] \n    --update \n
      Syntax: --update {CONF-NAME}={CONF-VALUE} {CONF-NAME}={CONF-VALUE} [...]\n    --delete
\n       Syntax: --delete {CONF-NAME} {CONF-NAME} [...]\n    --export \n       Syntax: --export
{WHERE-DIR}\n
-connector.help.message=\nUsage: connector [options]\n  Options:\n    --help \n    --details
\n    --list \n    --list-bundles \n    --list-configuration-properties\n       Syntax: --list-configuration-properties
{CONNECTOR-ID} {CONNECTOR-ID} [...]\n    --read \n       Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID}
[...]\n    --delete \n       Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]\n
+connector.help.message=\nUsage: connector [options]\n  Options:\n    --help \n    --details
\n    --list \n    --list-bundles \n    --list-configuration-properties\n       Syntax: --list-configuration-properties
{CONNECTOR-KEY} {CONNECTOR-KEY} [...]\n    --read \n       Syntax: --read {CONNECTOR-KEY}
{CONNECTOR-KEY} [...]\n    --delete \n       Syntax: --delete {CONNECTOR-KEY} {CONNECTOR-KEY}
[...]\n
 domain.help.message=\nUsage: domain [options]\n  Options:\n    --help \n    --details \n
   --list \n    --delete \n       Syntax: --delete {DOMAIN-NAME} {DOMAIN-NAME} [...]\n
-entitlement.help.message=\nUsage: entitlement [options]\n  Options:\n    --help \n    --list\n
   --list-role\n       Syntax: --list-role {ENTITLEMENT-NAME}\n    --read-by-username\n  
    Syntax: --read-by-username {USERNAME}\n    --read-by-userid\n       Syntax: --read-by-userid
{USER-ID}\n    --search-by-role\n       Syntax: --search-by-role {ROLE-ID}\n
-group.help.message=\nUsage: group [options]\n  Options:\n    --help \n    --details \n  
 --list \n    --read \n       Syntax: --read {GROUP-ID} {GROUP-ID} [...]\n    --read-attr-by-schema-type
{GROUP-ID} {SCHEMA-TYPE}\n       Schema type: PLAIN / DERIVED / VIRTUAL\n    --read-attr-by-schema
{GROUP-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n       Schema type: PLAIN / DERIVED / VIRTUAL\n  
 --delete \n       Syntax: --delete {GROUP-ID} {GROUP-ID} [...]\n
+entitlement.help.message=\nUsage: entitlement [options]\n  Options:\n    --help \n    --list\n
   --list-role\n       Syntax: --list-role {ENTITLEMENT-NAME}\n    --read-by-username\n  
    Syntax: --read-by-username {USERNAME}\n    --read-by-userkey\n       Syntax: --read-by-userkey
{USER-KEY}\n    --search-by-role\n       Syntax: --search-by-role {ROLE-KEY}\n
+group.help.message=\nUsage: group [options]\n  Options:\n    --help \n    --details \n  
 --list \n    --read \n       Syntax: --read {GROUP-KEY} {GROUP-KEY} [...]\n    --read-attr-by-schema-type
{GROUP-KEY} {SCHEMA-TYPE}\n       Schema type: PLAIN / DERIVED / VIRTUAL\n    --read-attr-by-schema
{GROUP-KEY} {SCHEMA-TYPE} {SCHEMA-KEY}\n       Schema type: PLAIN / DERIVED / VIRTUAL\n  
 --delete \n       Syntax: --delete {GROUP-KEY} {GROUP-KEY} [...]\n
 logger.help.message=\nUsage: logger [options]\n  Options:\n    --help \n    --details \n
   --list \n    --read \n       Syntax: --read {LOG-NAME} {LOG-NAME} [...]\n    --update \n
      Syntax: --update {LOG-NAME}={LOG-LEVEL} {LOG-NAME}={LOG-LEVEL} [...]\n    --update-all
\n       Syntax: --update-all {LOG-LEVEL} \n    --create \n       Syntax: --create {LOG-NAME}={LOG-LEVEL}
{LOG-NAME}={LOG-LEVEL} [...]\n    --delete \n       Syntax: --delete {LOG-NAME} {LOG-NAME}
[...]\n
-notification.help.message=\nUsage: notification [options]\n  Options:\n    --help \n    --list
\n    --read \n       Syntax: --read {NOTIFICATION-ID} \n    --delete \n       Syntax: --delete
{NOTIFICATION-ID}\n
-policy.help.message=\nUsage: policy [options]\n  Options:\n    --help \n    --details \n
   --list \n       Syntax: --list-policy {POLICY-TYPE} \n          Policy type: ACCOUNT /
PASSWORD / PULL / PUSH\n    --read \n       Syntax: --read {POLICY-ID} {POLICY-ID} [...]\n
   --delete \n       Syntax: --delete {POLICY-ID} {POLICY-ID} [...]\n
-question.help.message=\nUsage: question [options]\n  Options:\n    --help \n    --list \n
   --read \n       Syntax: --read {QUESTION-ID} {QUESTION-ID} [...]\n    --delete \n     
 Syntax: --delete {QUESTION-ID} {QUESTION-ID} [...]\n
+notification.help.message=\nUsage: notification [options]\n  Options:\n    --help \n    --list
\n    --read \n       Syntax: --read {NOTIFICATION-KEY} \n    --delete \n       Syntax: --delete
{NOTIFICATION-KEY}\n
+policy.help.message=\nUsage: policy [options]\n  Options:\n    --help \n    --details \n
   --list \n       Syntax: --list-policy {POLICY-TYPE} \n          Policy type: ACCOUNT /
PASSWORD / PULL / PUSH\n    --read \n       Syntax: --read {POLICY-KEY} {POLICY-KEY} [...]\n
   --delete \n       Syntax: --delete {POLICY-KEY} {POLICY-KEY} [...]\n
+question.help.message=\nUsage: question [options]\n  Options:\n    --help \n    --list \n
   --read \n       Syntax: --read {QUESTION-KEY} {QUESTION-KEY} [...]\n    --delete \n   
   Syntax: --delete {QUESTION-KEY} {QUESTION-KEY} [...]\n
 realm.help.message=\nUsage: realm [options]\n  Options:\n    --help \n    --details \n  
 --list \n
-report.help.message=\nUsage: report [options]\n  Options:\n    --help \n    --details\n 
  --list \n    --list-jobs \n    --read \n       Syntax: --read {REPORT-ID} {REPORT-ID} [...]
\n    --delete \n       Syntax: --delete {REPORT-ID} {REPORT-ID} [...]\n    --execute \n 
     Syntax: --execute {REPORT-ID} \n    --delete-execution \n       Syntax: --delete-execution
{EXECUTION-ID} {EXECUTION-ID} [...]\n    --export-execution-result \n       Syntax: --export-execution-result
{EXECUTION-ID} {EXECUTION-ID} [...] {FORMAT}\n          Format: CSV / HTML / PDF / XML / RTF\n
-resource.help.message=\nUsage: resource [options]\n  Options:\n    --help \n    --details
\n    --list \n    --read \n       Syntax: --read {RESOURCE-NAME} {RESOURCE-NAME} [...]\n
   --delete \n       Syntax: --delete {RESOURCE-NAME} {RESOURCE-NAME} [...]\n
-role.help.message=\nUsage: role [options]\n  Options:\n    --help \n    --details \n    --list
\n    --read \n       Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n    --delete \n       Syntax:
--delete {ROLE-ID} {ROLE-ID} [...]\n
+report.help.message=\nUsage: report [options]\n  Options:\n    --help \n    --details\n 
  --list \n    --list-jobs \n    --read \n       Syntax: --read {REPORT-KEY} {REPORT-KEY}
[...] \n    --delete \n       Syntax: --delete {REPORT-KEY} {REPORT-KEY} [...]\n    --execute
\n       Syntax: --execute {REPORT-KEY} \n    --delete-execution \n       Syntax: --delete-execution
{EXECUTION-KEY} {EXECUTION-KEY} [...]\n    --export-execution-result \n       Syntax: --export-execution-result
{EXECUTION-KEY} {EXECUTION-KEY} [...] {FORMAT}\n          Format: CSV / HTML / PDF / XML /
RTF\n
+resource.help.message=\nUsage: resource [options]\n  Options:\n    --help \n    --details
\n    --list \n    --read \n       Syntax: --read {RESOURCE-KEY} {RESOURCE-KEY} [...]\n  
 --delete \n       Syntax: --delete {RESOURCE-KEY} {RESOURCE-KEY} [...]\n
+role.help.message=\nUsage: role [options]\n  Options:\n    --help \n    --details \n    --list
\n    --read \n       Syntax: --read {ROLE-KEY} {ROLE-KEY} [...]\n    --delete \n       Syntax:
--delete {ROLE-KEY} {ROLE-KEY} [...]\n
 schema.help.message=\nUsage: schema [options]\n  Options:\n    --help \n    --details \n
   --list-all\n    --list-plain\n    --list-derived\n    --list-virtual\n    --read {SCHEMA-TYPE}
{SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n    --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n
       Schema type: PLAIN / DERIVED / VIRTUAL\n
-task.help.message=\nUsage: task [options]\n  Options:\n    --help \n    --details\n    --list\n
      Syntax: --list {TASK-TYPE} \n          Task type: NOTIFICATION / PROPAGATION / PUSH
/ SCHEDULED / PULL\n    --list-running-jobs \n    --list-scheduled-jobs \n    --read \n  
    Syntax: --read {TASK-ID} {TASK-ID} [...]\n    --delete \n       Syntax: --delete {TASK-ID}
{TASK-ID} [...]\n    --delete-all-prop\n    --delete-execution \n       Syntax: --delete-execution
{TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --execute \n       Syntax: --execute {TASK-ID} {DRY-RUN}\n
         Dry run: true / false\n
-user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list
\n    --get-user-key\n       Syntax: --get-user-key {USERNAME}\n    --get-username\n     
 Syntax: --get-username {USER-ID}\n    --read-by-userid \n       Syntax: --read-by-userid
{USER-ID} {USER-ID} [...]\n    --read-by-username\n       Syntax: --read-by-username {USERNAME}
{USERNAME} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM}
{ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-NAME}\n
   --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n  
 --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax:
--delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM}
{ATTR-NAME}={ATTR-VALUE}\n
+task.help.message=\nUsage: task [options]\n  Options:\n    --help \n    --details\n    --list\n
      Syntax: --list {TASK-TYPE} \n          Task type: NOTIFICATION / PROPAGATION / PUSH
/ SCHEDULED / PULL\n    --list-running-jobs \n    --list-scheduled-jobs \n    --read \n  
    Syntax: --read {TASK-KEY} {TASK-KEY} [...]\n    --delete \n       Syntax: --delete {TASK-KEY}
{TASK-KEY} [...]\n    --delete-all-prop\n    --delete-execution \n       Syntax: --delete-execution
{TASK-EXEC-KEY} {TASK-EXEC-KEY} [...]\n    --execute \n       Syntax: --execute {TASK-KEY}
{DRY-RUN}\n          Dry run: true / false\n
+user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list
\n    --get-user-key\n       Syntax: --get-user-key {USERNAME}\n    --get-username\n     
 Syntax: --get-username {USER-KEY}\n    --read-by-userkey \n       Syntax: --read-by-userkey
{USER-KEY} {USER-KEY} [...]\n    --read-by-username\n       Syntax: --read-by-username {USERNAME}
{USERNAME} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM}
{ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-KEY}\n
   --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-KEY}\n   
--delete \n       Syntax: --delete {USER-KEY} {USER-KEY} [...]\n    --delete-all \n      
Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute
{REALM} {ATTR-NAME}={ATTR-VALUE}\n
 workflow.help.message=\nUsage: workflow [options]\n  Options:\n    --help \n    --export-diagram
{ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n    --export-definition
{ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n
 migrate.help.message=\nUsage: migrate [options]\n  Options:\n    --help \n    --conf {SRC}
{DST}\n        Syncope 1.2.X content.xml SRC absolute path\n        Syncope 2.0.X *Content.xml
DST absolute path\n

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
index 2940611..65d9412 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/notification/NotificationManager.java
@@ -40,7 +40,7 @@ public interface NotificationManager {
     long countExecutionsWithStatus(final String taskKey, final String status);
 
     /**
-     * Create notification tasks for each notification matching the given user id and (some
of) tasks performed.
+     * Create notification tasks for each notification matching provided conditions.
      *
      * @param type event category type
      * @param category event category

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java
index ae598d0..162e798 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java
@@ -178,7 +178,7 @@ public class CLIITCase extends AbstractITCase {
         try {
             PROCESS_BUILDER.command(getCommand(
                     new UserCommand().getClass().getAnnotation(Command.class).name(),
-                    UserCommand.UserOptions.READ_BY_ID.getOptionName(),
+                    UserCommand.UserOptions.READ_BY_KEY.getOptionName(),
                     String.valueOf(userKey1)));
             Process process = PROCESS_BUILDER.start();
             String result = IOUtils.toString(process.getInputStream(), SyncopeConstants.DEFAULT_CHARSET);
@@ -187,7 +187,7 @@ public class CLIITCase extends AbstractITCase {
 
             PROCESS_BUILDER.command(getCommand(
                     new UserCommand().getClass().getAnnotation(Command.class).name(),
-                    UserCommand.UserOptions.READ_BY_ID.getOptionName(),
+                    UserCommand.UserOptions.READ_BY_KEY.getOptionName(),
                     String.valueOf(userKey1), String.valueOf(userKey2),
                     String.valueOf(userKey3), String.valueOf(userKey4), String.valueOf(userKey5)));
             Process process2 = PROCESS_BUILDER.start();
@@ -206,7 +206,7 @@ public class CLIITCase extends AbstractITCase {
 
             PROCESS_BUILDER.command(getCommand(
                     new UserCommand().getClass().getAnnotation(Command.class).name(),
-                    UserCommand.UserOptions.READ_BY_ID.getOptionName(),
+                    UserCommand.UserOptions.READ_BY_KEY.getOptionName(),
                     String.valueOf(userKey1), String.valueOf(userKey2),
                     String.valueOf(userKey3), String.valueOf(userKey4), String.valueOf(userKey5)));
             Process process3 = PROCESS_BUILDER.start();

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/anyObject.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/anyObject.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/anyObject.adoc
new file mode 100644
index 0000000..a4554c7
--- /dev/null
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/anyObject.adoc
@@ -0,0 +1,55 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+===== Any command
+This command works with <<users-groups-and-any-objects,any objects>>.
+
+[discrete]
+====== Help message
+[source,bash]
+----
+Usage: any [options]
+  Options:
+    --help 
+    --details 
+    --list 
+    --read 
+       Syntax: --read {ANY_OBJECT-KEY} {ANY_OBJECT-KEY} [...]
+    --read-attr-by-schema-type {ANY_OBJECT-KEY} {SCHEMA-TYPE}
+       Schema type: PLAIN / DERIVED / VIRTUAL
+    --read-attr-by-schema {ANY_OBJECT-KEY} {SCHEMA-TYPE} {SCHEMA-NAME}
+       Schema type: PLAIN / DERIVED / VIRTUAL
+    --delete 
+       Syntax: --delete {ANY_OBJECT-KEY} {ANY_OBJECT-KEY} [...]
+----
+
+[discrete]
+====== Options
+
+--details::
+This option shows a table with the amount of available Any Objects and some additional information.
+--list::
+Running the command with this option you will see the list of the Any Objects.
+--read::
+The option to read the any object passed as input.
+--read-attr-by-schema-type::
+The option to read the specified attribute type of the any object passed as input.
+--read-attr-by-schema::
+The option to read the specified attribute name of the any object passed as input.
+--delete::
+The option to delete a specified any object.

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/cli.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/cli.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/cli.adoc
index 98f55e3..157323f 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/cli.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/cli.adoc
@@ -33,6 +33,8 @@ include::user.adoc[]
 
 include::group.adoc[]
 
+include::anyObject.adoc[]
+
 include::role.adoc[]
 
 include::realm.adoc[]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/configuration.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/configuration.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/configuration.adoc
index 3e86789..0d47e35 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/configuration.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/configuration.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Configuration command
-The configuration command retrieves information about the Syncope configuration.
+This command works with <<configuration-parameters,configuration parameters>>.
 
 [discrete]
 ====== Help message

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/connector.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/connector.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/connector.adoc
index 758ac96..fd81414 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/connector.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/connector.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Connector command
-The connector command serves to retrieve information about the connector configuration in
Apache Syncope.
+This command works with <<connector-instance-details,connectors>>.
 
 [discrete]
 ====== Help message
@@ -31,11 +30,11 @@ Usage: connector [options]
     --list 
     --list-bundles 
     --list-configuration-properties
-       Syntax: --list-configuration-properties {CONNECTOR-ID} {CONNECTOR-ID} [...]
+       Syntax: --list-configuration-properties {CONNECTOR-KEY} {CONNECTOR-KEY} [...]
     --read 
-       Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID} [...]
+       Syntax: --read {CONNECTOR-KEY} {CONNECTOR-KEY} [...]
     --delete 
-       Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]
+       Syntax: --delete {CONNECTOR-KEY} {CONNECTOR-KEY} [...]
 ----
 
 [discrete]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/domain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/domain.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/domain.adoc
index b4ab63a..120d88d 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/domain.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/domain.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Domain command
-The domain command retrieves information about the configured domains.
+This command works with <<domains,domains>>.
 
 [discrete]
 ====== Help message
@@ -30,7 +29,7 @@ Usage: domain [options]
     --details 
     --list 
     --delete 
-       Syntax: --delete {DOMAIN-NAME} {DOMAIN-NAME} [...]
+       Syntax: --delete {DOMAIN-KEY} {DOMAIN-KEY} [...]
 ----
 
 [discrete]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/entitlement.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/entitlement.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/entitlement.adoc
index c5b56cd..8c54a67 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/entitlement.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/entitlement.adoc
@@ -18,7 +18,7 @@
 //
 
 ===== Entitlement command
-The entitlement command retrieves information about the entitlments.
+This command works with <<entitlements,entitlements>>.
 
 [discrete]
 ====== Help message
@@ -32,10 +32,10 @@ Usage: entitlement [options]
        Syntax: --list-role {ENTITLEMENT-NAME}
     --read-by-username
        Syntax: --read-by-username {USERNAME}
-    --read-by-userid
-       Syntax: --read-by-userid {USER-ID}
+    --read-by-userkey
+       Syntax: --read-by-userkey {USER-KEY}
     --search-by-role
-       Syntax: --search-by-role {ROLE-ID}
+       Syntax: --search-by-role {ROLE-KEY}
 ----
 
 [discrete]
@@ -47,7 +47,7 @@ Running the command with this option you will see the list of the entitlements.
 Running the command with this option you will see the list of the roles with a certain entitlement.
 --read-by-username::
 The option to read the entitlements of the username passed as input.
---read-by-userid::
-The option to read the entitlements of the userid passed as input.
+--read-by-userkey::
+The option to read the entitlements of the user key passed as input.
 --search-by-role::
 The option to read the entitlements of a certain role.

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/group.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/group.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/group.adoc
index 802a430..38351f1 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/group.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/group.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Group command
-The group command retrieves information about the configured Groups.
+This command works with <<users-groups-and-any-objects,groups>>.
 
 [discrete]
 ====== Help message
@@ -30,13 +29,13 @@ Usage: group [options]
     --details 
     --list 
     --read 
-       Syntax: --read {GROUP-ID} {GROUP-ID} [...]
-    --read-attr-by-schema-type {GROUP-ID} {SCHEMA-TYPE}
+       Syntax: --read {GROUP-KEY} {GROUP-KEY} [...]
+    --read-attr-by-schema-type {GROUP-KEY} {SCHEMA-TYPE}
        Schema type: PLAIN / DERIVED / VIRTUAL
-    --read-attr-by-schema {GROUP-ID} {SCHEMA-TYPE} {SCHEMA-NAME}
+    --read-attr-by-schema {GROUP-KEY} {SCHEMA-TYPE} {SCHEMA-NAME}
        Schema type: PLAIN / DERIVED / VIRTUAL
     --delete 
-       Syntax: --delete {GROUP-ID} {GROUP-ID} [...]
+       Syntax: --delete {GROUP-KEY} {GROUP-KEY} [...]
 ----
 
 [discrete]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/info.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/info.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/info.adoc
index 2dd992b..01e883d 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/info.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/info.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Info command
-The info command shows some information about the Syncope installation.
+This command reports general information about the current Apache Syncope deployment.
 
 [discrete]
 ====== Help message

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/logger.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/logger.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/logger.adoc
index 76dc6fd..6ebc5a3 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/logger.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/logger.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Logger command
-The logger command retrieves information about the logger configuration in Apache Syncope.
+This command is meant for tweaking runtime logger configuration.
 
 [discrete]
 ====== Help message
@@ -56,6 +55,6 @@ The option to change the value of the logger passed as input.
 This option is especially helpful in production environment when every log is disabled and
you need to change them for a 
 while in DEBUG mode.
 --create::
-For the moment the logger command is one of the few command with a create option to add a
new logger configuration.
+The option to add a new logger configuration.
 --delete::
 The option to delete a specified logger.

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/notification.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/notification.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/notification.adoc
index 43655f1..a79073a 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/notification.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/notification.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Notification command
-The notification command retrieves information about the configured notifications.
+This command works with <<notifications,notifications>>.
 
 [discrete]
 ====== Help message
@@ -29,9 +28,9 @@ Usage: notification [options]
     --help 
     --list 
     --read 
-       Syntax: --read {NOTIFICATION-ID} 
+       Syntax: --read {NOTIFICATION-KEY} 
     --delete 
-       Syntax: --delete {NOTIFICATION-ID}
+       Syntax: --delete {NOTIFICATION-KEY}
 ----
 
 [discrete]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/policy.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/policy.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/policy.adoc
index d6f283f..807957c 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/policy.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/policy.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Policy command
-The policy command retrieves information about the policies for each type.
+This command works with <<policies,policies>>.
 
 [discrete]
 ====== Help message
@@ -30,11 +29,11 @@ Usage: policy [options]
     --details 
     --list 
        Syntax: --list-policy {POLICY-TYPE} 
-          Policy type: ACCOUNT / PASSWORD / SYNC / PUSH
+          Policy type: ACCOUNT / PASSWORD / PULL / PUSH
     --read 
-       Syntax: --read {POLICY-ID} {POLICY-ID} [...]
+       Syntax: --read {POLICY-KEY} {POLICY-KEY} [...]
     --delete 
-       Syntax: --delete {POLICY-ID} {POLICY-ID} [...]
+       Syntax: --delete {POLICY-KEY} {POLICY-KEY} [...]
 ----
 
 [discrete]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/question.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/question.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/question.adoc
index 1451aed..624f33d 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/question.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/question.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Question command
-The question command gets information about the user question to retrieve their password.
+This command works with security questions for usage with <<password-reset,password
reset>>.
 
 [discrete]
 ====== Help message
@@ -29,9 +28,9 @@ Usage: question [options]
     --help 
     --list 
     --read 
-       Syntax: --read {QUESTION-ID} {QUESTION-ID} [...]
+       Syntax: --read {QUESTION-KEY} {QUESTION-KEY} [...]
     --delete 
-       Syntax: --delete {QUESTION-ID} {QUESTION-ID} [...]
+       Syntax: --delete {QUESTION-KEY} {QUESTION-KEY} [...]
 ----
 
 [discrete]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/realm.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/realm.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/realm.adoc
index e04e5d5..e6bff74 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/realm.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/realm.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Realm command
-The realm command retrieves information about the configured realm.
+This command works with <<realms,realms>>.
 
 [discrete]
 ====== Help message

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/report.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/report.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/report.adoc
index 7ec96e8..4f21cca 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/report.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/report.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Report command
-The report command retrieves information about the configured reports.
+This command works with <<reports,reports>>.
 
 [discrete]
 ====== Help message
@@ -31,17 +30,17 @@ Usage: report [options]
     --list 
     --list-jobs 
     --read 
-       Syntax: --read {REPORT-ID} {REPORT-ID} [...] 
+       Syntax: --read {REPORT-KEY} {REPORT-KEY} [...] 
     --delete 
-       Syntax: --delete {REPORT-ID} {REPORT-ID} [...]
+       Syntax: --delete {REPORT-KEY} {REPORT-KEY} [...]
     --execute 
-       Syntax: --execute {REPORT-ID} 
+       Syntax: --execute {REPORT-KEY} 
     --read-execution 
-       Syntax: --read-execution {EXECUTION-ID} {EXECUTION-ID} [...]
+       Syntax: --read-execution {EXECUTION-KEY} {EXECUTION-KEY} [...]
     --delete-execution 
-       Syntax: --delete-execution {EXECUTION-ID} {EXECUTION-ID} [...]
+       Syntax: --delete-execution {EXECUTION-KEY} {EXECUTION-KEY} [...]
     --export-execution-result 
-       Syntax: --export-execution-result {EXECUTION-ID} {EXECUTION-ID} [...] {FORMAT}
+       Syntax: --export-execution-result {EXECUTION-KEY} {EXECUTION-KEY} [...] {FORMAT}
           Format: CSV / HTML / PDF / XML / RTF
 ----
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/resource.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/resource.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/resource.adoc
index c17c904..c8433b0 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/resource.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/resource.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Resource command
-The resource command retrieves information about the resources.
+This command works with <<external-resource-details,external resources>>.
 
 [discrete]
 ====== Help message
@@ -30,9 +29,9 @@ Usage: resource [options]
     --details 
     --list 
     --read 
-       Syntax: --read {RESOURCE-NAME} {RESOURCE-NAME} [...]
+       Syntax: --read {RESOURCE-KEY} {RESOURCE-KEY} [...]
     --delete 
-       Syntax: --delete {RESOURCE-NAME} {RESOURCE-NAME} [...]
+       Syntax: --delete {RESOURCE-KEY} {RESOURCE-KEY} [...]
 ----
 
 [discrete]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/role.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/role.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/role.adoc
index 6f042e6..7214711 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/role.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/role.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Role command
-The role command retrieves information about the roles.
+This command works with <<roles,roles>>.
 
 [discrete]
 ====== Help message
@@ -30,9 +29,9 @@ Usage: role [options]
     --details 
     --list 
     --read 
-       Syntax: --read {ROLE-NAME} {ROLE-NAME} [...]
+       Syntax: --read {ROLE-KEY} {ROLE-KEY} [...]
     --delete 
-       Syntax: --delete {ROLE-NAME} {ROLE-NAME} [...]
+       Syntax: --delete {ROLE-KEY} {ROLE-KEY} [...]
 ----
 
 [discrete]

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/schema.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/schema.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/schema.adoc
index 66c682b..3a32c41 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/schema.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/schema.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Schema command
-The schema command serves retrieves information about the schema categories.
+This command works with <<schema,schemas>>.
 
 [discrete]
 ====== Help message

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/task.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/task.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/task.adoc
index 3dde2ba..d4ddc94 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/task.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/task.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== Task command
-The Task command retrieves information about the Task configuration in Apache Syncope.
+This command works with <<tasks,tasks>>.
 
 [discrete]
 ====== Help message
@@ -34,15 +33,15 @@ Usage: task [options]
     --list-running-jobs
     --list-scheduled-jobs
     --read 
-       Syntax: --read {TASK-ID} {TASK-ID} [...]
+       Syntax: --read {TASK-KEY} {TASK-KEY} [...]
     --read-execution 
-       Syntax: --read-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]
+       Syntax: --read-execution {TASK-EXEC-KEY} {TASK-EXEC-KEY} [...]
     --delete 
-       Syntax: --delete {TASK-ID} {TASK-ID} [...]
+       Syntax: --delete {TASK-KEY} {TASK-KEY} [...]
     --delete-execution 
-       Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]
+       Syntax: --delete-execution {TASK-EXEC-KEY} {TASK-EXEC-KEY} [...]
     --execute 
-       Syntax: --execute {TASK-ID} {DRY-RUN}
+       Syntax: --execute {TASK-KEY} {DRY-RUN}
           Dry run: true / false
 ----
 
@@ -60,10 +59,10 @@ Running the command with this option you will see the list of the actual
runnig
 --read::
 The option to read all the information of a task.
 --read-execution::
-The option to read all the information of executions task.
+The option to read all the information of the specified task execution(s).
 --delete::
 The option to delete specified tasks.
 --delete-execution::
-The option to delete specified execution tasks.
+The option to delete the specified task execution(s).
 --execute::
-The option to execute specified execution tasks.
\ No newline at end of file
+The option to execute the specified task.

http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/user.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/user.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/user.adoc
index 5e2ce0b..542c5b9 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/user.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/cli/user.adoc
@@ -16,9 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-
 ===== User command
-The user command retrieves information about the Users.
+This command works with <<users-groups-and-any-objects,users>>.
 
 [discrete]
 ====== Help message
@@ -32,19 +31,19 @@ Usage: user [options]
     --get-user-key
        Syntax: --get-user-key {USERNAME} {USERNAME} [...]
     --get-username
-       Syntax: --get-username {USER-ID} {USER-ID} [...]
-    --read-by-usernam
-       Syntax: --read-by-usernam {USERNAME} {USERNAME} [...]
-    --read-by-userid
-       Syntax: --read-by-userid {USER-ID} {USER-ID} [...]
+       Syntax: --get-username {USER-KEY} {USER-KEY} [...]
+    --read-by-username
+       Syntax: --read-by-username {USERNAME} {USERNAME} [...]
+    --read-by-userkey
+       Syntax: --read-by-userkey {USER-KEY} {USER-KEY} [...]
     --search-by-attribute
        Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}
     --search-by-role
-       Syntax: --search-by-role {REALM} {ROLE-ID}
+       Syntax: --search-by-role {REALM} {ROLE-KEY}
     --search-by-resource
-       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}
+       Syntax: --search-by-resource {REALM} {RESOURCE-KEY}
     --delete
-       Syntax: --delete {USER-ID} {USER-ID} [...]
+       Syntax: --delete {USER-KEY} {USER-KEY} [...]
     --delete-all 
        Syntax: --delete-all {REALM}
     --delete-by-attribute
@@ -62,9 +61,9 @@ ask you a confirmation before execution, because as you can imagine this
operati
 --get-user-key::
 The option to get the user key starting from a username.
 --get-username::
-The option to get the username starting from a user id.
---read-by-userid::
-The option to read user information by their user id.
+The option to get the username starting from a user key.
+--read-by-userkey::
+The option to read user information by their user key.
 --read-by-usernam::
 The option to read user information by their username.
 --search-by-attribute::


Mime
View raw message