Skip to content

Commit 9e8dff7

Browse files
authored
Merge branch 'main' into patch-1
2 parents 340bfcc + 0901d97 commit 9e8dff7

File tree

42 files changed

+128
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+128
-76
lines changed

docset/winserver2012-ps/activedirectory/Move-ADObject.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Move-ADObject [-WhatIf] [-Confirm] [-AuthType <ADAuthType>] [-Credential <PSCred
1919
```
2020

2121
## DESCRIPTION
22-
The Move-ADObject cmdlet moves an object or a container of objects from one container to another or from one domain to another.
22+
The **Move-ADObject** cmdlet moves an object or a container of objects from one container to another or from one domain to another within the same forest.
2323

2424
The Identity parameter specifies the Active Directory object or container to move.
2525
You can identify an object or container by its distinguished name (DN) or GUID.
@@ -30,6 +30,8 @@ You can also use the Get-ADGroup, Get-ADUser, Get-ADComputer, Get-ADServiceAccou
3030
The TargetPath parameter must be specified.
3131
This parameter identifies the new location for the object or container.
3232

33+
The cmdlet also moves the password when a user or computer object is moved across domains within a forest.
34+
3335
## EXAMPLES
3436

3537
### -------------------------- EXAMPLE 1 --------------------------

docset/winserver2012-ps/dhcpserver/Add-DhcpServerv4OptionDefinition.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,23 @@ Accept wildcard characters: False
208208

209209
### -Type
210210
Specifies the data type of the values for this option.
211-
The acceptable values for this parameter are: Byte, Word, DWord, DWordDword, IPAddress, String, BinaryData, EncapsulatedData or IPv6Address.
211+
The acceptable values for this parameter are:
212+
213+
- Byte
214+
- Word
215+
- DWord
216+
- DWordDword
217+
- IPAddress
218+
- String
219+
- BinaryData
220+
- EncapsulatedData
221+
- IPv6Address
212222

213223
```yaml
214224
Type: String
215225
Parameter Sets: (All)
216226
Aliases:
227+
Accepted values: Byte, Word, DWord, DWordDWord, IPv4Address, IPv6Address, String, BinaryData, EncapsulatedData
217228
218229
Required: True
219230
Position: 3

docset/winserver2012-ps/smbshare/New-SmbShare.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ The **New-SMBShare** cmdlet exposes a file system folder to remote clients as a
2525

2626
To delete a share that was created by this cmdlet, use the Remove-SMBShare cmdlet.
2727

28+
> [!NOTE]
29+
> The **WhatIf** parameter does not work with this cmdlet.
30+
2831
## EXAMPLES
2932

3033
### EXAMPLE 1
@@ -376,8 +379,6 @@ Accept wildcard characters: False
376379
Shows what would happen if the cmdlet runs.
377380
The cmdlet is not run.
378381

379-
NOTE: The WhatIf switch does not work with this cmdlet.
380-
381382
```yaml
382383
Type: SwitchParameter
383384
Parameter Sets: (All)

docset/winserver2012-ps/storage/Get-Partition.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ This cmdlet will return a Volume object or a set of Volume objects given paramet
5050
PS C:\>Get-Partition
5151
```
5252

53-
This example return all partitions, on all disks.
53+
This example returns all partitions, on all disks.
5454

5555
### EXAMPLE 2
5656
```
@@ -62,7 +62,7 @@ PartitionNumber DriveLetter Offset Size
6262
1 H 1048576 298.09 GB IFS
6363
```
6464

65-
This example return all partitions on disk 5.
65+
This example returns all partitions on disk 5.
6666

6767
### EXAMPLE 3
6868
```
@@ -74,7 +74,7 @@ PartitionNumber DriveLetter Offset Size
7474
2 C 368050176 465.42 GB IFS
7575
```
7676

77-
This example partition associated with the volume for drive letter C.
77+
This example returns partitions associated with the volume for drive letter C.
7878

7979
### EXAMPLE 4
8080
```

docset/winserver2012r2-ps/activedirectory/Move-ADObject.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Move-ADObject [-WhatIf] [-Confirm] [-AuthType <ADAuthType>] [-Credential <PSCred
2121
```
2222

2323
## DESCRIPTION
24-
The **Move-ADObject** cmdlet moves an object or a container of objects from one container to another or from one domain to another.
24+
The **Move-ADObject** cmdlet moves an object or a container of objects from one container to another or from one domain to another within the same forest.
2525

2626
The **Identity** parameter specifies the Active Directory object or container to move.
2727
You can identify an object or container by its distinguished name or GUID.
@@ -31,6 +31,7 @@ You can also use the Get-ADGroup, Get-ADUser, Get-ADComputer, Get-ADServiceAccou
3131

3232
The **TargetPath** parameter must be specified.
3333
This parameter identifies the new location for the object or container.
34+
The cmdlet also moves the password when a user or computer object is moved across domains within a forest.
3435

3536
## EXAMPLES
3637

docset/winserver2012r2-ps/dhcpserver/Add-DhcpServerv4OptionDefinition.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,23 @@ Accept wildcard characters: False
226226

227227
### -Type
228228
Specifies the data type of the values for this option.
229-
The acceptable values for this parameter are: Byte, Word, DWord, DWordDword, IPAddress, String, BinaryData, EncapsulatedData or IPv6Address.
229+
The acceptable values for this parameter are:
230+
231+
- Byte
232+
- Word
233+
- DWord
234+
- DWordDword
235+
- IPAddress
236+
- String
237+
- BinaryData
238+
- EncapsulatedData
239+
- IPv6Address
230240

231241
```yaml
232242
Type: String
233243
Parameter Sets: (All)
234244
Aliases:
235-
Accepted values: Byte, Word, DWord, DWordDWord, IPv4Address, String, BinaryData, EncapsulatedData
245+
Accepted values: Byte, Word, DWord, DWordDWord, IPv4Address, IPv6Address, String, BinaryData, EncapsulatedData
236246
237247
Required: True
238248
Position: 3

docset/winserver2012r2-ps/smbshare/New-SmbShare.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ The **New-SMBShare** cmdlet exposes a file system folder to remote clients as a
2828

2929
To delete a share that was created by this cmdlet, use the Remove-SMBShare cmdlet.
3030

31+
> [!NOTE]
32+
> The **WhatIf** parameter does not work with this cmdlet.
33+
3134
## EXAMPLES
3235

3336
### EXAMPLE 1
@@ -396,8 +399,6 @@ Accept wildcard characters: False
396399
Shows what would happen if the cmdlet runs.
397400
The cmdlet is not run.
398401

399-
NOTE: The WhatIf switch does not work with this cmdlet.
400-
401402
```yaml
402403
Type: SwitchParameter
403404
Parameter Sets: (All)

docset/winserver2012r2-ps/storage/Get-Partition.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ This cmdlet will return a Volume object or a set of Volume objects given paramet
5555
PS C:\>Get-Partition
5656
```
5757

58-
This example return all partitions, on all disks.
58+
This example returns all partitions, on all disks.
5959

6060
### EXAMPLE 2
6161
```
@@ -67,7 +67,7 @@ PartitionNumber DriveLetter Offset Size
6767
1 H 1048576 298.09 GB IFS
6868
```
6969

70-
This example return all partitions on disk 5.
70+
This example returns all partitions on disk 5.
7171

7272
### EXAMPLE 3
7373
```
@@ -79,7 +79,7 @@ PartitionNumber DriveLetter Offset Size
7979
2 C 368050176 465.42 GB IFS
8080
```
8181

82-
This example partition associated with the volume for drive letter C.
82+
This example returns partitions associated with the volume for drive letter C.
8383

8484
### EXAMPLE 4
8585
```

docset/winserver2016-ps/activedirectory/Move-ADObject.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Move-ADObject [-WhatIf] [-Confirm] [-AuthType <ADAuthType>] [-Credential <PSCred
2222
```
2323

2424
## DESCRIPTION
25-
The **Move-ADObject** cmdlet moves an object or a container of objects from one container to another or from one domain to another.
25+
The **Move-ADObject** cmdlet moves an object or a container of objects from one container to another or from one domain to another within the same forest.
2626

2727
When an object is moved between domains, both the source DC and the target DC need to be the RID Master of their domains. If a different DC is being used, you will receive the following error:
2828

@@ -37,6 +37,7 @@ You can also use the **Get-ADGroup**, **Get-ADUser**, **Get-ADComputer**, **Get-
3737
The *TargetPath* parameter must be specified.
3838
This parameter identifies the new location for the object or container.
3939

40+
The cmdlet also moves the password when a user or computer object is moved across domains within a forest.
4041
## EXAMPLES
4142

4243
### Example 1: Move an OU to a new location

docset/winserver2016-ps/defender/Set-MpPreference.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Configures preferences for Windows Defender scans and updates.
1515

1616
## SYNTAX
1717

18-
```
18+
19+
```powershell
1920
Set-MpPreference [-ExclusionPath <String[]>] [-ExclusionExtension <String[]>] [-ExclusionProcess <String[]>]
2021
[-RealTimeScanDirection <ScanDirection>] [-QuarantinePurgeItemsAfterDelay <UInt32>]
2122
[-RemediationScheduleDay <Day>] [-RemediationScheduleTime <DateTime>]
@@ -66,14 +67,16 @@ The following table provides remediation action values for detected threats at l
6667
## EXAMPLES
6768

6869
### Example 1: Schedule to check for definition updates everyday
69-
```
70+
71+
```sql
7072
PS C:\> Set-MpPreference -SignatureScheduleDay Everyday
7173
```
7274

7375
This command configures preferences to check for definition updates every day.
7476

7577
### Example 2: Schedule a time of day to check for definition updates
76-
```
78+
79+
```sql
7780
PS C:\> Set-MpPreference -SignatureScheduleTime 120
7881
```
7982

@@ -780,7 +783,7 @@ The acceptable values for this parameter are: integers from 5 through 100, and t
780783
Windows Defender does not exceed the percentage of CPU usage that you specify.
781784
The default value is 50.
782785
783-
Note: This is not a hard limit but rather a guidance for the scanning engine to not exceed this maximum on average.
786+
Note: This is not a hard limit but rather a guidance for the scanning engine to not exceed this maximum on average. If ScanOnlyIfIdleEnabled (instructing the product to scan only when the computer is not in use) and DisableCpuThrottleOnIdleScans (instructing the product to disable CPU throttling on idle scans) are both enabled, then the value of ScanAvgCPULoadFactor is ignored.
784787
785788
```yaml
786789
Type: Byte
@@ -1253,3 +1256,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
12531256
[Get-MpPreference](./Get-MpPreference.md)
12541257

12551258
[Remove-MpPreference](./Remove-MpPreference.md)
1259+

0 commit comments

Comments
 (0)