Skip to content

Commit ff6e04a

Browse files
committed
Merge branch 'master' into patch-1
2 parents c713717 + 3fe2d7a commit ff6e04a

File tree

1,110 files changed

+26311
-20472
lines changed

Some content is hidden

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

1,110 files changed

+26311
-20472
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.DS_Store
2-
.git
32
.github
43
.gitignore
54
.idea

.github/CODEOWNERS

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@
33

44
# For more details, see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
55

6-
/build @dockertopia @crazy-max
6+
/build/ @crazy-max @jedevc @dvdksn
77

8-
/compose/ @dockertopia @usha-mandya
8+
/compose/ @usha-mandya @aevesdocker
99

10-
/desktop/ @aevesdocker @usha-mandya
10+
/desktop/ @aevesdocker
1111

1212
/docker-hub/ @jerae-duffin @craig-osterhout
1313

14-
/engine/ @dockertopia @usha-mandya
14+
/engine/ @dvdksn
1515

16-
/registry/ @usha-mandya
16+
/subscription/ @jerae-duffin
1717

18-
/single-sign-on/ @jerae-duffin
18+
/docker-hub/publish/ @dvdksn
1919

20-
/single-sign-on/index.md @craig-osterhout
20+
/docker-hub/official_images/ @dvdksn
2121

22-
/subscription/ @jerae-duffin
22+
/registry/ @dvdksn
23+
24+
/atomist/ @dvdksn

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This repository is for reporting issues related to Docker Documentation. Before submitting a new issue, check whether the issue has already been reported. You can join the discussion using an emoji, or by adding a comment to an existing issue.
77
8-
You can ask general questions and get community support through the Docker Community Slack - http://dockr.ly/slack. Personalized support is available through the Docker Pro, Team, and Business subscriptions. See https://www.docker.com/pricing for details.
8+
You can ask general questions and get community support through the Docker Community Forums - https://forums.docker.com/ and Slack - http://dockr.ly/slack. Personalized support is available through the Docker Pro, Team, and Business subscriptions. See https://www.docker.com/pricing for details.
99
1010
-->
1111

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
1-
<!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md)
2-
for this project's contribution guidelines. Remove these comments
3-
as you go.-->
1+
<!--
2+
Thank you for contributing to Docker documentation!
3+
4+
Here are a few things to keep in mind:
5+
6+
- Links between pages should use a relative path
7+
- Remember to add an alt text for images
8+
9+
┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
10+
┃ Review our contribution guidelines: ┃
11+
┃ ┃
12+
┃ https://docs.docker.com/contribute/overview/ ┃
13+
┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
14+
-->
415

516
### Proposed changes
617

7-
<!--Tell us what you did and why-->
18+
<!-- Tell us what you did and why -->
819

920
### Related issues (optional)
1021

11-
<!--Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'.
12-
Or link to full URLs to issues or pull requests in other Github projects -->
22+
<!--
23+
Refer to related PRs or issues:
24+
25+
#1234
26+
Closes #1234
27+
Closes docker/cli#1234
28+
-->

.github/vale/Docker/Acronyms.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
extends: conditional
2+
message: "'%s' has no definition."
3+
link: https://docs.docker.com/contribute/style/grammar/#acronyms-and-initialisms
4+
level: warning
5+
ignorecase: false
6+
# Ensures that the existence of 'first' implies the existence of 'second'.
7+
first: '\b([A-Z]{3,5})\b'
8+
second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{3,5})\)'
9+
# ... with the exception of these:
10+
exceptions:
11+
- API
12+
- ASP
13+
- CLI
14+
- CPU
15+
- CSS
16+
- CSV
17+
- DEBUG
18+
- DOM
19+
- DPI
20+
- FAQ
21+
- GCC
22+
- GDB
23+
- GET
24+
- GPU
25+
- GTK
26+
- GUI
27+
- HEAD
28+
- HTML
29+
- HTTP
30+
- HTTPS
31+
- IDE
32+
- JAR
33+
- JSON
34+
- JSX
35+
- LESS
36+
- LLDB
37+
- NET
38+
- NOTE
39+
- NVDA
40+
- OSS
41+
- PATH
42+
- PDF
43+
- PHP
44+
- POST
45+
- RAM
46+
- REPL
47+
- RSA
48+
- SCM
49+
- SCSS
50+
- SDK
51+
- SQL
52+
- SSH
53+
- SSL
54+
- SVG
55+
- TBD
56+
- TCP
57+
- TODO
58+
- URI
59+
- URL
60+
- USB
61+
- UTF
62+
- XML
63+
- XSS
64+
- YAML
65+
- ZIP

0 commit comments

Comments
 (0)