Skip to content

Commit 99250df

Browse files
authored
Merge branch 'docker:main' into main
2 parents 6a7a934 + 5408a2e commit 99250df

File tree

912 files changed

+77310
-13571
lines changed

Some content is hidden

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

912 files changed

+77310
-13571
lines changed

.github/CODEOWNERS

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
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-
/content/manuals/build/ @crazy-max @aevesdocker
6+
/content/manuals/build/ @crazy-max @ArthurFlag
77

8-
/content/manuals/build-cloud/ @crazy-max @aevesdocker
8+
/content/manuals/build-cloud/ @crazy-max @craig-osterhout
99

1010
/content/manuals/compose/ @aevesdocker
1111

@@ -19,26 +19,26 @@
1919

2020
/content/manuals/docker-hub/ @craig-osterhout
2121

22-
/content/manuals/engine/ @thaJeztah @aevesdocker
22+
/content/manuals/engine/ @thaJeztah @ArthurFlag
2323

24-
/content/reference/api/engine/ @thaJeztah @aevesdocker
24+
/content/reference/api/engine/ @thaJeztah @ArthurFlag
2525

26-
/content/reference/cli/ @thaJeztah @aevesdocker
26+
/content/reference/cli/ @thaJeztah @ArthurFlag
2727

2828
/content/manuals/subscription/ @sarahsanders-docker
2929

3030
/content/manuals/security/ @aevesdocker @sarahsanders-docker
3131

32-
/content/manuals/trusted-content/ @craig-osterhout
33-
34-
/content/manuals/docker-hub/official_images/ @craig-osterhout
35-
36-
/content/manuals/registry/ @craig-osterhout
37-
3832
/content/manuals/admin/ @sarahsanders-docker
3933

4034
/content/manuals/billing/ @sarahsanders-docker
4135

4236
/content/manuals/accounts/ @sarahsanders-docker
4337

