Skip to content

Commit 86f3404

Browse files
authored
Merge branch 'master' into patch-17
2 parents 76b344e + 4f1600a commit 86f3404

File tree

6 files changed

+40
-35
lines changed

6 files changed

+40
-35
lines changed

docset/windows/addsadministration/get-adgroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ The following syntax uses Backus-Naur form to show how to use the PowerShell Exp
215215

216216
For a list of supported types for \<value\>, type `Get-Help about_ActiveDirectory_ObjectModel`.
217217

218-
Note: PowerShell wildcards other than *, such as ?, are not supported by the *Filter* syntax.
218+
Note: PowerShell wildcards other than \*, such as ?, are not supported by the *Filter* syntax.
219219

220220
Note: To query using LDAP query strings, use the *LDAPFilter* parameter.
221221

docset/windows/addsadministration/search-adaccount.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Accept wildcard characters: False
218218
Indicates that this cmdlet searches for accounts that have not logged in within a given time period or since a specified time.
219219
To specify a time period, use the *TimeSpan* parameter.
220220
To specify a specific time, use the *DateTime* parameter.
221-
Note that this attribute is only used when the domain is in Windows Server 2003 Domain Functional Level, so this parameter will only work in that mode.
221+
Note that this attribute is only used when the domain is in Windows Server 2003 Domain Functional Level or higher, so this parameter will only work in that mode.
222222
223223
```yaml
224224
Type: SwitchParameter

docset/windows/dism/add-windowscapability.md

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 12/21/2016
1111
ms.prod: w10
1212
ms.technology: powershell-windows
1313
ms.topic: reference
14-
online version:
14+
online version: https://docs.microsoft.com/powershell/module/dism/add-windowscapability?view=win10-ps
1515
schema: 2.0.0
1616
title: Add-WindowsCapability
1717
ms.reviewer:
@@ -43,25 +43,32 @@ The **Add-WindowsCapability** cmdlet acquires a Windows capability package from
4343

4444
## EXAMPLES
4545

46-
### Example 1: Add a Windows capability package to an image
46+
### Example 1: Add a Windows capability package to the running OS via the Windows Update client
4747
```
48-
PS C:\> Add-WindowsCapability -Name "Language.TextToSpeech~~~fr-FR~0.0.1.0" -Path "C:\offline" -Source "C:\Windows\winsxs"
48+
PS C:\> Add-WindowsCapability -Online -Name "Msix.PackagingTool.Driver~~~~0.0.1.0"
4949
```
50+
This command adds a Windows capability package to the running operating system. Because no source is specified, the Windows Update client will download the necessary package. It requires either an active Internet connection or an active network connection to the local Windows Server Update Services (WSUS) server.
5051

51-
This command adds a Windows capability package to the operating system image specified by the *Name* parameter at the path C:\offline.
52-
The *Source* parameter specifies the location of required files.
52+
### Example 2: Add a Windows capability package to the running OS using a locally stored package file
53+
```
54+
PS C:\> Add-WindowsCapability -Online -Name "Msix.PackagingTool.Driver~~~~0.0.1.0" -Source "E:\" -LimitAccess
55+
```
56+
57+
This command adds a Windows capability package specified by the *Name* parameter, to the running operating system. The *Source* parameter specifies the location of required files. For instance, if the running OS is a copy of Windows 10 version 1809, the `Msix-PackagingTool-Driver-Package~31bf3856ad364e35~amd64~~.cab` file must be present at `E:\`.
58+
59+
If the package specified by the *Name* parameter is already installed, this command does not return an error message, regardless of whether the required files are present at `E:\`.
5360

54-
### Example 2: Add a Windows capability package to the local host
61+
### Example 3: Add a Windows capability package to an image
5562
```
56-
PS C:\> Add-WindowsCapability -Name "Language.TextToSpeech~~~fr-FR~0.0.1.0" -Online -LimitAccess -Source "C:\Windows\winsxs"
63+
PS C:\> Add-WindowsCapability -Path "C:\mount\Windows" -Name "Msix.PackagingTool.Driver~~~~0.0.1.0" -Source "E:\"
5764
```
5865

59-
This command adds a windows capabilities package the local host while the operating system continues to run.
66+
This command adds a Windows capability package specified by the *Name* parameter, to the operating system image at the path C:\mount\Windows. The *Source* parameter specifies the location of required files. For instance, if the mount point contains a copy of Windows 10 version 1809, the `Msix-PackagingTool-Driver-Package~31bf3856ad364e35~amd64~~.cab` file must present at `E:\`.
6067

6168
## PARAMETERS
6269

6370
### -LimitAccess
64-
Indicates that this cmdlet does not access Windows Update for the source package.
71+
Indicates that this cmdlet does not query Windows Update for source packages when servicing a live OS. Only applies when the `-Online` switch is specified.
6572

6673
```yaml
6774
Type: SwitchParameter
@@ -92,14 +99,14 @@ Accepted values: Errors, Warnings, WarningsInfo
9299

