Merging latest into Live

CONTRIBUTING.md

@@ -7,3 +7,4 @@ The following topics explain how to contribute to the PowerShell documentation.
 1. [Get started](./contributing/GETSTARTED.md)
 2. [Writing PowerShell documentation](./contributing/WRITING.md)
 3. [Style Guide](./contributing/STYLE.md)
+4. [Formatting code blocks](./contributing/FORMATTING-CODE.md).

contributing/FORMATTING-CODE.md

@@ -0,0 +1,171 @@
+# Formatting code blocks
+
+The existing documentation has used multiple styles, over time, and the formatting rules have changed multiple times.
+We want to adopt a consistent style for PowerShell code blocks and output in our documentation.
+The current Open Publishing System (OPS) we use has a syntax highlighting feature that supports many languages.
+OPS also adds a **Copy** button that copies the contents of the code block to the clipboard.
+This allows you to quickly paste the code into a script for testing the code example.
+However, not all examples in our documentation are intended to be run.
+Some code blocks are simple illustrations of a PowerShell concept.
+
+We are defining two scenarios for code blocks:
+
+1. Illustrative examples
+2. Executable examples
+
+## Formatting illustrative examples
+
+Illustrative examples are used to explain a PowerShell concept.
+They are not meant to be copied to the clipboard for execution.
+These are most commonly used for simple examples that are easy to type.
+They are also used for syntax examples where you are illustrating the syntax of a command.
+
+Illustrative examples use a "naked" code fence to mark the beginning and end of the code block.
+The code block may contain example output from the command being illustrated.
+
+### Syntax block
+
+Here is an example of a syntax block:
+
+    ```
+    Get-Command [-Verb <String[]>] [-Noun <String[]>] [-Module <String[]>]
+     [-FullyQualifiedModule <ModuleSpecification[]>] [-TotalCount <Int32>] [-Syntax] [-ShowCommandInfo]
+     [[-ArgumentList] <Object[]>] [-All] [-ListImported] [-ParameterName <String[]>]
+     [-ParameterType <PSTypeName[]>] [<CommonParameters>]
+    ```
+
+This example illustrates all of the possible parameters of the `Get-Command` cmdlet.
+
+Here is another syntax example describing the `for` statement in generalized terms:
+
+    ```
+    for (<init>; <condition>; <repeat>)
+    {<statement list>}
+    ```
+
+### Simple illustration example
+
+Here is an example illustrating PowerShell comparison operators:
+
+    ```
+    PS> 2 -eq 2
+    True
+
+    PS> 2 -eq 3
+    False
+
+    PS>  1,2,3 -eq 2
+    2
+
+    PS> "abc" -eq "abc"
+    True
+
+    PS> "abc" -eq "abc", "def"
+    False
+
+    PS> "abc", "def" -eq "abc"
+    abc
+    ```
+
+Note that this example has the simplified PowerShell prompt and shows the resulting output.
+In this case, we don't intend the reader to copy this example and try to run the copied code.
+
+## Formatting executable examples
+
+More complex examples or examples that would be useful to copy and execute should use <code>\`\`\`powershell</code> &hellip; <code>\`\`\`</code> code fence markers.
+Output emitted by PowerShell commands should be enclosed in a **Output** code block to prevent syntax highlighting.
+
+  For example:
+
+      ```powershell
+      Get-Command -Module Microsoft.PowerShell.Security
+      ```
+
+      ```Output
+      CommandType     Name                                               Version    Source
+      -----------     ----                                               -------    ------
+      Cmdlet          ConvertFrom-SecureString                           3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          ConvertTo-SecureString                             3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Get-Acl                                            3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Get-AuthenticodeSignature                          3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Get-CmsMessage                                     3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Get-Credential                                     3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Get-ExecutionPolicy                                3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Get-PfxCertificate                                 3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          New-FileCatalog                                    3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Protect-CmsMessage                                 3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Set-Acl                                            3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Set-AuthenticodeSignature                          3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Set-ExecutionPolicy                                3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Test-FileCatalog                                   3.0.0.0    Microsoft.PowerShell.Security
+      Cmdlet          Unprotect-CmsMessage                               3.0.0.0    Microsoft.PowerShell.Security
+      ```
+
+The **Output** code label is not an official "language" supported by the syntax highlighting system.
+However, this label is useful because OPS adds the "Output" label to the code box on the web page.
+And this "Output" code box has no syntax highlighting.
+
+## Understanding the COPY button
+
+OPS also adds a **Copy** button that copies the contents of the code block to the clipboard.
+This allows you to quickly paste the code into a script for testing the code example.
+The **Copy** button also removes PowerShell prompts from the text before copying it to the clipboard.
+The **Copy** button uses the following javascript code to remove the prompts.
+
+```javascript
+if (language === 'powershell') {
+  text = text.replace(/\bPS [a-z]:\\>\s?/gi, '');
+}
+```
+
+Note that the regex used only matches simple prompts like "`PS C:\>`".
+Prompts that include subdirectories or paths from other PSDrive providers will not be removed.
+See the general guidelines, in the next section, for the appropriate use of prompts in examples.
+
+## General guidelines
+
+- Code fences
+
+  Markdown allows for indentation to signify a code block, but this pattern can be problematic and should be avoided.
+  All code blocks should be contained in a code fence.
+  A code fence is a block of code surrounded by <code>\`\`\`</code> strings.
+  The code fence markers must be on their own line before and after the code sample.
+  The marker at the start of the code block may have an optional language label.
+  See the previous discussion about illustrative and executable examples for the proper use of language labels.
+
+- Line continuation in code samples
+
+  Avoid using line continuation characters (\`) in PowerShell code examples.
+  These are hard to see and can cause problems if there are extra spaces on the end of the line.
+  Use PowerShell splatting to reduce line length for cmdlets that have a lot of parameters.
+  Take advantage of PowerShell's natural line break opportunities, like after pipe (\|) characters and opening braces, parentheses, and brackets.
+
+- PowerShell prompts in examples
+
+  PowerShell prompts should only be used in illustrative examples.
+  Prompts should **NOT** be used in executable examples.
+  For most of these examples, the prompt string should be "`PS>`".
+  This prompt is independent of OS-specific indicators.
+  Use of the prompt string is discouraged and should be limited to scenarios that are meant to illustrate command line usage.
+  More complex prompt strings are required for examples that illustrate commands that alter the prompt
+  or when the path displayed is significant to the scenario being illustrated.
+  The following example illustrate how the prompt changes when using the Registry provider.
+
+      ```
+      PS C:\> cd HKCU:\System\
+      PS HKEY_CURRENT_USER\System\> dir
+
+
+          Hive: HKEY_CURRENT_USER\System
+
+
+      Name                           Property
+      ----                           --------
+      CurrentControlSet
+      GameConfigStore                GameDVR_Enabled                       : 1
+                                     GameDVR_FSEBehaviorMode               : 2
+                                     Win32_AutoGameModeDefaultProfile      : {2, 0, 1, 0...}
+                                     Win32_GameModeRelatedProcesses        : {1, 0, 1, 0...}
+                                     GameDVR_HonorUserFSEBehaviorMode      : 0
+                                     GameDVR_DXGIHonorFSEWindowsCompatible : 0
+      ```

contributing/STYLE.md

@@ -6,7 +6,7 @@ There are several variants of PowerShell.
 This table defines some of the different terms used to discuss PowerShell.
 
 | Terminology | Definition |
-| ----- | -----|
+| ----- | ----- |
 | PowerShell | This is the default. We are shipping PowerShell. The term PowerShell can be legitimately used to indicate any of the particular editions. This can be used to refer to the language, framework and default cmdlets, etc. |
 | PowerShell Core (PSCore) | PowerShell built on .NET Core Common Language Runtime (CoreCLR) for any of the platforms. |
 | Windows PowerShell | PowerShell built on .NET Common Language Runtime (CLR). Windows PowerShell ships only on Windows and requires the complete CLR. |
@@ -84,43 +84,6 @@ Adding or removing H2 causes a build break.
 
   This [`Write-Host`](..\reference\6\Microsoft.PowerShell.Utility\Write-Host.md) cmdlet uses the **-Object** parameter to ...
 
-## Formatting code blocks
-
-* All PowerShell syntax blocks should use <code>\`\`\`powershell</code> &hellip; <code>\`\`\`</code> code fence markers.
-
-* Do **NOT** start PowerShell commands with the PowerShell prompt ("`PS C:\>`").
-
-* Avoid using line continuation characters (\`) in PowerShell code examples.
-  These are a hard to see and can cause problems if there are extra spaces on the end of the line.
-
-* Output emitted by PowerShell commands should be enclosed in a naked code block to prevent it from recieving syntax highlighting.
-
-  For example:
-
-      ```powershell
-      Get-Command -Module Microsoft.PowerShell.Security
-      ```
-
-      ```
-      CommandType     Name                                               Version    Source
-      -----------     ----                                               -------    ------
-      Cmdlet          ConvertFrom-SecureString                           3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          ConvertTo-SecureString                             3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Get-Acl                                            3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Get-AuthenticodeSignature                          3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Get-CmsMessage                                     3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Get-Credential                                     3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Get-ExecutionPolicy                                3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Get-PfxCertificate                                 3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          New-FileCatalog                                    3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Protect-CmsMessage                                 3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Set-Acl                                            3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Set-AuthenticodeSignature                          3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Set-ExecutionPolicy                                3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Test-FileCatalog                                   3.0.0.0    Microsoft.PowerShell.Security
-      Cmdlet          Unprotect-CmsMessage                               3.0.0.0    Microsoft.PowerShell.Security
-      ```
-
 ## Lists
 
 * Do not end list items with a period (unless they contain multiple sentences)
@@ -162,6 +125,10 @@ There are special rules for linking to reference topics from conceptual topics.
 
 \[TO DO\] - document special rules
 
+## Next steps
+
+See [Formatting code blocks](FORMATTING-CODE.md).
+
 <!-- External URLs -->
 [pascal-case]: https://en.wikipedia.org/wiki/PascalCase
 [issue1806]: https://github.com/PowerShell/PowerShell-Docs/issues/1806

dsc/docfx.json

@@ -20,7 +20,7 @@
             "manager": "carmonm",
             "ms.devlang": "powershell",
             "ms.tgt_pltfr": "windows",
-            "ms.author": "eslesar"
+            "ms.author": "sewhee"
         },
         "resource": [
             {

gallery/docfx.json

@@ -18,8 +18,8 @@
             "manager": "carmonm",
             "ms.devlang": "powershell",
             "ms.tgt_pltfr": "windows, macos, linux",
-            "author": "juanpablojofre",
-            "ms.author": "jpjofre"
+            "author": "JKeithB",
+            "ms.author": "keithb"
         },
         "resource": [
             {

jea/docfx.json

@@ -18,7 +18,7 @@
             "manager": "carmonm",
             "ms.devlang": "powershell",
             "ms.tgt_pltfr": "windows",
-            "ms.author": "jpjofre"
+            "ms.author": "sewhee"
         },
         "resource": [
             {

reference/3.0/Microsoft.PowerShell.Utility/Get-Alias.md

@@ -14,13 +14,15 @@ Gets the aliases for the current session.
 ## SYNTAX
 
 ### Default (Default)
-```
-Get-Alias [[-Name] <String[]>] [-Exclude <String[]>] [-Scope <String>] [<CommonParameters>]
+```powershell
+Get-Alias [[-Name] <String[]>] [-Exclude <String[]>] [-Scope <String>]
+ [<CommonParameters>]
 ```
 
 ### Definition
