diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-20 10:31:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-20 10:31:50 -0700 |
| commit | 72fdff1416e280e2baaa3cca69574defb998437e (patch) | |
| tree | 23eb03cbd38f7b1642d78219b80b1452b9f597f6 /Documentation/dev-tools | |
| parent | 9d2ed026f031f764e9450ac9aada2f46bc977397 (diff) | |
| parent | 791e420360669d55b7f90ca0c6d61b10e4992aec (diff) | |
| download | linux-72fdff1416e280e2baaa3cca69574defb998437e.tar.gz linux-72fdff1416e280e2baaa3cca69574defb998437e.zip | |
Merge tag 'docs-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/docs/linux
Pull documentation updates from Jonathan Corbet:
"It has been a not-too-busy cycle for docs; here's the highlights:
- A (hopefully) consensus change to our LLM-attribution requirements,
removing the specific model name from the Assisted-by tag
- A couple of new realtime documents
- Various docs-build-system fixes
- Ongoing work with the Chinese, Portuguese, and Japanese
translations
...and lots of typo fixes, grammar tweaks, etc"
* tag 'docs-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/docs/linux: (85 commits)
Doc: admin-guide: pm: Remove unnecessary backticks and fix a spell
Documentation: Extend the real-time hardware bits with some firmware bits
docs: pt_BR: Reorganize process/index.rst to follow english structure
docs: conf.py: fix the 'utf-8' typo
doc tools: fix 'path' typos
Documentation: real-time: Add kernel configuration guide
docs: python: abi_regex: convert adjacent index placeholders
docs: python: abi_regex: catch the right exception for a bad regex
docs: sphinx-build-wrapper: include localversion in kernel version string
Documentation: html: adjust sidebar section titles styling
Documentation: html: show sections in the sidebar
checkpatch.pl: adapt to new Assisted-by: format
MAINTAINERS: update Traditional Chinese documentation maintainers
docs: pt_BR: process: Translate CVE documentation
docs: pt_BR: translate the management-style.rst to Brazilian Portuguese
docs: xforms_lists: support DEFINE_IDTENTRY_IRQ()
coding-assistants: simplify attribution
docs: translations: pt_BR: translate email-clients.rst
docs: pt_BR: process: Translate the security-bugs.rst
doc:it_IT: align doc-guide translation
...
Diffstat (limited to 'Documentation/dev-tools')
| -rw-r--r-- | Documentation/dev-tools/container.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/dev-tools/container.rst b/Documentation/dev-tools/container.rst index 452415b64662..9e23f79d5ae1 100644 --- a/Documentation/dev-tools/container.rst +++ b/Documentation/dev-tools/container.rst @@ -40,7 +40,7 @@ Available options: ``-r, --runtime RUNTIME`` - Container runtime name. Supported runtimes: ``docker``, ``podman``. + Container runtime name. Supported runtimes: ``podman``, ``docker``. If not specified, the first one found on the system will be used i.e. Podman if present, otherwise Docker. @@ -75,8 +75,8 @@ working directory and adjust the user and group id as needed. The container image which would typically include a compiler toolchain is provided by the user and selected via the ``-i`` option. The container runtime -can be selected with the ``-r`` option, which can be either ``docker`` or -``podman``. If none is specified, the first one found on the system will be +can be selected with the ``-r`` option, which can be either ``podman`` or +``docker``. If none is specified, the first one found on the system will be used while giving priority to Podman. Support for other runtimes may be added later depending on their popularity among users. |
