Skip to content

Commit 72a292b

Browse files
authored
Merge branch 'master' into patch-25
2 parents 2065313 + 9d875a0 commit 72a292b

File tree

8 files changed

+63
-26
lines changed

8 files changed

+63
-26
lines changed

docset/windows/addsadministration/get-aduser.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,28 @@ Accept wildcard characters: False
251251
```
252252

253253
### -Partition
254-
The default authentication method is Negotiate.
254+
Specifies the distinguished name of an Active Directory partition.
255+
The distinguished name must be one of the naming contexts on the current directory server.
256+
The cmdlet searches this partition to find the object defined by the *Identity* parameter.
257+
258+
In many cases, a default value is used for the *Partition* parameter if no value is specified.
259+
The rules for determining the default value are given below.
260+
Note that rules listed first are evaluated first and when a default value can be determined, no further rules are evaluated.
261+
262+
In AD DS environments, a default value for *Partition* are set in the following cases:
263+
264+
- If the *Identity* parameter is set to a distinguished name, the default value of *Partition* is automatically generated from this distinguished name.
265+
- If running cmdlets from an Active Directory provider drive, the default value of *Partition* is automatically generated from the current path in the drive.
266+
- If none of the previous cases apply, the default value of *Partition* is set to the default partition or naming context of the target domain.
267+
268+
In AD LDS environments, a default value for *Partition* will be set in the following cases:
269+
270+
- If the *Identity* parameter is set to a distinguished name, the default value of *Partition* is automatically generated from this distinguished name.
271+
- If running cmdlets from an Active Directory provider drive, the default value of *Partition* is automatically generated from the current path in the drive.
272+
- If the target AD LDS instance has a default naming context, the default value of *Partition* is set to the default naming context.
273+
To specify a default naming context for an AD LDS environment, set the **msDS-defaultNamingContext** property of the Active Directory directory service agent object (**nTDSDSA**) for the AD LDS instance.
274+
- If none of the previous cases apply, the *Partition* parameter does not take any default value.
255275

256-
A Secure Sockets Layer (SSL) connection is required for the Basic authentication method.
257276

258277
```yaml
259278
Type: String

docset/windows/dhcpserver/invoke-dhcpserverv4failoverreplication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Type: IPAddress[]
179179
Parameter Sets: ScopeId
180180
Aliases:
181181

182-
Required: True
182+
Required: False
183183
Position: Named
184184
Default value: None
185185
Accept pipeline input: True (ByPropertyName)

docset/windows/hyper-v/set-vmnetworkadaptervlan.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ PS C:\> Set-VMNetworkAdapterVlan -VMName Redmond -Access -VlanId 121
7171
```
7272

7373
Sets the virtual network adapter(s) in virtual machine Redmond to the Access mode.
74-
Traffic sent by this virtual machine is tagged with VLAN ID 121.
74+
Traffic sent by this virtual machine is tagged with VLAN ID 121.
7575

7676
### Example 2
7777
```
@@ -103,11 +103,18 @@ PS C:\> Get-VM Redmond | Set-VMNetworkAdapterVlan -Untagged
103103

104104
Gets virtual machine Redmond and sets the virtual network adapters in the virtual machine to the untagged mode.
105105

106+
### Example 5
107+
```
108+
PS C:\> Set-VMNetworkAdapterVlan -ManagementOS -Access -VlanID 20
109+
```
110+
111+
Sets the virtual switch in the management OS to the Access mode.
112+
Traffic sent by this virtual switch is tagged with VLAN ID 20.
113+
106114
## PARAMETERS
107115

108116
### -Access
109-
Specifies **Access** mode for the virtual machine network adapter.
110-
This parameter must be specified in conjunction with parameter **VlanId**.
117+
Specifies **Access** mode for the virtual machine network adapter. This parameter configures an untagged virtual port with the VLANId (port based VLAN), so it must be specified together with **VlanId**.
111118

112119
```yaml
113120
Type: SwitchParameter
@@ -350,7 +357,7 @@ Accept wildcard characters: False
350357
```
351358
352359
### -Trunk
353-
Specifies **Trunk** mode for the virtual machine network adapter.
360+
Specifies **Trunk** mode for the virtual machine network adapter. This parameter configures a tagged virtual port that passes all allowed VLANId tags to the VM adapter. Traffic with the NativeVLANId is passed untagged to the VM adapter.
354361
This parameter must be used in conjunction with parameters **AllowedVlanIdList** and **NativeVlanId**.
355362
356363
```yaml
@@ -488,4 +495,4 @@ If **-PassThru** is specified.
488495
## NOTES
489496
490497
## RELATED LINKS
491-
498+
[Configure and View VLAN Settings on Hyper-V Virtual Switch Ports](https://docs.microsoft.com/windows-server/virtualization/hyper-v-virtual-switch/configure-and-view-vlan-settings-on-hyper-v-virtual-switch-ports)

docset/windows/nettcpip/get-netipaddress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ Required: False
231231
Position: Named
232232
Default value: None
233233
Accept pipeline input: True (ByPropertyName)
234-
Accept wildcard characters: False
234+
Accept wildcard characters: True
235235
```
236236
237237
### -InterfaceIndex

docset/windows/provisioning/get-provisioningpackage.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.reviewer:
2020
# Get-ProvisioningPackage
2121

2222
## SYNOPSIS
23-
{{Fill in the Synopsis}}
23+
Gets information about the installed provisioning package.
2424

2525
## SYNTAX
2626