93100
Required: False
94101
Position: Named
95-
Default value: None
102+
Default value: 3
96103
Accept pipeline input: True (ByPropertyName)
97104
Accept wildcard characters: False
98105
```
99106
100107
### -LogPath
101108
Specifies the full path and file name to log to.
102-
If not set, the default is `%WINDIR%\Logs\Dism\dism.log`.
109+
If not set, the default is `$env:WINDIR\Logs\Dism\dism.log`.
103110
In Windows PE, the default directory is the RAMDISK scratch space which can be as low as 32 MB.
104111
The log file will automatically be archived.
105112
The archived log file will be saved with .bak appended to the file name and a new log file will be generated.
@@ -185,13 +192,9 @@ Accept wildcard characters: False
185192
```
186193

187194
### -Source
188-
Specifies the location of the files that are required to add a Windows capability package to an image.
189-
You can specify the Windows directory of a mounted image or a running Windows installation that is shared on the network.
190-
191-
If you specify multiple *Source* arguments, the files are gathered from the first location where they are found and the rest of the locations are ignored.
192-
Separate source locations with a comma.
195+
Specifies the location of the files that are required to add a Windows capability package to an image. If you specify multiple *Source* arguments, the files are gathered from the first location where they are found and the rest of the locations are ignored. Separate source locations with a comma.
193196

194-
If you do not specify a *Source*, the default location set by Group Policy is used. If that fails, Windows Update is also used for online images, if *LimitAccess* is not specified. When all fail, the cmdlet fails silently; no exceptions are thrown.
197+
If you do not specify a *Source*, the default location set by Group Policy is used. If that fails, Windows Update is also used for online images, unless *LimitAccess* is specified. When all fail, the cmdlet fails silently; no exceptions are thrown.
195198

196199
*Source* can only be used when servicing images that are running at least Windows® 8 or Windows Server® 2012.
197200

@@ -252,9 +255,10 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
252255

253256
## NOTES
254257

