Skip to content

Commit e14a2fc

Browse files
authored
Merge branch 'main' into patch-143
2 parents 2974b6d + 1a98a8d commit e14a2fc

File tree

91 files changed

+2138
-972
lines changed

Some content is hidden

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

91 files changed

+2138
-972
lines changed

.github/ISSUE_TEMPLATE/00-bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "🐛 Report a documentation issue"
22
description: >-
33
Report an issue with current documentation.
44
labels:
5-
- doc-bug
5+
- issue-doc-bug
66
- needs-triage
77
body:
88
- type: markdown

.github/ISSUE_TEMPLATE/01-article.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "💡 Suggest a new document or idea"
22
description: >-
33
Suggest a new document or major rewrite of an existing one.
44
labels:
5-
- doc-idea
5+
- issue-doc-idea
66
- needs-triage
77
body:
88
- type: checkboxes

.github/ISSUE_TEMPLATE/02-quality.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: "🦾 Commit to a Quality Contribution"
22
description: >-
33
File an issue to take part in the PowerShell Docs Quality Contributions project.
4+
labels:
5+
- project-quality
46
title: "Quality: "
57
body:
68
- type: markdown

.github/workflows/quality.issue.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@ jobs:
1919
regex: "Quality: Foo"
2020
flags: gm
2121

22-
project:
23-
name: Add to project
24-
needs: quality
25-
if: needs.quality.outputs.check == 'true'
26-
runs-on: ubuntu-latest
27-
steps:
28-
- uses: actions/[email protected]
29-
with:
30-
project-url: https://github.com/orgs/MicrosoftDocs/projects/15/views/1
31-
github-token: ${{ secrets.quality_token }}
32-
3322
assign:
3423
name: Assign to author
3524
needs: quality

.github/workflows/quality.pr.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
needs.check.outputs.title == 'true'
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/add-[email protected]
36+
- uses: actions-ecosystem/action-add-labels@v1
3737
with:
38-
project-url: https://github.com/orgs/MicrosoftDocs/projects/15/views/1
39-
github-token: ${{ secrets.quality_token }}
38+
labels: project-quality

SECURITY.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!-- BEGIN MICROSOFT SECURITY.MD V0.0.8 BLOCK -->
2+
3+
## Security
4+
5+
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
6+
7+
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
8+
9+
## Reporting Security Issues
10+
11+
**Please do not report security vulnerabilities through public GitHub issues.**
12+
13+
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
14+
15+
If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
16+
17+
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc).
18+
19+
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
20+
21+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
22+
* Full paths of source file(s) related to the manifestation of the issue
23+
* The location of the affected source code (tag/branch/commit or direct URL)
24+
* Any special configuration required to reproduce the issue
25+
* Step-by-step instructions to reproduce the issue
26+
* Proof-of-concept or exploit code (if possible)
27+
* Impact of the issue, including how an attacker might exploit the issue
28+
29+
This information will help us triage your report more quickly.
30+
31+
If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
32+
33+
## Preferred Languages
34+
35+
We prefer all communications to be in English.
36+
37+
## Policy
38+
39+
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
40+
41+
<!-- END MICROSOFT SECURITY.MD BLOCK -->

docset/winserver2012-ps/dfsn/Get-DfsnFolder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Required: True
8989
Position: 0
9090
Default value: None
9191
Accept pipeline input: True (ByPropertyName)
92-
Accept wildcard characters: False
92+
Accept wildcard characters: True
9393
```
9494
9595
### -ThrottleLimit

docset/winserver2012-ps/wdac/Add-OdbcDsn.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ PS C:\> $newDsn = Add-OdbcDsn MyPayroll -DriverName "SQL Server Native Client 10
5151
This command is equivalent to example 2, but it saves the newly-created System DSN object into a PowerShell variable for future use.
5252
By default, this command does not return the driver object if the "PassThru" parameter is not specified:
5353

54-
### 4:
54+
### Example 4: Migrates DSNs to a newer version of a driver
5555
```
56-
C:\PS> $dsnArr = Get-OdbcDsn -DriverName 'SQL Server Native Client 10.0'
57-
C:\PS> foreach ($dsn in $dsnArr) {
56+
C:\PS> $DsnArray = Get-OdbcDsn -DriverName 'SQL Server Native Client 10.0'
57+
C:\PS> foreach ($dsn in $DsnArray) {
5858
Remove-OdbcDsn $dsn
5959
# You can change the property array as well,
6060
# if DSN attributes have been changed in the new driver version

docset/winserver2012r2-ps/dfsn/Get-DfsnFolder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Required: True
9191
Position: 0
9292
Default value: None
9393
Accept pipeline input: True (ByPropertyName)
94-
Accept wildcard characters: False
94+
Accept wildcard characters: True
9595
```
9696
9797
### -ThrottleLimit

docset/winserver2012r2-ps/nettcpip/Set-NetTCPSetting.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ Accept wildcard characters: False
9393
```
9494
9595
### -AutoReusePortRangeStartPort
96-
Specifies the number of ports for the auto-reuse port range, which is a port range used for local ephemeral port selection by outbound TCP connections for which either SO_REUSE_UNICASTPORT has been set on the socket, or for which connect() has been called without calling bind() on the socket.
9796
98-
If you specify 0, the auto-reuse feature is disabled and ephemeral ports are drawn instead from the dynamic port range as specified by *DynamicPortRangeStartPort* and *DynamicPortRangeNumberOfPorts*, even if SO_REUSE_UNICASTPORT is set on a socket.
97+
Specifies the starting port for the auto-reuse port range, which is a port range used for local ephemeral port selection by outbound TCP connections for which either SO_REUSE_UNICASTPORT has been set on the socket, or for which connect() has been called without calling bind() on the socket.
98+
99+
This parameter is required if you specify a value other than 0 for the AutoReusePortRangeStartPort parameter.
99100
100101
```yaml
101102
Type: UInt16

0 commit comments

Comments
 (0)