Skip to content

Commit eed0186

Browse files
authored
Merge branch 'master' into patch-127
2 parents d5ab400 + 0e6a9b8 commit eed0186

File tree

21 files changed

+48
-39
lines changed

21 files changed

+48
-39
lines changed

docset/winserver2012-ps/activedirectory/Get-ADGroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Get-ADGroup [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <S
3636
The Get-ADGroup cmdlet gets a group or performs a search to retrieve multiple groups from an Active Directory.
3737

3838
The Identity parameter specifies the Active Directory group to get.
39-
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), Security Accounts Manager (SAM) account name, or canonical name.
39+
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), or Security Accounts Manager (SAM) account name.
4040
You can also specify group object variable, such as $\<localGroupObject\>.
4141

4242
To search for and retrieve more than one group, use the Filter or LDAPFilter parameters.

docset/winserver2012-ps/dism/Get-WindowsImage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Accepted values: Errors, Warnings, WarningsInfo
119119

120120
Required: False
121121
Position: Named
122-
Default value: None
122+
Default value: 3
123123
Accept pipeline input: True (ByPropertyName)
124124
Accept wildcard characters: False
125125
```

docset/winserver2012-ps/windowsserverbackup/New-WBFileSpec.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,21 @@ The WBFileSpec object that specifies the file C:\Sample\1.jpg for backup.
4040

4141
This command creates a file specification and adds the file named "C:\Sample\1.jpg" to it.
4242

43-
### Example 2: Add a volume recursively to a backup file specification
43+
### Example 2: Add a folder recursively to a backup file specification
4444
```
45-
PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample
46-
47-
The WBFileSpec object that specifies the folder C:\Sample for backup.
45+
PS C:\> $Filespec = New-WBFileSpec -FileSpec "C:\Sample"
4846
```
4947

50-
This command creates a file specification and adds the contents of the "C:\Sample" folder to it.
51-
Because the cmdlet does not include the **NonRecursive** parameter, the backup includes the contents of this folder and its subfolders.
48+
This command creates a file specification and adds the contents of the C:\Sample folder to it.
49+
Because the cmdlet does not include the *NonRecursive* parameter, the backup includes the contents of this folder and its subfolders.
5250

53-
### Example 3: Add a volume nonrecursively to a backup file specification
51+
### Example 3: Add a folder nonrecursively to a backup file specification
5452
```
55-
PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample -NonRecursive
56-
57-
The WBFileSpec object that specifies the folder C:\sample for backup non-recursively.
53+
PS C:\> $Filespec = New-WBFileSpec -FileSpec "C:\Sample" -NonRecursive
5854
```
5955

60-
This command creates a file specification and adds the contents of the "C:\Sample" folder to it.
61-
Because the cmdlet includes the **NonRecursive** parameter, the backup includes the contents of this folder but not the contents of its subfolders.
56+
This command creates a file specification and adds the contents of the C:\Sample folder to it.
57+
Because the cmdlet includes the *NonRecursive* parameter, the backup includes the contents of this folder but not the contents of its subfolders.
6258

6359
### Example 4: Exclude files from a backup file specification
6460
```

docset/winserver2012r2-ps/activedirectory/Get-ADGroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Get-ADGroup [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <S
3838
The **Get-ADGroup** cmdlet gets a group or performs a search to retrieve multiple groups from an Active Directory.
3939

4040
The **Identity** parameter specifies the Active Directory group to get.
41-
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), Security Accounts Manager (SAM) account name, or canonical name.
41+
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), or Security Accounts Manager (SAM) account name.
4242
You can also specify group object variable, such as **$\<localGroupObject\>**.
4343

4444
To search for and retrieve more than one group, use the **Filter** or **LDAPFilter** parameters.

docset/winserver2012r2-ps/dism/Get-WindowsImage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Accepted values: Errors, Warnings, WarningsInfo
121121