255-
## RELATED LINKS
258+
As of Windows 10 version 1709, you cannot use Windows Server Update Services (WSUS) to host Features on Demand (FOD) and language packs for Windows 10 clients. Instead, you can enforce a Group Policy setting that tells the clients to download them directly from Windows Update. You can also host FOD and language packs on a network share, but starting with Windows 10 version 1809, FOD and language packs can only be installed from Windows Update. For more information, see [How to make Features on Demand and language packs available when you're using WSUS/SCCM](https://docs.microsoft.com/windows/deployment/update/fod-and-lang-packs).
256259

257-
[Get-WindowsCapability](./Get-WindowsCapability.md)
260+
## RELATED LINKS
258261

259-
[Remove-WindowsCapability](./Remove-WindowsCapability.md)
262+
- [Get-WindowsCapability](./Get-WindowsCapability.md)
263+
- [Remove-WindowsCapability](./Remove-WindowsCapability.md)
260264

docset/windows/failoverclusters/get-clusterlog.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Mode LastWriteTime Length Name
4848
-a--- 9/4/2008 3:53 PM 1261025 Cluster.log
4949
```
5050

51-
This command creates a log file for the local cluster in the cluster reports folder on each node of the cluster.
51+
This command creates a log file for the local cluster in the cluster reports folder (C:\Windows\Cluster\Reports) on each node of the cluster.
5252

5353
### Example 2: Create log files for each node and save them locally
5454
```
@@ -70,7 +70,7 @@ Mode LastWriteTime Length Name
7070
-a--- 9/4/2008 4:01 PM 104181 Cluster.log
7171
```
7272

73-
This command creates a log file for the local cluster in the cluster reports folder on each node of the cluster.
73+
This command creates a log file for the local cluster in the cluster reports folder (C:\Windows\Cluster\Reports) on each node of the cluster.
7474
The log covers the last 5 minutes.
7575

7676
## PARAMETERS
@@ -94,6 +94,7 @@ Accept wildcard characters: False
9494
### -Destination
9595
Specifies the location to which to copy one or more cluster logs.
9696
To copy to the current folder, use `.` for this parameter input.
97+
Default location is C:\Windows\Cluster\Reports.
9798

9899
```yaml
99100
Type: String

docset/windows/netsecurity/new-netfirewallrule.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ Specifies the ICMP type codes.
416416
The key encoding is specified by running the Set-NetFirewallSetting cmdlet with the *KeyEncoding* parameter.
417417
The acceptable values for this parameter are:
418418

419-
- ICMP type code: 0 through 255.
419+
- ICMP type code: 0-255.
420420
- ICMP type code pairs: 3:4.
421421
- Keyword: Any.
422422
A rule can be queried for this condition, modified by using the security filter object, or both.
@@ -483,8 +483,8 @@ The acceptable formats for this parameter are:
483483
- IPv4 Subnet (by network bit count): 1.2.3.4/24
484484
- IPv6 Subnet (by network bit count): fe80::1/48
485485
- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
486-
- IPv4 Range: 1.2.3.4 through 1.2.3.7
487-
- IPv6 Range: fe80::1 through fe80::9
486+
- IPv4 Range: 1.2.3.4-1.2.3.7
487+
- IPv6 Range: fe80::1-fe80::9
488488
Querying for rules with this parameter can only be performed using filter objects.
489489
See the Get-NetFirewallAddressFilter cmdlet for more information.
490490

@@ -528,12 +528,12 @@ Accept wildcard characters: False
528528
Specifies that network packets with matching IP local port numbers match this rule.
529529
The acceptable value is a port, range, or keyword and depends on the protocol.
530530
If the *Protocol* parameter value is TCP or UDP, then the acceptable values for this parameter are:
531-
- Port range: 0 through 65535.
531+
- Port range: 0-65535.
532532
- Port number: 80.
533533
- Keyword: PlayToDiscovery or Any.
534534
If the *Protocol* parameter value is ICMPv4 or ICMPv6, then the acceptable values for this parameter are:
535535
- An ICMP type, code pair: 0, 8.
536-
- Type and code: 0 through 255.
536+
- Type and code: 0-255.
537537
- Keyword: Any.
538538
If the *Protocol* parameter is not specified, then the acceptable values for this parameter are: RPC, RPCEPMap, Teredo, IPHTTPSIn, IPHTTPSOut, or Any.
539539
IPHTTPS is only supported on Windows Server 2012.
@@ -784,7 +784,7 @@ Specifies that network packets with matching IP addresses match this rule.
784784
This parameter specifies the protocol for an IPsec rule.
785785
The acceptable values for this parameter are:
786786

787-
- Protocols by number: 0 through 255.
787+
- Protocols by number: 0-255.
788788
- Protocols by name: TCP, UDP, ICMPv4, or ICMPv6.
789789
If a port number is identified by using port1 or port2, then this parameter must be set to TCP or UDP.
790790
The values ICMPv4 and ICMPv6 create a rule that exempts ICMP network traffic from the IPsec requirements of another rule.
@@ -815,8 +815,8 @@ The acceptable formats for this parameter are:
815815
- IPv4 Subnet (by network bit count): 1.2.3.4/24
816816
- IPv6 Subnet (by network bit count): fe80::1/48
817817
- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
818-
- IPv4 Range: 1.2.3.4 through 1.2.3.7
819-
- IPv6 Range: fe80::1 through fe80::9
818+
- IPv4 Range: 1.2.3.4-1.2.3.7
819+
- IPv6 Range: fe80::1-fe80::9
820820
- Keyword: Any, LocalSubnet, DNS, DHCP, WINS, DefaultGateway, Internet, Intranet, IntranetRemoteAccess, PlayToDevice. NOTE: Keywords can be restricted to IPv4 or IPv6 by appending a 4 or 6 (for example, keyword "LocalSubnet4" means that all local IPv4 addresses are matching this rule).
821821

822822
Querying for rules with this parameter can only be performed using filter objects.
@@ -859,12 +859,12 @@ This parameter value is the second end point of an IPsec rule.
859859
The acceptable value is a port, range, or keyword and depends on the protocol.
860860
If the protocol is TCP or UDP, then the acceptable values for this parameter are:
861861

862-
- Port range: 0 through 65535
862+
- Port range: 0-65535
863863
- Port number: 80
864864
- Keyword: Any
865865
If the protocol is ICMPv4 or ICMPv6, then the acceptable values for this parameter are:
866866
- An ICMP type, code pair: 0, 8
867-
- Type and code: 0 through 255
867+
- Type and code: 0-255
868868
- Keyword: Any.
869869

870870
If a protocol is not specified, then the acceptable values for this parameter are: Any, RPC, RPC-EPMap, or IPHTTPS.

docset/winserver2012r2-ps/addsadministration/Search-ADAccount.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Accept wildcard characters: False
224224
Indicates that this cmdlet searches for accounts that have not logged in within a given time period or since a specified time.
225225
To specify a time period, use the **TimeSpan** parameter.
226226
To specify a specific time, use the **DateTime** parameter.
227-
Note that this attribute is only used when the domain is in Windows Server 2003 Domain Functional Level, so this parameter will only work in that mode.
227+
Note that this attribute is only used when the domain is in Windows Server 2003 Domain Functional Level or higher, so this parameter will only work in that mode.
228228
229229
```yaml
230230
Type: SwitchParameter

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy