Skip to content

Commit 66ea913

Browse files
authored
Merge branch 'main' into patch-22
2 parents 51333fd + de48307 commit 66ea913

File tree

14 files changed

+32
-24
lines changed

14 files changed

+32
-24
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/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/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/storage/Get-Partition.md

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

71-
This example return all partitions, on all disks.
71+
This example returns all partitions, on all disks.
7272

7373
### Example 2
7474
```
@@ -80,7 +80,7 @@ PartitionNumber DriveLetter Offset Size
8080
1 H 1048576 298.09 GB IFS
8181
```
8282

83-
This example return all partitions on disk 5.
83+
This example returns all partitions on disk 5.
8484

8585
### Example 3
8686
```
@@ -92,7 +92,7 @@ PartitionNumber DriveLetter Offset Size
9292
2 C 368050176 465.42 GB IFS
9393
```
9494

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

9797
### Example 4
9898
```

docset/winserver2019-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

@@ -36,6 +36,7 @@ You can also use the **Get-ADGroup**, **Get-ADUser**, **Get-ADComputer**, **Get-
3636

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

4041
## EXAMPLES
4142

docset/winserver2019-ps/activedirectory/Set-ADUser.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ Accept wildcard characters: False
496496
Specifies the country or region code for the user's language of choice.
497497
This parameter sets the **Country** property of a user object.
498498
The LDAP display name (**ldapDisplayName**) of this property is c.
499+
This value uses the ISO-3166 2-character code (see [Country-Name attribute](/windows/win32/adschema/a-c)).
499500
This value is not used by Windows 2000.
500501

501502
```yaml

docset/winserver2019-ps/adfs/New-AdfsAzureMfaTenantCertificate.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ These commands create a certificate for Azure MFA, register the certificate in a
4848
### Example 2: Determine which certificate Azure MFA is using
4949
```
5050
$CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID
51-
$cert = Security.Cryptography.X509Certificates.X509Certificate2
52-
$cert | Format-List *
51+
[Security.Cryptography.X509Certificates.X509Certificate2]([System.Convert]::FromBase64String($CertInBase64))
5352
```
5453

5554
After AD FS has been configured for Azure MFA, this command determines which certificate Azure MFA is using and when it expires.

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

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

71-
This example return all partitions, on all disks.
71+
This example returns all partitions, on all disks.
7272

7373
### Example 2
7474
```
@@ -80,7 +80,7 @@ PartitionNumber DriveLetter Offset Size
8080
1 H 1048576 298.09 GB IFS
8181
```
8282

83-
This example return all partitions on disk 5.
83+
This example returns all partitions on disk 5.
8484

8585
### Example 3
8686
```
@@ -92,7 +92,7 @@ PartitionNumber DriveLetter Offset Size
9292
2 C 368050176 465.42 GB IFS
9393
```
9494

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

9797
### Example 4
9898
```

0 commit comments

Comments
 (0)