44-
/_vendor @sarahsanders-docker
38+
/content/manuals/ai/ @ArthurFlag
39+
40+
/_vendor @sarahsanders-docker @ArthurFlag
41+
42+
/content/manuals/cloud/ @craig-osterhout
43+
44+
/content/manuals/dhi/ @craig-osterhout
Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
---
2+
applyTo: '**/*.md'
3+
---
4+
# Documentation Writing Instructions
5+
6+
These are our documentation writing style guidelines.
7+
8+
## General Style tips
9+
10+
* Get to the point fast.
11+
* Talk like a person.
12+
* Simpler is better.
13+
* Be brief. Give customers just enough information to make decisions confidently. Prune every excess word.
14+
* We use Hugo to generate our docs.
15+
16+
## Grammar
17+
18+
* Use present tense verbs (is, open) instead of past tense (was, opened).
19+
* Write factual statements and direct commands. Avoid hypotheticals like "could" or "would".
20+
* Use active voice where the subject performs the action.
21+
* Write in second person (you) to speak directly to readers.
22+
* Use gender-neutral language.
23+
* Avoid multiple -ing words that can create ambiguity.
24+
* Keep prepositional phrases simple and clear.
25+
* Place modifiers close to what they modify.
26+
27+
## Capitalization
28+
29+
* Use sentence-style capitalization for everything except proper nouns.
30+
* Always capitalize proper nouns.
31+
* Don’t capitalize the spelled-out form of an acronym unless it's a proper noun.
32+
* In programming languages, follow the traditional capitalization of keywords and other special terms.
33+
* Don't use all uppercase for emphasis.
34+
35+
## Numbers
36+
37+
* Spell out numbers for zero through nine, unless space is limited. Use numerals for 10 and above.
38+
* Spell out numbers at the beginning of a sentence.
39+
* Spell out ordinal numbers such as first, second, and third. Don't add -ly to form adverbs from ordinal numbers.
40+
41+
## Punctuation
42+
43+
* Use short, simple sentences.
44+
* End all sentences with a period.
45+
* Use one space after punctuation marks.
46+
* After a colon, capitalize only proper nouns.
47+
* Avoid semicolons - use separate sentences instead.
48+
* Use question marks sparingly.
49+
* Don't use slashes (/) - use "or" instead.
50+
51+
## Text formatting
52+
53+
* UI elements, like menu items, dialog names, and names of text boxes, should be in bold text.
54+
* Use code style for:
55+
* Code elements, like method names, property names, and language keywords.
56+
* SQL commands.
57+
* Command-line commands.
58+
* Database table and column names.
59+
* Resource names (like virtual machine names) that shouldn't be localized.
60+
* URLs that you don't want to be selectable.
61+
* For code placeholders, if you want users to replace part of an input string with their own values, use angle brackets (less than < and greater than > characters) on that placeholder text.
62+
* Don't apply an inline style like italic, bold, or inline code style to headings.
63+
64+
## Alerts
65+
66+
* Alerts are a Markdown extension to create block quotes that render with colors and icons that indicate the significance of the content. The following alert types are supported:
67+
68+
* `[!NOTE]` Information the user should notice even if skimming.
69+
* `[!TIP]` Optional information to help a user be more successful.
70+
* `[!IMPORTANT]` Essential information required for user success.
71+
* `[!CAUTION]` Negative potential consequences of an action.
72+
* `[!WARNING]` Dangerous certain consequences of an action.
73+
74+
## Links
75+
76+
* Links to other documentation articles should be relative, not absolute. Include the `.md` suffix.
77+
* Links to bookmarks within the same article should be relative and start with `#`.
78+
* Link descriptions should be descriptive and make sense on their own. Don't use "click here" or "this link" or "here".
79+
80+
## Images
81+
82+
* Use images only when they add value.
83+
* Images have a descriptive and meaningful alt text that starts with "Screenshot showing" and ends with ".".
84+
* Videos have a descriptive and meaningful alt text or title that starts with "Video showing" and ends with ".".
85+
86+
## Numbered steps
87+
88+
* Write complete sentences with capitalization and periods
89+
* Use imperative verbs
90+
* Clearly indicate where actions take place (UI location)
91+
* For single steps, use a bullet instead of a number
92+
* When allowed, use angle brackets for menu sequences (File > Open)
93+
* When writing ordered lists, only use 1's.
94+
95+
## Terminology
96+
97+
* Use "Select" instead of "Click" for UI elements like buttons, menu items, links, dropdowns, and checkboxes.
98+
* Use "might" instead of "may" for conditional statements.
99+
* Avoid latin abbreviations like "e.g.". Use "for example" instead.
100+
* Use the verb "to enable" instead "to allow" unless you're referring to permissions.
101+
* Follow the terms and capitalization guidelines in #fetch [VS Code docs wiki](https://github.com/microsoft/vscode-docs/wiki/VS-Code-glossary)
102+
103+
104+
## Complete style guide
105+
106+
Find all the details of the style guide in these files:
107+
108+
- `./content/contribute/style/grammar.md` – Grammar rules
109+
- `./content/contribute/style/formatting.md` – Formatting rules
110+
- `./content/contribute/style/recommended-words.md` – Approved words and phrasing
111+
- `./content/contribute/style/voice-tone.md` – Voice and tone guidance

