*: Move closer to project-template's current status#966
Closed
wking wants to merge 2 commits intoopencontainers:masterfrom
Closed
*: Move closer to project-template's current status#966wking wants to merge 2 commits intoopencontainers:masterfrom
wking wants to merge 2 commits intoopencontainers:masterfrom
Conversation
Generated with: $ git remote add project-template git://github.com/opencontainers/project-template.git $ git fetch project-template $ git show --oneline project-template/master 61d73a3 (project-template/master) Merge pull request opencontainers#40 from wking/minor-patch-bullet $ git merge --squash --allow-unrelated-histories project-template/master $ git checkout HEAD -- .pullapprove.yml MAINTAINERS README.md RELEASES.md $ git checkout project-template/master -- GOVERNANCE.md LICENSE $ emacs README.md CONTRIBUTING.md # unify around project-template's CONTRIBUTING.md approach $ emacs meeting.ics # update link to point at CONTRIBUTING.md#meetings $ git commit -sv I personally prefer non-squash merges to preserve history and ease future updates, but that approach has not been popular within the OCI [1,2], so I'm going with a squash-merge here. I'm sticking with the local RELEASES.md, because it uses four-space indents. I've filed [3] to upstream that change. I've also filed [4] upstreaming our local wording change from 70ba4e6 (meeting: Bump January meeting from the 3rd to the 10th, 2017-12-07, opencontainers#943). I've also fixed the GOVERNANCE.md security link in flight with [5]. I've left the other in-flight project-template changes alone [6]. I've wrapped the URL in meetings.ics to avoid [7]: Line length should not be longer than 75 characters near line opencontainers#33 Reference: RFC 5545 3.1. Content Lines [1]: opencontainers/go-digest#20 (comment) [2]: opencontainers/runtime-tools#274 (comment) [3]: opencontainers/project-template#54 [4]: opencontainers/project-template#55 [5]: opencontainers/project-template#34 [6]: https://github.com/opencontainers/project-template/pulls [7]: https://icalendar.org/validator.html Signed-off-by: W. Trevor King <wking@tremily.us>
Contributor
Author
|
There was a previous run at something similar in #420, which was closed because the template docs were, at that time, not sufficiently generic. With opencontainers/project-template#20 having landed since (via a bunch of separate PRs), I think it's worth taking another stab at this ;). |
This should have been added along with the consuming reference-style link in ee72bc89 (CONTRIBUTING: Code of conduct, meetings, mailing list, and IRC, 2016-09-08, opencontainers#45). Cherry-picked from opencontainers/project-template@41fe83d3 (opencontainers/project-template#56), fixing a trivial context conflict in the link label section. Signed-off-by: W. Trevor King <wking@tremily.us>
Member
|
house keeping: bugger. I'm sure these are good changes, but with much of this being pointed at https://github.com/opencontainers/org I think this PR would have to be completely redone |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Generated with:
I personally prefer non-squash merges to preserve history and ease future updates, but that approach has not been popular within the OCI, so I'm going with a squash-merge here.
I'm sticking with the local
RELEASES.md, because it uses four-space indents. I've filed opencontainers/project-template#54 to upstream that change.I've also filed opencontainers/project-template#55 upstreaming our local wording change from #943.
I've also fixed the
GOVERNANCE.mdsecurity link in flight with opencontainers/project-template#34.I've left the other in-flight project-template changes alone.
I've wrapped the URL in meetings.ics to avoid: