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.

Sign up for GitHub

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

Jump to bottom

config-solaris: Restore 'zonecfg.1m_2' link targets #793

Merged
merged 1 commit into from
May 10, 2017
Merged

config-solaris: Restore 'zonecfg.1m_2' link targets #793

merged 1 commit into from
May 10, 2017

Conversation

wking
Copy link
Contributor

@wking wking commented May 9, 2017

These were added in #687 to follow the new _N name-dedup policy (vs. the config.md target). They were just removed in #786 (overlooking that policy?). This commit brings them back.

@wking
config-solaris: Restore 'zonecfg.1m_2' link targets
27c045a 
These were added in f9dc90b (make link usage consistent across the
specification, 2017-08-09, opencontainers#687) to follow the new _N name-dedup
policy discussed in style.md.  They were removed in ea65eb3
(config-solaris.md: fix info, 2017-04-28, opencontainers#786), overlooking that
policy.  This commit brings them back.

Signed-off-by: W. Trevor King <wking@tremily.us>
@hqhq
Copy link
Contributor

hqhq commented May 10, 2017 •
edited by caniszczyk
Loading

LGTM

I missed that there's another zonecfg.1m in config.md.

Approved with PullApprove

@dqminh
Copy link
Contributor

dqminh commented May 10, 2017 •
edited by caniszczyk
Loading

LGTM

pandoc: Duplicate link reference `[zonecfg.1m]' "source" (line 1946, column 1)
mkdir -p output/ && \
/usr/bin/docker run -it --rm -v /home/dqminh/src/github.com/opencontainers/runtime-spec/:/input/:ro -v /home/dqminh/src/github.com/opencontainers/runtime-spec/output/:/output/ -u 1000 vbatts/pandoc -f markdown_github -t html5 -o /output/oci-runtime-spec.html /input/version.md /input/spec.md /input/principles.md /input/bundle.md /input/runtime.md /input/runtime-linux.md /input/config.md /input/config-linux.md /input/config-solaris.md /input/glossary.md
pandoc: Duplicate link reference `[zonecfg.1m]' "source" (line 1946, column 1)

Switched to branch 'pr-793'
runtime-spec pr-793 ❯ make
mkdir -p output/ && \
/usr/bin/docker run -it --rm -v /home/dqminh/src/github.com/opencontainers/runtime-spec/:/input/:ro -v /home/dqminh/src/github.com/opencontainers/runtime-spec/output/:/output/ -u 1000 vbatts/pandoc -f markdown_github -t latex -o /output/oci-runtime-spec.pdf /input/version.md /input/spec.md /input/principles.md /input/bundle.md /input/runtime.md /input/runtime-linux.md /input/config.md /input/config-linux.md /input/config-solaris.md /input/glossary.md
mkdir -p output/ && \
/usr/bin/docker run -it --rm -v /home/dqminh/src/github.com/opencontainers/runtime-spec/:/input/:ro -v /home/dqminh/src/github.com/opencontainers/runtime-spec/output/:/output/ -u 1000 vbatts/pandoc -f markdown_github -t html5 -o /output/oci-runtime-spec.html /input/version.md /input/spec.md /input/principles.md /input/bundle.md /input/runtime.md /input/runtime-linux.md /input/config.md /input/config-linux.md /input/config-solaris.md /input/glossary.md

Approved with PullApprove

@dqminh dqminh merged commit d974e9d into opencontainers:master May 10, 2017
@wking wking deleted the unique-solaris-zonecfg-link-target branch May 10, 2017 23:51
@vbatts vbatts mentioned this pull request May 19, 2017
Closed
@vbatts vbatts mentioned this pull request Jul 5, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wking @hqhq @dqminh