Skip to content

man: move ctr.1 and containerd-config to section 8#4140

Merged
estesp merged 1 commit intocontainerd:masterfrom
thaJeztah:man_man_man
Apr 3, 2020
Merged

man: move ctr.1 and containerd-config to section 8#4140
estesp merged 1 commit intocontainerd:masterfrom
thaJeztah:man_man_man

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Apr 2, 2020

I missed this in my previous change: the ctr man page is also in Section 8, because it's considered an administrative tool, and containerd-config is related to containerd so updating these as well.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 2, 2020

Build succeeded.

Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Comment thread Makefile Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

containerd-config should be moved as well?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

good one; I guess it's related to the containerd command, so would also be "admin" and/or require root? I can update

@thaJeztah thaJeztah changed the title man: move ctr.1 to ctr.8 as well man: move ctr.1 and containerd-config to section 8 Apr 2, 2020
@thaJeztah
Copy link
Copy Markdown
Member Author

@AkihiroSuda updated

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 2, 2020

Build succeeded.

@thaJeztah
Copy link
Copy Markdown
Member Author

Arf. don't merge yet; looks like generating the man-pages is hard-coded to append a .1 prefix

I missed this in my previous change: the ctr man page is also
in Section 8, because it's considered an administrative tool,
and containerd-config is related to containerd so updating these
as well.

This commit also fixes naming of the generated files, which was
hard-coded to .1.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

Updated; PTAL

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 3, 2020

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM; good catch on the code changes for the hardcoded ".1" :)

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #4140 into master will not change coverage by %.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #4140   +/-   ##
=======================================
  Coverage   42.14%   42.14%           
=======================================
  Files         133      133           
  Lines       15209    15209           
=======================================
  Hits         6410     6410           
  Misses       7870     7870           
  Partials      929      929           
Flag Coverage Δ
#linux 45.46% <ø> (ø)
#windows 37.98% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9ba5ea2...ad090e6. Read the comment docs.

@estesp estesp merged commit 1512f0d into containerd:master Apr 3, 2020
@thaJeztah thaJeztah deleted the man_man_man branch April 3, 2020 17:09
@thaJeztah
Copy link
Copy Markdown
Member Author

good catch on the code changes for the hardcoded ".1" :)

heh, yes, I didn't notice it initially, because when building deb packages, files are automatically placed in the right location (based on the actual content), but the same logic is not in place when building rpm's

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants