Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: add daemon config file doc #1257

Merged
merged 1 commit into from
May 23, 2018
Merged

docs: add daemon config file doc #1257

merged 1 commit into from
May 23, 2018

Conversation

Ace-Tang
Copy link
Contributor

Signed-off-by: Ace-Tang [email protected]

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@allencloud
Copy link
Collaborator

markdown lint files, please write the document in markdownlint tool's rules. @Ace-Tang
😄

## Note

1. The same flag(exclude slice or array type) can not be set through command
line and config file 同时.
Copy link
Contributor

Choose a reason for hiding this comment

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

please remove the 同时 here. :)

* The same flag(exclude slice or array type) can not be set through command
line and config file simultaneously.
* We allow users set slice or array type of flag simultaneously from command
and config file line,and merge them.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

#!/bin/bash -eo pipefail
find  ./ -name  "*.md" | grep -v vendor | grep -v extra |  grep -v commandline |  grep -v .github |  grep -v swagger |  grep -v api |  xargs mdl -r ~MD013,~MD024,~MD029,~MD033,~MD036
./docs/user/config_file.md:26: MD032 Lists should be surrounded by blank lines
./docs/user/config_file.md:28: MD032 Lists should be surrounded by blank lines
Exited with code 123

I do not see why this is wrong


### Note

* The same flag(exclude slice or array type) can not be set through command
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe need a blank line here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, if add a blank line here, it will cause another error, which means just allow one blank line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The rules confuse me very much !!!

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @Ace-Tang , the rule is here. https://github.com/DavidAnson/markdownlint/blob/master/doc/Rules.md#md032---lists-should-be-surrounded-by-blank-lines

I think you can add the indent in the newline. Please have a try. haha

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As the text say

Some text

* Some
* List

I must add a text before *some, but if I do not want to add text, I just want * some follow ## title, how do I need to do.

@codecov-io
Copy link

Codecov Report

Merging #1257 into master will decrease coverage by 0.28%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1257      +/-   ##
==========================================
- Coverage   15.59%   15.31%   -0.29%     
==========================================
  Files         173      172       -1     
  Lines       10819    10665     -154     
==========================================
- Hits         1687     1633      -54     
+ Misses       9013     8912     -101     
- Partials      119      120       +1
Impacted Files Coverage Δ
daemon/mgr/image_utils.go 0% <0%> (-40%) ⬇️
pkg/reference/def.go 33.33% <0%> (-11.12%) ⬇️
daemon/mgr/cri_utils.go 28.85% <0%> (-0.46%) ⬇️
daemon/mgr/container_types.go 25.31% <0%> (ø) ⬆️
cli/run.go 0% <0%> (ø) ⬆️
cli/cli.go 0% <0%> (ø) ⬆️
daemon/containerio/container_io.go 0% <0%> (ø) ⬆️
cli/pull.go 0% <0%> (ø) ⬆️
daemon/mgr/cri.go 0% <0%> (ø) ⬆️
cli/inspect.go 0% <0%> (ø) ⬆️
... and 18 more

@allencloud
Copy link
Collaborator

Still wondering where to locate this document file. If we add a new folder user, I think we should update the docs/README.md .
How about adding all these into file pouchd.md in folder docs/commandline? @Ace-Tang

@Ace-Tang
Copy link
Contributor Author

Ace-Tang commented May 9, 2018

I do not think it proper to put the file under docs/commandline. @allencloud , docs/commandline should include command line related info.

@HusterWan HusterWan added this to the v0.5.0-milestone milestone May 21, 2018
@HusterWan
Copy link
Contributor

I will merge this pr first, if has any problem, feel free to contact me thanks, @Ace-Tang @allencloud @fuweid

@HusterWan HusterWan merged commit cef9a10 into AliyunContainerService:master May 23, 2018
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.

6 participants