Merge pull request MicrosoftDocs#6792 from MicrosoftDocs/chrisda

Identity param position in syntax blocks

Author: chrisda

exchange/exchange-ps/exchange/Add-ADPermission.md

@@ -47,14 +47,13 @@ Add-ADPermission [-Identity] <ADRawEntryIdParameter> -Owner <SecurityPrincipalId
 
 ### Instance
 ```
-Add-ADPermission -Instance <ADAcePresentationObject>
+Add-ADPermission [[-Identity] <ADRawEntryIdParameter>] -Instance <ADAcePresentationObject>
  [-AccessRights <ActiveDirectoryRights[]>]
  [-ChildObjectTypes <ADSchemaObjectIdParameter[]>]
  [-Confirm]
  [-Deny]
  [-DomainController <Fqdn>]
  [-ExtendedRights <ExtendedRightIdParameter[]>]
- [[-Identity] <ADRawEntryIdParameter>]
  [-InheritanceType <ActiveDirectorySecurityInheritance>]
  [-InheritedObjectType <ADSchemaObjectIdParameter>]
  [-Properties <ADSchemaObjectIdParameter[]>]

exchange/exchange-ps/exchange/Add-DatabaseAvailabilityGroupServer.md

@@ -21,8 +21,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Add-DatabaseAvailabilityGroupServer [-Identity] <DatabaseAvailabilityGroupIdParameter>
- [-MailboxServer] <ServerIdParameter>
+Add-DatabaseAvailabilityGroupServer [-Identity] <DatabaseAvailabilityGroupIdParameter> [-MailboxServer] <ServerIdParameter>
  [-Confirm]
  [-DomainController <Fqdn>]
  [-SkipDagValidation]

exchange/exchange-ps/exchange/Add-MailboxPermission.md

@@ -45,14 +45,13 @@ Add-MailboxPermission [-Identity] <MailboxIdParameter> -Owner <SecurityPrincipal
 
 ### Instance
 ```
-Add-MailboxPermission -Instance <MailboxAcePresentationObject>
+Add-MailboxPermission [[-Identity] <MailboxIdParameter>] -Instance <MailboxAcePresentationObject>
  [-AccessRights <MailboxRights[]>]
  [-User <SecurityPrincipalIdParameter>]
  [-AutoMapping <Boolean>]
  [-Confirm]
  [-Deny]
  [-DomainController <Fqdn>]
- [[-Identity] <MailboxIdParameter>]
  [-IgnoreDefaultScope]
  [-InheritanceType <ActiveDirectorySecurityInheritance>]
  [-WhatIf]

exchange/exchange-ps/exchange/Add-PublicFolderAdministrativePermission.md

@@ -34,13 +34,12 @@ Add-PublicFolderAdministrativePermission [-Identity] <PublicFolderIdParameter> -
 
 ### Instance
 ```
-Add-PublicFolderAdministrativePermission -Instance <PublicFolderAdministrativeAceObject>
+Add-PublicFolderAdministrativePermission [[-Identity] <PublicFolderIdParameter>] -Instance <PublicFolderAdministrativeAceObject>
  [-AccessRights <MultiValuedProperty>]
  [-User <SecurityPrincipalIdParameter>]
  [-Confirm]
  [-Deny]
  [-DomainController <Fqdn>]
- [[-Identity] <PublicFolderIdParameter>]
  [-InheritanceType <ActiveDirectorySecurityInheritance>]
  [-Server <ServerIdParameter>]
  [-WhatIf]

exchange/exchange-ps/exchange/Connect-Mailbox.md

@@ -22,9 +22,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ### Equipment
 ```
-Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
- [-Database] <DatabaseIdParameter>
- [-Equipment]
+Connect-Mailbox [-Identity] <StoreMailboxIdParameter> [-Database] <DatabaseIdParameter> [-Equipment]
  [-ActiveSyncMailboxPolicy <MailboxPolicyIdParameter>]
  [-Alias <String>]
  [-Confirm]
@@ -40,14 +38,12 @@ Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
 
 ### Linked
 ```
-Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
- [-Database] <DatabaseIdParameter> -LinkedDomainController <Fqdn> -LinkedMasterAccount <UserIdParameter>
+Connect-Mailbox [-Identity] <StoreMailboxIdParameter> [-Database] <DatabaseIdParameter> -LinkedDomainController <Fqdn> -LinkedMasterAccount <UserIdParameter> [-LinkedCredential <PSCredential>]
  [-ActiveSyncMailboxPolicy <MailboxPolicyIdParameter>]
  [-Alias <String>]
  [-Confirm]
  [-DomainController <Fqdn>]
  [-Force]
- [-LinkedCredential <PSCredential>]
  [-ManagedFolderMailboxPolicy <MailboxPolicyIdParameter>]
  [-ManagedFolderMailboxPolicyAllowed]
  [-RetentionPolicy <MailboxPolicyIdParameter>]
@@ -58,9 +54,7 @@ Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
 
 ### Room
 ```
-Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
- [-Database] <DatabaseIdParameter>
- [-Room]
+Connect-Mailbox [-Identity] <StoreMailboxIdParameter> [-Database] <DatabaseIdParameter> [-Room]
  [-ActiveSyncMailboxPolicy <MailboxPolicyIdParameter>]
  [-Alias <String>]
  [-Confirm]
@@ -76,9 +70,7 @@ Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
 
 ### Shared
 ```
-Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
- [-Database] <DatabaseIdParameter>
- [-Shared]
+Connect-Mailbox [-Identity] <StoreMailboxIdParameter> [-Database] <DatabaseIdParameter> [-Shared]
  [-ActiveSyncMailboxPolicy <MailboxPolicyIdParameter>]
  [-Alias <String>]
  [-Confirm]
@@ -94,9 +86,7 @@ Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
 
 ### ValidateOnly
 ```
-Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
- [-Database] <DatabaseIdParameter>
- [-ValidateOnly]
+Connect-Mailbox [-Identity] <StoreMailboxIdParameter> [-Database] <DatabaseIdParameter> [-ValidateOnly]
  [-Confirm]
  [-DomainController <Fqdn>]
  [-Force]
@@ -106,8 +96,7 @@ Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
 
 ### User
 ```
-Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
- [-Database] <DatabaseIdParameter>
+Connect-Mailbox [-Identity] <StoreMailboxIdParameter> [-Database] <DatabaseIdParameter> [-User <UserIdParameter>]
  [-AddressBookPolicy <AddressBookMailboxPolicyIdParameter>]
  [-AllowLegacyDNMismatch]
  [-Archive]
@@ -119,7 +108,6 @@ Connect-Mailbox [-Identity] <StoreMailboxIdParameter>
  [-ManagedFolderMailboxPolicy <MailboxPolicyIdParameter>]
  [-ManagedFolderMailboxPolicyAllowed]
  [-RetentionPolicy <MailboxPolicyIdParameter>]
- [-User <UserIdParameter>]
  [-WhatIf]
  [<CommonParameters>]
 ```

exchange/exchange-ps/exchange/Get-InformationBarrierRecipientStatus.md

@@ -21,8 +21,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Get-InformationBarrierRecipientStatus [-Identity] <RecipientIdParameter>
- [[-Identity2] <RecipientIdParameter>]
+Get-InformationBarrierRecipientStatus [-Identity] <RecipientIdParameter> [[-Identity2] <RecipientIdParameter>]
  [<CommonParameters>]
 ```
 

exchange/exchange-ps/exchange/Get-MailboxFolderStatistics.md

@@ -37,10 +37,9 @@ Get-MailboxFolderStatistics [-Identity] <GeneralMailboxOrMailUserIdParameter>
 
 ### AuditLog
 ```
-Get-MailboxFolderStatistics [-AuditLog]
+Get-MailboxFolderStatistics [[-Identity] <GeneralMailboxOrMailUserIdParameter>] [-AuditLog]
  [-DomainController <Fqdn>]
  [-FolderScope <Microsoft.Exchange.Data.Directory.SystemConfiguration.ElcFolderType>]
- [[-Identity] <GeneralMailboxOrMailUserIdParameter>]
  [-IncludeAnalysis]
  [-IncludeOldestAndNewestItems]
  [-DiagnosticInfo <String>]

exchange/exchange-ps/exchange/Get-MailboxRepairRequest.md

@@ -22,24 +22,21 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ### Database
 ```
-Get-MailboxRepairRequest [-Database] <DatabaseIdParameter>
- [[-StoreMailbox] <StoreMailboxIdParameter>]
+Get-MailboxRepairRequest [-Database] <DatabaseIdParameter> [[-StoreMailbox] <StoreMailboxIdParameter>]
  [-DomainController <Fqdn>]
  [<CommonParameters>]
 ```
 
 ### Identity
 ```
-Get-MailboxRepairRequest [-Identity] <StoreIntegrityCheckJobIdParameter>
- [-Detailed]
+Get-MailboxRepairRequest [-Identity] <StoreIntegrityCheckJobIdParameter> [-Detailed]
  [-DomainController <Fqdn>]
  [<CommonParameters>]
 ```
 
 ### Mailbox
 ```
-Get-MailboxRepairRequest [-Mailbox] <MailboxIdParameter>
- [-Archive]
+Get-MailboxRepairRequest [-Mailbox] <MailboxIdParameter> [-Archive]
  [-DomainController <Fqdn>]
  [<CommonParameters>]
 ```
@@ -81,18 +78,12 @@ This example uses the Database and StoreMailbox parameters to display the Identi
 
 ## PARAMETERS
 
-### -Database
-The Database parameter returns mailbox repair requests for all mailboxes on the specified database. You can use any value that uniquely identifies the database. For example:
-
-- Name
-- Distinguished name (DN)
-- GUID
-
-You can't use this parameter with the Mailbox parameter.
+### -Identity
+The Identity parameter specifies the mailbox repair request to display information about. Mailbox repair requests are identified by a complex GUID that is created when a new mailbox repair request is created. This GUID consists of a database ID, a Request ID and a job ID. The format is \<DatabaseGuid\>\\\<RequestGuid\>\\\<JobGuid\>.
 
 ```yaml
-Type: DatabaseIdParameter
-Parameter Sets: Database
+Type: StoreIntegrityCheckJobIdParameter
+Parameter Sets: Identity
 Aliases:
 Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 
@@ -103,12 +94,18 @@ Accept pipeline input: True
 Accept wildcard characters: False
 ```
 