-```
-Get-Alias [-Exclude <String[]>] [-Scope <String>] [-Definition <String[]>] [<CommonParameters>]
+```powershell
+Get-Alias [-Exclude <String[]>] [-Scope <String>] [-Definition <String[]>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -139,19 +141,19 @@ Accept wildcard characters: True
 ```
 
 ### -Name
-Specifies the aliases to retrieve.
+Specifies the aliases that this cmdlet gets.
 Wildcards are permitted.
-By default, Get-Alias retrieves all aliases defined for the current session.
-The parameter name ("Name") is optional.
-You can also pipe alias names to Get-Alias.
+By default, `Get-Alias` retrieves all aliases defined for the current session.
+The parameter name **Name** is optional.
+You can also pipe alias names to `Get-Alias`.
 
 ```yaml
 Type: String[]
 Parameter Sets: Default
-Aliases: 
+Aliases:
 
 Required: False
-Position: 1
+Position: 0
 Default value: All aliases
 Accept pipeline input: True (ByPropertyName, ByValue)
 Accept wildcard characters: True

reference/3.0/Microsoft.PowerShell.Utility/Select-Xml.md

@@ -14,23 +14,27 @@ Finds text in an XML string or document.
 ## SYNTAX
 
 ### Xml (Default)
-```
-Select-Xml [-Xml] <XmlNode[]> [-XPath] <String> [-Namespace <Hashtable>] [<CommonParameters>]
+```powershell
+Select-Xml [-XPath] <String> [-Xml] <XmlNode[]> [-Namespace <Hashtable>]
+ [<CommonParameters>]
 ```
 
 ### Path
-```
-Select-Xml [-Path] <String[]> [-XPath] <String> [-Namespace <Hashtable>] [<CommonParameters>]
+```powershell
+Select-Xml [-XPath] <String> [-Path] <String[]> [-Namespace <Hashtable>]
+ [<CommonParameters>]
 ```
 
 ### LiteralPath
-```
-Select-Xml -LiteralPath <String[]> [-XPath] <String> [-Namespace <Hashtable>] [<CommonParameters>]
+```powershell
+Select-Xml [-XPath] <String> -LiteralPath <String[]> [-Namespace <Hashtable>]
+ [<CommonParameters>]
 ```
 
 ### Content
-```
-Select-Xml -Content <String[]> [-XPath] <String> [-Namespace <Hashtable>] [<CommonParameters>]
+```powershell
+Select-Xml [-XPath] <String> -Content <String[]> [-Namespace <Hashtable>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -214,7 +218,7 @@ Parameter Sets: Path
 Aliases: 
 
 Required: True
-Position: 2
+Position: 1
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: True
@@ -231,7 +235,7 @@ Parameter Sets: (All)
 Aliases: 
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -249,7 +253,7 @@ Parameter Sets: Xml
 Aliases: Node
 
 Required: True
-Position: 2
+Position: 1
 Default value: None
 Accept pipeline input: True (ByPropertyName, ByValue)
 Accept wildcard characters: False