.github/labeler.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
area/ai:
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- content/manuals/ai/**
5+
- content/reference/cli/model/**
6+
17
area/release:
28
- changed-files:
39
- any-glob-to-any-file:
@@ -44,6 +50,11 @@ area/build-cloud:
4450
- any-glob-to-any-file:
4551
- content/manuals/build-cloud/**
4652

53+
area/cloud:
54+
- changed-files:
55+
- any-glob-to-any-file:
56+
- content/manuals/cloud/**
57+
4758
area/compose:
4859
- changed-files:
4960
- any-glob-to-any-file:
@@ -56,6 +67,11 @@ area/desktop:
5667
- any-glob-to-any-file:
5768
- content/manuals/desktop/**
5869

70+
area/dhi:
71+
- changed-files:
72+
- any-glob-to-any-file:
73+
- content/manuals/dhi/**
74+
5975
area/engine:
6076
- changed-files:
6177
- any-glob-to-any-file:
@@ -173,7 +189,6 @@ hugo:
173189
- hugo_stats.json
174190
- i18n/**
175191
- layouts/**
176-
- postcss.config.js
177192
- static/**
178193
- tailwind.config.js
179194

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
mode: 'edit'
3+
---
4+
5+
Imagine you're an experienced technical writer. You need to review content for
6+
how fresh and up to date it is. Apply the following:
7+
8+
1. Fix spelling errors and typos
9+
2. Verify whether the markdown structure conforms to common markdown standards
10+
3. Ensure the content follows our [style guide file](../instructions/styleguide-instructions.md) as a guide.
11+
4. Make sure the titles on the page provide better context about the content (for an improved search experience).
12+
5. Ensure all the components formatted correctly.
13+
6. Improve the SEO keywords.
14+
7. If you find numbered lists, make sure their numbering only uses 1's.
15+
16+
Do your best and don't be lazy.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
mode: 'edit'
3+
---
4+
5+
Imagine you're an experienced technical writer. You need to review content for
6+
how fresh and up to date it is. Apply the following:
7+
8+
1. Improve the presentational layer - components, splitting up the page into smaller pages
9+
Consider the following:
10+
11+
1. Can you use tabs to display multiple variants of the same steps?
12+
2. Can you make a key item of information stand out with a call-out?
13+
3. Can you reduce a large amount of text to a series of bullet points?
14+
4. Are there other code components you could use?
15+
2. Check if any operating systems or package versions mentioned are still current and supported
16+
3. Check the accuracy of the content
17+
4. If appropriate, follow the document from start to finish to see if steps make sense in sequence
18+
5. Try to add some helpful next steps to the end of the document, but only if there are no *Next steps* or *Related pages* section, already.
19+
6. Try to clarify, shorten or improve the efficiency of some sentences.
20+
7. Check for LLM readibility.
21+
22+
Do your best and don't be lazy.

.github/prompts/review.prompt.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
mode: edit
3+
description: You are a technical writer reviewing an article for clarity, conciseness, and adherence to the documentation writing style guidelines.
4+
---
5+
Review the article for clarity, conciseness, and adherence to our documentation [style guidelines](../instructions/styleguide-instructions.md).
6+
7+
Provide concrete and practical suggestions for improvement.

.github/workflows/build.yml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ jobs:
3636
files: |
3737
docker-bake.hcl
3838
targets: releaser-build
39-
set: |
40-
*.cache-from=type=gha,scope=releaser
41-
*.cache-to=type=gha,scope=releaser,mode=max
4239

4340
build:
4441
runs-on: ubuntu-24.04
@@ -59,9 +56,6 @@ jobs:
5956
files: |
6057
docker-bake.hcl
6158
targets: release
62-
set: |
63-
*.cache-from=type=gha,scope=build
64-
*.cache-to=type=gha,scope=build,mode=max
6559
-
6660
name: Check Cloudfront config
6761
uses: docker/bake-action@v6
@@ -74,42 +68,43 @@ jobs:
7468
AWS_CLOUDFRONT_ID: 0123456789ABCD
7569
AWS_LAMBDA_FUNCTION: DockerDocsRedirectFunction-dummy
7670

77-
vale:
78-
if: ${{ github.event_name == 'pull_request' }}
79-
runs-on: ubuntu-24.04
80-
steps:
81-
- uses: actions/checkout@v4
82-
- uses: errata-ai/vale-action@reviewdog
83-
env:
84-
PIP_BREAK_SYSTEM_PACKAGES: 1
85-
with:
86-
files: content
87-
8871
validate:
8972
runs-on: ubuntu-24.04
9073
strategy:
9174
fail-fast: false
9275
matrix:
9376
target:
9477
- lint
78+
- vale
9579
- test
9680
- unused-media
9781
- test-go-redirects
9882
- dockerfile-lint
9983
- path-warnings
84+
- validate-vendor
10085
steps:
86+
-
87+
name: Checkout
88+
uses: actions/checkout@v4
10189
-
10290
name: Set up Docker Buildx
10391
uses: docker/setup-buildx-action@v3
10492
-
10593
name: Validate
10694
uses: docker/bake-action@v6
10795
with:
96+
source: .
10897
files: |
10998
docker-bake.hcl
11099
targets: ${{ matrix.target }}
111-
set: |
112-
*.args.BUILDKIT_CONTEXT_KEEP_GIT_DIR=1
113-
*.cache-to=type=gha,scope=validate-${{ matrix.target }},mode=max
114-
*.cache-from=type=gha,scope=validate-${{ matrix.target }}
115-
*.cache-from=type=gha,scope=build
100+
-
101+
name: Install reviewdog
102+
if: ${{ matrix.target == 'vale' && github.event_name == 'pull_request' }}
103+
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.2
104+
-
105+
name: Run reviewdog for vale
106+
if: ${{ matrix.target == 'vale' && github.event_name == 'pull_request' }}
107+
run: |
108+
cat ./tmp/vale.out | reviewdog -f=rdjsonl -name=vale -reporter=github-pr-annotations -fail-on-error=false -filter-mode=added -level=info
109+
env:
110+
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)