Skip to content

Commit c15f36a

Browse files
Merge branch 'main' of github-private.com:kristiyan-velkov/docker-docs into feat/update-node-js-guide
2 parents f6bcdd7 + 0a34ff4 commit c15f36a

File tree

810 files changed

+38325
-11870
lines changed

Some content is hidden

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

810 files changed

+38325
-11870
lines changed

.github/CODEOWNERS

Lines changed: 8 additions & 8 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 @ArthurFlag
6+
/content/manuals/build/ @aevesdocker
77

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

1010
/content/manuals/compose/ @aevesdocker
1111

@@ -19,11 +19,11 @@
1919

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

22-
/content/manuals/engine/ @thaJeztah @ArthurFlag
22+
/content/manuals/engine/ @usha-mandya
2323

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

26-
/content/reference/cli/ @thaJeztah @ArthurFlag
26+
/content/reference/cli/ @usha-mandya
2727

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

@@ -35,10 +35,10 @@
3535

3636
/content/manuals/accounts/ @sarahsanders-docker
3737

38-
/content/manuals/ai/ @ArthurFlag
38+
/content/manuals/ai/ @usha-mandya
3939

40-
/_vendor @sarahsanders-docker @ArthurFlag
40+
/_vendor @sarahsanders-docker
4141

42-
/content/manuals/cloud/ @craig-osterhout
42+
/content/manuals/offload/ @craig-osterhout
4343

4444
/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: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ area/build-cloud:
5050
- any-glob-to-any-file:
5151
- content/manuals/build-cloud/**
5252

53-
area/cloud:
53+
area/offload:
5454
- changed-files:
5555
- any-glob-to-any-file:
56-
- content/manuals/cloud/**
56+
- content/manuals/offload/**
5757

5858
area/compose:
5959
- changed-files:
@@ -181,6 +181,11 @@ area/copilot:
181181
- any-glob-to-any-file:
182182
- content/manuals/copilot/**
183183

184+
ci:
185+
- changed-files:
186+
- any-glob-to-any-file:
187+
- .github/workflows/**
188+
184189
hugo:
185190
- changed-files:
186191
- any-glob-to-any-file:
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
8. Ensure each line is limited to 80 characters.
16+
17+
Do your best and don't be lazy.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
8. Ensure each line is limited to 80 characters.
22+
23+
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 & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
-
4646
name: Checkout
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848
-
4949
name: Set up Docker Buildx
5050
uses: docker/setup-buildx-action@v3
@@ -68,40 +68,43 @@ jobs:
6868
AWS_CLOUDFRONT_ID: 0123456789ABCD
6969
AWS_LAMBDA_FUNCTION: DockerDocsRedirectFunction-dummy
7070

71-
vale:
72-
if: ${{ github.event_name == 'pull_request' }}
73-
runs-on: ubuntu-24.04
74-
steps:
75-
- uses: actions/checkout@v4
76-
- uses: errata-ai/vale-action@reviewdog
77-
env:
78-
PIP_BREAK_SYSTEM_PACKAGES: 1
79-
with:
80-
files: content
81-
8271
validate:
8372
runs-on: ubuntu-24.04
8473
strategy:
8574
fail-fast: false
8675
matrix:
8776
target:
8877
- lint
78+
- vale
8979
- test
9080
- unused-media
9181
- test-go-redirects
9282
- dockerfile-lint
9383
- path-warnings
9484
- validate-vendor
9585
steps:
86+
-
87+
name: Checkout
88+
uses: actions/checkout@v5
9689
-
9790
name: Set up Docker Buildx
9891
uses: docker/setup-buildx-action@v3
9992
-
10093
name: Validate
10194
uses: docker/bake-action@v6
10295
with:
96+
source: .
10397
files: |
10498
docker-bake.hcl
10599
targets: ${{ matrix.target }}
106-
set: |
107-
*.args.BUILDKIT_CONTEXT_KEEP_GIT_DIR=1
100+
-
101+
name: Install reviewdog
102+
if: ${{ matrix.target == 'vale' && github.event_name == 'pull_request' }}
103+
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
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 -fail-level=warning
109+
env:
110+
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: deploy
2-
2+
# Deploys the Docker Docs website when merging to the `main` branch.
33
concurrency:
44
group: ${{ github.workflow }}-${{ github.ref }}
55
cancel-in-progress: true
@@ -8,9 +8,8 @@ on:
88
workflow_dispatch:
99
push:
1010
branches:
11-
- lab
1211
- main
13-
- published
12+
- lab
1413

1514
env:
1615
# Use edge release of buildx (latest RC, fallback to latest stable)
@@ -22,6 +21,8 @@ permissions:
2221
id-token: write
2322
contents: read
2423

24+
# The `main` branch is deployed to the production environment.
25+
# The `lab` branch is deployed to a separate environment for testing purposes.
2526
jobs:
2627
publish:
2728
runs-on: ubuntu-24.04
@@ -30,26 +31,16 @@ jobs:
3031
-
3132
name: Prepare
3233
run: |
33-
HUGO_ENV=development
3434
DOCS_AWS_REGION=us-east-1
35+
HUGO_ENV=production
3536
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
36-
HUGO_ENV=staging
37-
DOCS_URL="https://docs-stage.docker.com"
38-
DOCS_AWS_IAM_ROLE="arn:aws:iam::710015040892:role/stage-docs-docs.docker.com-20220818202135984800000001"
39-
DOCS_S3_BUCKET="stage-docs-docs.docker.com"
40-
DOCS_S3_CONFIG="s3-config.json"
41-
DOCS_CLOUDFRONT_ID="E1R7CSW3F0X4H8"
42-
DOCS_LAMBDA_FUNCTION_REDIRECTS="DockerDocsRedirectFunction-stage"
43-
DOCS_SLACK_MSG="Successfully deployed docs-stage from main branch. $DOCS_URL"
44-
elif [ "${{ github.ref }}" = "refs/heads/published" ]; then
45-
HUGO_ENV=production
4637
DOCS_URL="https://docs.docker.com"
4738
DOCS_AWS_IAM_ROLE="arn:aws:iam::710015040892:role/prod-docs-docs.docker.com-20220818202218674300000001"
4839
DOCS_S3_BUCKET="prod-docs-docs.docker.com"
4940
DOCS_S3_CONFIG="s3-config.json"
5041
DOCS_CLOUDFRONT_ID="E228TTN20HNU8F"
5142
DOCS_LAMBDA_FUNCTION_REDIRECTS="DockerDocsRedirectFunction-prod"
52-
DOCS_SLACK_MSG="Successfully deployed docs from published branch. $DOCS_URL"
43+
DOCS_SLACK_MSG="Successfully deployed docs from the main branch. $DOCS_URL"
5344
elif [ "${{ github.ref }}" = "refs/heads/lab" ]; then
5445
HUGO_ENV=lab
5546
DOCS_URL="https://docs-labs.docker.com"
@@ -79,7 +70,7 @@ jobs:
7970
echo "SEND_SLACK_MSG=$SEND_SLACK_MSG" >> $GITHUB_ENV
8071
-
8172
name: Checkout
82-
uses: actions/checkout@v4
73+
uses: actions/checkout@v5
8374
with:
8475
fetch-depth: 0
8576
-
@@ -100,7 +91,7 @@ jobs:
10091
-
10192
name: Configure AWS Credentials
10293
if: ${{ env.DOCS_AWS_IAM_ROLE != '' }}
103-
uses: aws-actions/configure-aws-credentials@v4
94+
uses: aws-actions/configure-aws-credentials@v5
10495
with:
10596
role-to-assume: ${{ env.DOCS_AWS_IAM_ROLE }}
10697
aws-region: ${{ env.DOCS_AWS_REGION }}

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
steps:
1717
-
1818
name: Run
19-
uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
19+
uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1

0 commit comments

Comments
 (0)