Skip to content

Commit ce2a5d6

Browse files
aevesdockeraevesdocker
authored
Merge pull request #22991 from docker/mrge-conflicts
publish updates from main
2 parents 3f79093 + dd02d37 commit ce2a5d6

37 files changed

+576
-72
lines changed

‎.gitignore‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
**/.DS_Store
2-
**/desktop.ini
1+
.hugo_build.lock
2+
.idea/
3+
.vscode/mcp.json
34
.vscode/settings.json
45
.vscode/tasks.json
6+
**/.DS_Store
7+
**/desktop.ini
58
node_modules
6-
.hugo_build.lock
7-
resources
89
public
9-
tmp
10+
resources
1011
static/pagefind
11-
.idea/
12+
tmp

‎_vale/config/vocabularies/Docker/accept.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ unmanaged
163163
VMware
164164
vpnkit
165165
vSphere
166+
VSCode
166167
Wasm
167168
Windows
168169
windowsfilter

‎_vendor/github.com/docker/model-cli/docs/reference/docker_model.yaml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/github.com/docker/model-cli/docs/reference/docker_model_compose.yaml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/github.com/docker/model-cli/docs/reference/docker_model_compose_down.yaml‎

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/github.com/docker/model-cli/docs/reference/docker_model_compose_metadata.yaml‎

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/github.com/docker/model-cli/docs/reference/docker_model_compose_up.yaml‎

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/github.com/docker/model-cli/docs/reference/docker_model_configure.yaml‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/github.com/docker/model-cli/docs/reference/docker_model_inspect.yaml‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/github.com/docker/model-cli/docs/reference/docker_model_install-runner.yaml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)