122122
Required: False
123123
Position: Named
124-
Default value: None
124+
Default value: 3
125125
Accept pipeline input: True (ByPropertyName)
126126
Accept wildcard characters: False
127127
```

docset/winserver2012r2-ps/windowsserverbackup/New-WBFileSpec.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample\1.jpg
4040

4141
This command creates a file specification and adds the file named "C:\Sample\1.jpg" to it.
4242

43-
### Example 2: Add a volume recursively to a backup file specification
43+
### Example 2: Add a folder recursively to a backup file specification
4444
```
45-
PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample
45+
PS C:\> $Filespec = New-WBFileSpec -FileSpec "C:\Sample"
4646
```
4747

48-
This command creates a file specification and adds the contents of the "C:\Sample" folder to it.
49-
Because the cmdlet does not include the **NonRecursive** parameter, the backup includes the contents of this folder and its subfolders.
48+
This command creates a file specification and adds the contents of the C:\Sample folder to it.
49+
Because the cmdlet does not include the *NonRecursive* parameter, the backup includes the contents of this folder and its subfolders.
5050

51-
### Example 3: Add a volume nonrecursively to a backup file specification
51+
### Example 3: Add a folder nonrecursively to a backup file specification
5252
```
53-
PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample -NonRecursive
53+
PS C:\> $Filespec = New-WBFileSpec -FileSpec "C:\Sample" -NonRecursive
5454
```
5555

56-
This command creates a file specification and adds the contents of the "C:\Sample" folder to it.
57-
Because the cmdlet includes the **NonRecursive** parameter, the backup includes the contents of this folder but not the contents of its subfolders.
56+
This command creates a file specification and adds the contents of the C:\Sample folder to it.
57+
Because the cmdlet includes the *NonRecursive* parameter, the backup includes the contents of this folder but not the contents of its subfolders.
5858

5959
### Example 4: Exclude files from a backup file specification
6060
```

docset/winserver2016-ps/activedirectory/Get-ADGroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Get-ADGroup [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <S
3939
The **Get-ADGroup** cmdlet gets a group or performs a search to retrieve multiple groups from an Active Directory.
4040

4141
The *Identity* parameter specifies the Active Directory group to get.
42-
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), Security Accounts Manager (SAM) account name, or canonical name.
42+
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), or Security Accounts Manager (SAM) account name.
4343
You can also specify group object variable, such as `$<localGroupObject>`.
4444

4545
To search for and retrieve more than one group, use the *Filter* or *LDAPFilter* parameters.

docset/winserver2016-ps/adfs/New-AdfsAccessControlPolicy.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ New-AdfsAccessControlPolicy -Name <String> [-SourceName <String>] [-Identifier <
2424
## DESCRIPTION
2525
The **New-AdfsAccessControlPolicy** cmdlet creates an Active Directory Federation Services (AD FS) access control policy from a policy metadata file.
2626

27+
**How to create a federation metadata file**
28+
29+
The federation metadata document is an XML file that is available for [download](https://adfshelp.microsoft.com/MetadataExplorer/GetFederationMetadata). To retrieve your document, enter your federation service name, and then select the **Get federation metadata** button.
30+
2731
## EXAMPLES
2832

2933
### Example 1: Create a policy template from a policy metadata file

docset/winserver2016-ps/dism/Get-WindowsImage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Accepted values: Errors, Warnings, WarningsInfo
122122

123123
Required: False
124124
Position: Named
125-
Default value: None
125+
Default value: 3
126126
Accept pipeline input: True (ByPropertyName)
127127
Accept wildcard characters: False
128128
```

docset/winserver2016-ps/storagereplica/Set-SRNetworkConstraint.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This example sets the network constraint for interfaces and replication groups o
4444
### Example 2: Set a constraint for a stretch cluster
4545

4646
```powershell
47-
Set-SRNetworkConstraint -SourceComputerName "SR-SRV01" -SourceRGName "Group01" -SourceNWInterface "Cluster Network 1","Cluster Network 2" -DestinationComputerName "SR-SRV03" -DestinationRGName "Group02" -DestinationNWInterface "Cluster Network 1","Cluster Network 2"
47+
Set-SRNetworkConstraint -SourceComputerName "Cluster01" -SourceRGName "Group01" -SourceNWInterface "Cluster Network 1","Cluster Network 2" -DestinationComputerName "Cluster02" -DestinationRGName "Group02" -DestinationNWInterface "Cluster Network 1","Cluster Network 2"
4848
```
4949

5050
This command sets a network constraint for a specific set of cluster networks in a stretch cluster.

0 commit comments

Comments
 (0)