Skip to content

Conversation

@ashlymat
Copy link
Contributor

Signed-off-by: Ashly Mathew ashlymathew93@gmail.com

- What I did
Small contribution to #923 - changing arguments of options to italics

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Ashly Mathew <ashlymathew93@gmail.com>
@ashlymat
Copy link
Contributor Author

@kolyshkin Could you do a review?

@thaJeztah
Copy link
Member

Looks like CI got stuck (probably because some changes were made); let me try a close/reopen to trigger it

@thaJeztah thaJeztah closed this Apr 12, 2023
@thaJeztah thaJeztah reopened this Apr 12, 2023
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes LGTM, thanks!

@thaJeztah thaJeztah added this to the 24.0.0 milestone Apr 12, 2023
@thaJeztah thaJeztah merged commit e4c6862 into docker:master Apr 12, 2023
driver and "system.slice" for systemd cgroup driver.

**--config-file**="/etc/docker/daemon.json"
**--config-file**=*"/etc/docker/daemon.json"*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. This is wrong to put a default value (like done here) or an example value in synopsis. The proper way would be to say something like
**--config-file**=*"path"*

and add

Default is  */etc/docker/daemon.json*.

to the option description.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To explain the last part -- while a file name (such as /etc/docker/daemon.json) is a literal, the man page convention is to typeset it as italic.

Enable debug mode. Default is false.

**--default-cgroupns-mode**="**host**|**private**"
**--default-cgroupns-mode**="*host*|*private*"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here, both host and private are literals, i.e. they should be used as-is. Therefore, those are typeset in bold and should not be changed.

OTOH, if that would be something like default-cgroup-mode=MODE, the MODE should be in italic, as it's a value to be substituted.

@kolyshkin
Copy link
Contributor

Opened #4215 to fix the issues from this PR (described above).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants