Merging changes synced from https://github.com/MicrosoftDocs/powerapps-docs-pr (branch live)

Author: buck1ey

powerapps-docs/developer/data-platform/powerapps-cli.md

@@ -218,6 +218,9 @@ Commands for working with [Dataverse solution projects](../../maker/data-platfor
 |upgrade|Command to upgrade the solution. It has the following parameters: <ul><li> *solution-name*: Name of the solution (alias:-sn).</li><li> *async*: Upgrades the solution asynchronously (alias: -a).</li><li>*max-async-wait-time*: Maximum asynchronous wait time in minutes. Default value is 60 minutes (alias: -wt).</li></ul>|`pac solution upgrade --solution-name SampleSolution --async --max-async-wait-time 60`|
 |add-license|Add license and plan info the solution. It has the following parameters: <ul><li>*planDefinitionFile*: License plan definition file in CSV format; expected columns: *Service ID, Display name, More info URL* (alias: -pd)</li><li>*planMappingFile*: License plan mapping file in CSV format; expected values: *Service ID, Component name* (alias: -pm)</li></ul>||
 |publish|Publishes all the customizations.|`pac solution publish`|
+|create-settings|Provides the ability to create a settings file that captures the environment variables and connection references in the setting. It has the following parameters: <ul><li>*solution zip*: Absolute path name or relative path name to the exported solution file (alias: -z).</li><li>*solution folder*: Folder ___location of the cloned solution on the filesystem, you can either use solution zip file or the solution folder ___location, not both together (alias: -f).</li><li> *settings file*: Location of the file to be created with the environment variable and connection reference information. The format of the created file is JSON (alias: -s).</li></ul>|`pac solution create-settings --solution-zip C:\SampleSolution.zip --settings-file .\SampleDeploymentSettingsDev.json`|
+|unpack|Provides the ability to unpack solution zip files after they have been exported to the filesystem. It has the following parameters: <ul><li>*zip file*: Absolute path name or relative path name to the exported solution file (alias: -z).</li><li>*folder*: The path to the root folder on the local filesystem. This will be the folder where the unpacked contents will be written (alias: -f).</li><li> *package type*: Use to specify dual managed and unmanaged operation (alias: -p).</li> <li> *log*: The path to the log file (alias: -l).</li><li> *error level*: Minimum logging level for log output. It has the following values: *Verbose, Info, Warning, Error, Off*. Default value is *Info* (alias: -e).</li><li> *single Component*: Performs the action on a single component type. It has the following values: *WebResource, Plugin, Workflow, None*. Default value is *None* (alias: -sc).</li><li> *allow Delete*: Specifies if the delete operations should occur or not. It has the following values: *Yes, No, Prompt*. Default is *Prompt* (alias: -ad).</li><li> *allow Write*: Specifies if the write operations should occur or not. Default value is false (alias: -aw).</li><li> *clobber*: Enables to delete or overwrite the files that are marked as read-only. Default value is false (alias: -c).</li><li> *map*: The full path to the mapping XML file that reads component folders to pack (alias: -m).</li><li> *sourceLoc*: Generates a template resource file. It has the following values: *auto, LCID, ISO code* of the language you wish to export. When set, this will extract the string resources from the given locale as a neutral resx file. If auto or just the long or short form of the switch is specified the base locale for the solution will be used (alias: -src).</li><li> *localize*: Extract or merge all string resources into `.resx` files (alias: -loc)</li><li> *use Lcid*: Use LCID's (1033) rather than ISO codes (en-US) for language files (alias: -lcid).</li><li> *use Unmanaged File for Missing Managed*: Use the same XML source file when packaging for managed and only unmanaged XML file is found. Applies to `AppModuleSiteMap`, `AppModuleMap`, `FormXml` files (alias: -same).</li></ul>|`pac solution unpack --solution-zip C:\SampleSolution.zip --folder .\SampleSolutionUnpacked\.`|
+|pack|Provides the ability to pack files on a filesystem into a solution zip file. It has the following parameters: <ul><li>*zip file*: Absolute path name or relative path name to the generated solution zip file (alias: -z).</li><li>*folder*: The path to the root folder on the local filesystem, this will be the folder from where the contents will be read from (alias: -f).</li><li> *package type*: Use to specify dual managed and unmanaged operation (alias: -p).</li> <li> *log*: The path to the log file (alias: -l).</li><li> *error level*: Minimum logging level for log output. It has the following values: *Verbose, Info, Warning, Error, Off*. Default value is *Info* (alias: -e).</li><li> *single Component*: Performs the action on a single component type. It has the following values: *WebResource, Plugin, Workflow, None*. Default value is *None* (alias: -sc).</li><li> *allow Delete*: Specifies if the delete operations should occur or not. It has the following values: *Yes, No, Prompt*. Default is *Prompt* (alias: -ad).</li><li> *allow Write*: Specifies if the write operations should occur or not. Default value is false (alias: -aw).</li><li> *clobber*: Enables to delete or overwrite the files that are marked as read-only. Default value is false (alias: -c).</li><li> *map*: The full path to the mapping XML file that reads component folders to pack (alias: -m).</li><li> *sourceLoc*: Generates a template resource file. It has the following values: *auto, LCID, ISO code* of the language you wish to export. When set, this will extract the string resources from the given locale as a neutral resx file. If auto or just the long or short form of the switch is specified the base locale for the solution will be used (alias: -src).</li><li> *localize*: Extract or merge all string resources into `.resx` files (alias: -loc)</li><li> *use Lcid*: Use LCID's (1033) rather than ISO codes (en-US) for language files (alias: -lcid).</li><li> *use Unmanaged File for Missing Managed*: Use the same XML source file when packaging for managed and only unmanaged XML file is found. Applies to `AppModuleSiteMap`, `AppModuleMap`, `FormXml` files (alias: -same).</li></ul>|`pac solution pack --solution-zip C:\SampleSolution.zip --folder .\SampleSolutionUnpacked\.`|
 
 ### Auth
 

powerapps-docs/developer/model-driven-apps/clientapi/reference/Xrm-Utility/getGlobalContext/userSettings.md

@@ -187,7 +187,7 @@ On success, returns a promise object containing the values specified in the desc
 
 ### Example
 
-```
+```javascript
 userSettings
   .getSecurityRolePrivilegesInfo()
   .then(function success(rolePrivileges) {
@@ -198,8 +198,8 @@ userSettings
     var guid = privilegeGuids[0];
     console.log("Privilege Id: " + privilege[guid].id);
     console.log("Privilege Name: " + privilege[guid].privilegeName);
-    console.log("Privilege Business Unit Id: " + privilege[guid].businessUnitId);
-    console.log("Privilege depth: " + privilege[guid].depth);
+    console.log("Privilege Business Unit Id: " + rolePrivileges[guid].businessUnitId);
+    console.log("Privilege depth: " + rolePrivileges[guid].depth);
   });
 ```