-### -Identity
-The Identity parameter specifies the mailbox repair request to display information about. Mailbox repair requests are identified by a complex GUID that is created when a new mailbox repair request is created. This GUID consists of a database ID, a Request ID and a job ID. The format is \<DatabaseGuid\>\\\<RequestGuid\>\\\<JobGuid\>.
+### -Database
+The Database parameter returns mailbox repair requests for all mailboxes on the specified database. You can use any value that uniquely identifies the database. For example:
+
+- Name
+- Distinguished name (DN)
+- GUID
+
+You can't use this parameter with the Mailbox parameter.
 
 ```yaml
-Type: StoreIntegrityCheckJobIdParameter
-Parameter Sets: Identity
+Type: DatabaseIdParameter
+Parameter Sets: Database
 Aliases:
 Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 

exchange/exchange-ps/exchange/Get-MailboxStatistics.md

@@ -24,8 +24,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ### Database
 ```
-Get-MailboxStatistics -Database <DatabaseIdParameter>
- [[-StoreMailboxIdentity] <StoreMailboxIdParameter>]
+Get-MailboxStatistics -Database <DatabaseIdParameter> [[-StoreMailboxIdentity] <StoreMailboxIdParameter>]
  [-CopyOnServer <ServerIdParameter>]
  [-DomainController <Fqdn>]
  [-Filter <String>]
@@ -168,6 +167,29 @@ Accept pipeline input: True
 Accept wildcard characters: False
 ```
 
+### -StoreMailboxIdentity
+This parameter is available only in on-premises Exchange.
+
+The StoreMailboxIdentity parameter specifies the mailbox identity when used with the Database parameter to return statistics for a single mailbox on the specified database. You can use one of the following values:
+
+- MailboxGuid
+- LegacyDN
+
+Use this syntax to retrieve information about disconnected mailboxes, which don't have a corresponding Active Directory object or that has a corresponding Active Directory object that doesn't point to the disconnected mailbox in the mailbox database.
+
+```yaml
+Type: StoreMailboxIdParameter
+Parameter Sets: Database
+Aliases:
+Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: True
+Accept wildcard characters: False
+```
+
 ### -Archive
 The Archive switch parameter specifies whether to return mailbox statistics for the archive mailbox associated with the specified mailbox. You don't need to specify a value with this switch.
 
@@ -416,29 +438,6 @@ Accept pipeline input: True
 Accept wildcard characters: False
 ```
 
-### -StoreMailboxIdentity
-This parameter is available only in on-premises Exchange.
-
-The StoreMailboxIdentity parameter specifies the mailbox identity when used with the Database parameter to return statistics for a single mailbox on the specified database. You can use one of the following values:
-
-- MailboxGuid
-- LegacyDN
-
-Use this syntax to retrieve information about disconnected mailboxes, which don't have a corresponding Active Directory object or that has a corresponding Active Directory object that doesn't point to the disconnected mailbox in the mailbox database.
-
-```yaml
-Type: StoreMailboxIdParameter
-Parameter Sets: Database
-Aliases:
-Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
-
-Required: False
-Position: 1
-Default value: None
-Accept pipeline input: True
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
 

exchange/exchange-ps/exchange/Import-ContactList.md

@@ -26,8 +26,8 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ```
 Import-ContactList [-Identity] <MailboxIdParameter> -CSVData <Byte[]>
  [-CSV]
- [-DateCultureName] <String>
  [-Confirm]
+ [-DateCultureName <String>]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -36,8 +36,8 @@ Import-ContactList [-Identity] <MailboxIdParameter> -CSVData <Byte[]>
 ```
 Import-ContactList [-Identity] <MailboxIdParameter> -CSVStream <Stream>
  [-CSV]
- [-DateCultureName] <String>
  [-Confirm]
+ [-DateCultureName <String>]
  [-WhatIf]
  [<CommonParameters>]
 ```

exchange/exchange-ps/exchange/Import-DlpPolicyCollection.md

@@ -21,8 +21,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Import-DlpPolicyCollection [-FileData] <Byte[]>
- [[-Identity] <DlpPolicyIdParameter>]
+Import-DlpPolicyCollection [[-Identity] <DlpPolicyIdParameter>] [-FileData] <Byte[]>
  [-Confirm]
  [-DomainController <Fqdn>]
  [-Force]

exchange/exchange-ps/exchange/Import-JournalRuleCollection.md

@@ -21,8 +21,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Import-JournalRuleCollection [-FileData] <Byte[]>
- [[-Identity] <RuleIdParameter>]
+Import-JournalRuleCollection [[-Identity] <RuleIdParameter>] [-FileData] <Byte[]>
  [-Confirm]
  [-DomainController <Fqdn>]
  [-WhatIf]