@@ -43,21 +43,22 @@ Get-ProvisioningPackage [-AllInstalledPackages] [-LogsDirectoryPath <String>] [-
4343
```
4444

4545
## DESCRIPTION
46-
{{Fill in the Description}}
46+
The **Get-ProvisioningPackage** cmdlet gets information about the installed provisioning package.
4747

4848
## EXAMPLES
4949

5050
### Example 1
5151
```
52-
PS C:\> {{ Add example code here }}
52+
PS C:\> Get-ProvisioningPackage -PackagePath c:\test\testppkg.ppkg
5353
```
5454

55-
{{ Add example description here }}
55+
This command gets information about the testppkg.ppkg provisioning package.
5656

5757
## PARAMETERS
5858

5959
### -AllInstalledPackages
60-
{{Fill AllInstalledPackages Description}}
60+
61+
Gets all the installed packages information.
6162

6263
```yaml
6364
Type: SwitchParameter
@@ -72,7 +73,7 @@ Accept wildcard characters: False
7273
```
7374
7475
### -ConnectedDevice
75-
{{Fill ConnectedDevice Description}}
76+
Gets the connected device information.
7677
7778
```yaml
7879
Type: SwitchParameter
@@ -87,7 +88,7 @@ Accept wildcard characters: False
8788
```
8889
8990
### -LogsDirectoryPath
90-
{{Fill LogsDirectoryPath Description}}
91+
Specifies the logs directory path.
9192
9293
```yaml
9394
Type: String
@@ -102,7 +103,7 @@ Accept wildcard characters: False
102103
```
103104
104105
### -PackageId
105-
{{Fill PackageId Description}}
106+
Specifies the Id of a package.
106107
107108
```yaml
108109
Type: String
@@ -117,7 +118,7 @@ Accept wildcard characters: False
117118
```
118119
119120
### -PackagePath
120-
{{Fill PackagePath Description}}
121+
Specifies the package path.
121122
122123
```yaml
123124
Type: String
@@ -132,7 +133,7 @@ Accept wildcard characters: False
132133
```
133134
134135
### -WprpFile
135-
{{Fill WprpFile Description}}
136+
Specifies the name of a wprp file.
136137
137138
```yaml
138139
Type: String

docset/windows/wsus/wsus.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ ms.assetid: D462BB6C-68B0-46A6-A3AD-2DD0523DB8BD
2424
## Description
2525
This reference provides cmdlet descriptions and syntax for all Windows Server Update Services (WSUS) Administration-specific cmdlets. It lists the cmdlets in alphabetical order based on the verb at the beginning of the cmdlet.
2626

27+
> [!NOTE]
28+
> All cmdlets except the ones referencing "DynamicCategory" are included in the **UpdateServices** module.
29+
2730
## WSUS Cmdlets
2831
### [Add-WsusComputer](./Add-WsusComputer.md)
2932
Adds a client computer to a target group.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ C:\PS>Get-ADDomainController -Discover -Service "GlobalCatalog"
8484

8585
Description
8686

87-
-----------
87+
Get a global catalog in the current forest using Discovery. Domain type name is used in this scenario.
8888

89-
Get a global catalog in the current forest using Discovery.
89+
-----------
9090

9191
### -------------------------- EXAMPLE 4 --------------------------
9292
```
@@ -97,7 +97,7 @@ Description
9797

9898
-----------
9999

100-
Get a global catalog in the current forest using Discovery.
100+
Get a global catalog in the current forest using Discovery. Domain type id is used in this scenario.
101101

102102
### -------------------------- EXAMPLE 5 --------------------------
103103
```

docset/winserver2012-ps/webadminstration/Set-WebConfigurationProperty.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,34 @@ Set-WebConfigurationProperty -Name <String> -InputObject <Object> [-Clr <String>
3131
```
3232

3333
## DESCRIPTION
34-
TheSet-WebConfigurationPropertycmdlet changes the value of an IIS configuration property.
34+
The Set-WebConfigurationProperty cmdlet changes the value of an IIS configuration property.
3535
The element can be specified as a configuration section or an XPath query.
3636
Globbing, the use of wildcards, is supported.
3737

3838
## EXAMPLES
3939

40-
### -------------- EXAMPLE 1: Change the extension of all handlers mapped to .aspx --------------
40+
### -------------------------- EXAMPLE 1 --------------------------
4141
```
4242
IIS:\>Set-WebConfigurationProperty "//handlers/add[@path='*.aspx']" -PSPath IIS:\ -Name path -Value "*.mspx"
4343
```
4444

4545
The cmdlet changes all handler paths to *.mspx that were mapped to *.aspx.
4646

47-
### -------------- EXAMPLE 2: Setting new Bindings on an existing Web site --------------
47+
### -------------------------- EXAMPLE 2 --------------------------
4848
```
4949
IIS:\>set-webconfigurationproperty '/system.applicationHost/sites/site[@name="DemoSite"]' -PSPath IIS:\ -Name Bindings -Value (@{protocol="http";bindingInformation="*:80:DemoSite1"},@{protocol="http";bindingInformation="*:80:DemoSite2"})
5050
```
5151

5252
The cmdlet sets new bindings on an existing Web site.
5353
The original bindings are replaced.
5454

55+
### -------------------------- EXAMPLE 3 --------------------------
56+
```
57+
IIS:\>set-webconfigurationproperty 'system.webserver/security/authentication/basicauthentication' -PSPath 'IIS:\sites\default web site\' -Name defaultlogondomain -Value 'contoso.com'
58+
```
59+
60+
The cmdlet sets the default domain of Basic Authentication settings on an existing Web site. Note that for this example to work, Custom Site Delegation for this type of Authentication must be set to Read/Write at the site level.
61+
5562
## PARAMETERS
5663

5764
### -AtElement
@@ -148,7 +155,7 @@ Accept wildcard characters: False
148155
```
149156
150157
### -Force
151-
If theForceparameter is used it causes the configuration property setting to be set at a level in the configuration hierarchy above a lock in the configuration.
158+
If the Force parameter is used it causes the configuration property setting to be set at a level in the configuration hierarchy above a lock in the configuration.
152159
153160
```yaml
154161
Type: SwitchParameter

0 commit comments

Comments
 (0)