Merge pull request #156 from adobe-apiplatform/v2

merge 2.0rc2 to master

Author: adobeDan

docs/success-guide/command_line_options.md

@@ -55,7 +55,7 @@ Note that only the users returned by the directory query and filter are consider
 
 `--test-mode`:  causes User Sync to run through all processing including querying the directory and calling the Adobe User Management APIs to process the request, but no actual action is taken.  No users are created, deleted, or altered.
 
-`--update-user-info`: causes User Sync to check for changes in first name, last name, or email address of users and make updates to the Adobe information if it does not match the directory information.  Specifying this option increases run time so you may not want to include it on each run.
+`--update-user-info`: causes User Sync to check for changes in first name, last name, or email address of users and make updates to the Adobe information if it does not match the directory information.  Specifying this option may increase run time.
 
 
 ## Examples

docs/success-guide/images/install_config_files.png

@@ -32,11 +32,11 @@ Select “release”
 
 ![install2](images/install_release_screen.png)
 
-☐ Download the examples.config.tar.gz, User Sync Guide, and build for your platform, osx, ubuntu, windows, or centos.
+☐ Download the example-configurations.tar.gz, User Sync Guide, and build for your platform, osx, ubuntu, windows, or centos.
 
 ☐ Extract the user-sync (or user-sync.pex) file from the archive and place the file for your OS in the folder.  In our example, this would be /home/user_sync/user_sync_tool/user-sync or C:\Users\user_sync\user_sync_tool\user-sync.pex.
 
-☐ In the examples.config.tar.gz file there is a directory **config files - basic**.  From this folder extract the first 3 files and place in the user_sync_tool folder.  
+☐ In the example-configurations.tar.gz file there is a directory **config files - basic**.  From this folder extract the first 3 files and place in the user_sync_tool folder.  
 
 ☐ Next, rename the 3 config example files by removing the leading "1 ", "2 ", and "3 " from the names.  We will edit these files to create the real User Sync configuration files.
 

docs/success-guide/images/layout_orgs_multi_dir_single_org.png

@@ -21,11 +21,12 @@ You can use User Sync to manage PC membership and license allocation.  This is o
 
 User Sync helps you manage Adobe product licenses by allowing you to place users into directory groups using the directory system interface or other tools.  Those groups are then mapped to Adobe user groups or PCs.  The mapping is part of the User Sync configuration file.  When User Sync detects that directory users are in one of these mapped groups, the user is added to the corresponding Adobe user group or PC.  Similarly, users in the user group or PC but not in the corresponding directory group are removed from the user group or PC.
 
-☐ Decide if you will manage license allocation using User Sync.  If not, you can skip the remaining steps for now, but you will still need to do them and manually add users to the user groups or PCs later using the Adobe Admin Console. 
+☐ Decide if you will manage license allocation using User Sync.  If not, you can skip the remaining steps; however, before the users you create can access Adobe products, you will need to manually add them to product configurations using the Adobe Admin Console. 
 
-☐ Create the PCs in the Adobe Admin console for the configurations of products and groups of users you will be managing.
+☐ Create the PCs in the Adobe Admin console for the product configurations and groups of users you will be managing.  Add the comment "Managed by User Sync - do not edit" to the description field of the PC.
+
+☐ If you are going to use User Groups to manage product access, you will need to first create the user groups and the product configurations, then you can manage product access by adding each user group to the appropriate product configurations. Add the comment "Managed by User Sync - do not edit" to the description field of the user group.
 
-☐ If you are going to use User Groups, create them and add them to the PC(s) representing product licenses to be issued to members of the user group.
 
 ☐ Draw a diagram of your Adobe organizations, and the products and PCs in each.  Add the directory and directory groups to the picture and show the mapping.  For example:
 

docs/success-guide/images/layout_products_map.png

@@ -12,7 +12,7 @@ layout: default
 First, create a batch file with the invocation of user-sync piped to a scan to pull out relevant log entries for a summary.  Create the file run_sync.bat for this with contents like:
 
 	cd user-sync-directory
-	python user-sync.pex --users file example.users-file.csv --process-groups | findstr "==== ----- WARNING ERROR CRITICAL" > temp.file.txt
+	python user-sync.pex --users file example.users-file.csv --process-groups | findstr /I "==== ----- WARNING ERROR CRITICAL Number" > temp.file.txt
 	rem email the contents of temp.file.txt to the user sync administration
 	your-mail-tool –send file temp.file.txt
 
@@ -34,7 +34,8 @@ Note that often when setting up scheduled tasks, commands that work from the com
 First, create a shell script with the invocation of user-sync piped to a scan to pull out relevant log entries for a summary.  Create the file run_sync.sh for this with contents like:
 
 	cd user-sync-directory
-	./user-sync --users file example.users-file.csv --process-groups |  grep "CRITICAL\\|WARNING\\|ERROR\\|=====\\|-----" | mail -s “Adobe User Sync Report for `date +%F-%a`” [email protected]
+	./user-sync --users file example.users-file.csv --process-groups |  grep "CRITICAL\\|WARNING\\|ERROR\\|=====\\|-----\\|number of\\|Number of" | mail -s “Adobe User Sync Report for `date +%F-%a`” 
+    [email protected]
 
 
 You need to fill in your specific User Sync command line options and the email address to which the report should be sent.

docs/success-guide/images/setup_config_group_map.png

@@ -18,7 +18,7 @@ Setup steps are documented.  For complete information about the integration setu
 - Once setup, the Adobe.io console displays all needed values.  You’ll copy these into the user sync configuration file.
 - You'll also need to add the private key file to the User Sync configuration.
 
-☐ Obtain or create a digital signing certificate.  See [insteuctions for certificate creation](https://www.adobe.io/apis/cloudplatform/usermanagement/docs/setup/createcert.html).
+☐ Obtain or create a digital signing certificate.  See [instructions for certificate creation](https://www.adobe.io/apis/cloudplatform/usermanagement/docs/setup/createcert.html).
 
 ☐ Setup an adobe.io integration for each organization you need to access (usually only one).  See Step 2 and 3 on this [page](https://www.adobe.io/apis/cloudplatform/usermanagement/docs/setup.html)