Merge branch 'master' into client_auth

Author: martinthomson

CONTRIBUTING.md

@@ -59,6 +59,8 @@ commits will only be responded to with best effort, and may not be seen.
 
 ## Resolving Issues
 
+The `open` issues in the issues list are those that we are currently or plan to discuss. When an issue is `closed`, it implies that the group has consensus and it is reflected in the draft(s). If substantive new information is brought to our attention, issues can be reopened by the Chairs.
+
 Issues will be labeled by the Chairs as either `editorial` or `design`.
 
 * **Design** issues require discussion and consensus in the Working Group. This discussion can happen both in the issue and on the [Working Group mailing list](https://www.ietf.org/mailman/listinfo/quic), as outlined below.
@@ -73,10 +75,17 @@ Consensus for the resolution of a design issue can be established in a few diffe
 
 The editors can also propose resolutions for the group's consideration by incorporating them into the draft(s); when doing so, the issue should not be closed until consensus is declared.
 
-Issues that have consensus will be labelled as `editor-ready`. After the editor has incorporated a resolution into the specification, the issue can be closed.
+Issues that have consensus but which aren't yet reflected in text will be labelled as `editor-ready`. After the editors have incorporated a resolution into the specification, the issue can be closed.
+
+When a new draft is published, the design issues that have been closed since the last draft will be highlighted on the mailing list, to aid reviewers.
+
+### Discretionary Design Issue Labels
 
-When a new draft is published, the design issues that have been closed since the last draft will be highlighted on the mailing list, to aid reviewers. If substantive new information is brought to our attention, issues can be reopened by the Chairs.
+We also use the following labels to help understand the state of our design issues:
 
+* **Needs Discussion**: The issue needs significant Working Group discussion before it can progress.
+* **Confirm Consensus**: There is a resolution that the proponents believe reflects a consensus position, needs to be confirmed with the WG.
+* **Notify Consensus**: The WG has achieved consensus in a meeting, needs to be confirmed on the mailing list.
 
 
 ## Pull Requests

Makefile

@@ -7,3 +7,6 @@ ifneq (,$(shell git submodule status lib 2>/dev/null))
 else
 	git clone -q --depth 10 -b master https://github.com/martinthomson/i-d-template.git lib
 endif
+
+latest::
+	@if grep -l ' $$' *.md; then ! echo "Trailing whitespace found"; fi

README.md

@@ -41,74 +41,5 @@ instructions](https://github.com/martinthomson/i-d-template/blob/master/doc/SETU
 
 ## Contributing
 
-Before submitting feedback, please familiarize yourself with our current issues
-list and review the [working group
-documents](https://datatracker.ietf.org/wg/quic/documents/) and [mailing
-list discussion](https://mailarchive.ietf.org/arch/browse/quic/). If you're
-new to this, you may also want to read the [Tao of the
-IETF](https://www.ietf.org/tao.html).
-
-Be aware that all contributions to the specification fall under the "NOTE WELL"
-terms outlined below.
-
-1. The best way to provide feedback (editorial or design) and ask questions is
-sending an e-mail to our mailing list
-([info](https://www.ietf.org/mailman/listinfo/quic)). This will ensure that
-the entire Working Group sees your input in a timely fashion.
-
-2. If you have **editorial** suggestions (i.e., those that do not change the
-meaning of the specification), you can either:
-
-  a) Fork this repository and submit a pull request; this is the lowest
-  friction way to get editorial changes in.
-
-  b) Submit a new issue to Github, and mention that you believe it is editorial
-  in the issue body. It is not necessary to notify the mailing list for
-  editorial issues.
-
-  c) Make comments on individual commits in Github. Note that this feedback is
-  processed only with best effort by the editors, so it should only be used for
-  quick editorial suggestions or questions.
-
-3. For non-editorial (i.e., **design**) issues, you can also create an issue on
-Github. However, you **must notify the mailing list** when creating such issues,
-providing a link to the issue in the message body.
-
-  Note that **github issues are not for substantial discussions**; the only
-  appropriate place to discuss design issues is on the mailing list itself.
-
-
-## NOTE WELL
-
-Any submission to the [IETF](https://www.ietf.org/) intended by the Contributor
-for publication as all or part of an IETF Internet-Draft or RFC and any
-statement made within the context of an IETF activity is considered an "IETF
-Contribution". Such statements include oral statements in IETF sessions, as
-well as written and electronic communications made at any time or place, which
-are addressed to:
-
- * The IETF plenary session
- * The IESG, or any member thereof on behalf of the IESG
- * Any IETF mailing list, including the IETF list itself, any working group
-   or design team list, or any other list functioning under IETF auspices
- * Any IETF working group or portion thereof
- * Any Birds of a Feather (BOF) session
- * The IAB or any member thereof on behalf of the IAB
- * The RFC Editor or the Internet-Drafts function
- * All IETF Contributions are subject to the rules of
-   [RFC 5378](https://tools.ietf.org/html/rfc5378) and
-   [RFC 3979](https://tools.ietf.org/html/rfc3979)
-   (updated by [RFC 4879](https://tools.ietf.org/html/rfc4879)).
-
-Statements made outside of an IETF session, mailing list or other function,
-that are clearly not intended to be input to an IETF activity, group or
-function, are not IETF Contributions in the context of this notice.
-
-Please consult [RFC 5378](https://tools.ietf.org/html/rfc5378) and [RFC
-3979](https://tools.ietf.org/html/rfc3979) for details.
-
-A participant in any IETF activity is deemed to accept all IETF rules of
-process, as documented in Best Current Practices RFCs and IESG Statements.
-
-A participant in any IETF activity acknowledges that written, audio and video
-records of meetings may be made and may be available to the public.
+See our
+[guidelines for contribution](https://github.com/quicwg/base-drafts/blob/master/CONTRIBUTING.md).