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

config.md: format changes #724

Merged
merged 1 commit into from
May 12, 2017

Conversation

zhouhao3
Copy link

Signed-off-by: zhouhao zhouhao@cn.fujitsu.com

@zhouhao3 zhouhao3 changed the title confif.md: format changes config.md: format changes Mar 14, 2017
config.md Outdated
* **`prestart`** (array, OPTIONAL) is an array of [pre-start hooks](#prestart).
Entries in the array contain the following properties:
* **`path`** (string, REQUIRED) with similar semantics to [IEEE Std 1003.1-2001 `execv`'s *path*][ieee-1003.1-2001-xsh-exec].
This specification extends the IEEE standard in that **`path`** MUST be absolute.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you want an additional two or four spaces of indent for this line so it is clearly part of the path entry in the source.

Other than that (and a confifconfig typo in the commit message), 79afbeb looks good to me.

@tianon
Copy link
Member

tianon commented May 10, 2017

Not sure I understand the end goal of all these indentation changes -- does this make the output look nicer or something?

@wking
Copy link
Contributor

wking commented May 10, 2017 via email

@crosbymichael
Copy link
Member

Can you rebase and fix the indention

@zhouhao3 zhouhao3 force-pushed the fix-configmd branch 3 times, most recently from 7ed40cb to 6e6790e Compare May 11, 2017 02:37
config.md Outdated
* **`prestart`** (array of objects, OPTIONAL) is an array of [pre-start hooks](#prestart).
Entries in the array contain the following properties:
* **`path`** (string, REQUIRED) with similar semantics to [IEEE Std 1003.1-2001 `execv`'s *path*][ieee-1003.1-2001-xsh-exec].
This specification extends the IEEE standard in that **`path`** MUST be absolute.
Copy link
Member

Choose a reason for hiding this comment

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

Doesn't this line need two more spaces to line up with the path bullet contents properly?

config.md Outdated
* **`args`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2001 `execv`'s *argv*][ieee-1003.1-2001-xsh-exec].
* **`env`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2001's `environ`][ieee-1003.1-2001-xbd-c8.1].
* **`timeout`** (int, OPTIONAL) is the number of seconds before aborting the hook.
If set, `timeout` MUST be greater than zero.
Copy link
Member

Choose a reason for hiding this comment

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

Same here -- I think this needs two more spaces, doesn't it?

config.md Outdated
* **`timeout`** (int, OPTIONAL) is the number of seconds before aborting the hook.
If set, `timeout` MUST be greater than zero.
* **`poststart`** (array of objects, OPTIONAL) is an array of [post-start hooks](#poststart).
Entries in the array have the same schema as pre-start entries.
Copy link
Member

Choose a reason for hiding this comment

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

Oh hmm, either this has two too many or the others I've commented on actually need four more spaces rather than simply two (which seems the more likely, given that pandoc is apparently picky about it being precisely "four spaces or a tab").

Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
@mrunalp
Copy link
Contributor

mrunalp commented May 12, 2017

LGTM

Approved with PullApprove

@crosbymichael
Copy link
Member

crosbymichael commented May 12, 2017

LGTM

Approved with PullApprove

@crosbymichael crosbymichael merged commit 6cc08c2 into opencontainers:master May 12, 2017
@zhouhao3 zhouhao3 deleted the fix-configmd branch May 15, 2017 01:21
@vbatts vbatts mentioned this pull request Jul 5, 2017
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