diff options
| -rw-r--r-- | quip-0002.rst | 2 | ||||
| -rw-r--r-- | quip-0006.rst | 12 | ||||
| -rw-r--r-- | quip-0015-Security-Policy.rst | 2 | ||||
| -rw-r--r-- | quip-0016-branch-policy.rst | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/quip-0002.rst b/quip-0002.rst index 87698c6..0faab05 100644 --- a/quip-0002.rst +++ b/quip-0002.rst @@ -197,7 +197,7 @@ Chief Maintainer decides, usually within 15 work days. When a Maintainer is newly appointed, the authoritative list of Maintainers `on the Qt project Wiki`_ is updated to record their area of responsibility and the new maintainer is added to the security -mailing list (see `QUIP 15`), if not already subscribed. +mailing list (see `QUIP 15`_), if not already subscribed. Becoming Maintainer of anything in a main module of Qt implies becoming Approver throughout Qt, if one is not so yet. The Maintainer of a playground diff --git a/quip-0006.rst b/quip-0006.rst index fda1a23..f2dcbf2 100644 --- a/quip-0006.rst +++ b/quip-0006.rst @@ -27,9 +27,7 @@ changes may be acceptable between minor releases. It originated from `the author's post <https://lists.qt-project.org/pipermail/development/2016-July/026543.html>`_ -in the `Source break policy for function overloads -<https://lists.qt-project.org/pipermail/development/2016-July/026527.html>`_ -mailing-list thread. +in the `Source break policy for function overloads`_ mailing-list thread. Classification of Source-Incompatible Changes @@ -42,7 +40,7 @@ code without introducing Qt version checks. Category B SiCs break existing code, and need to be worked around in user code using Qt version checks, or similar techniques, such as -`SFINAE <http://en.cppreference.com/w/cpp/language/sfinae>`_. +`SFINAE`_. Category A SiCs are acceptable, while Category B SiCs are not. @@ -64,10 +62,10 @@ This list is not exhaustive. Issues not listed here should be discussed on the mailing-list and then added here. +-------+-------------------------------------------------------------+-------+--------+ -| | | Classification | -| # | Source-incompatible Change +-------+--------+ -| | | Cat A | Cat B | +| \# | Source-incompatible Change | Classification | +-------+-------------------------------------------------------------+-------+--------+ +| | | Cat A | Cat B | ++=======+=============================================================+=======+========+ | A.1 | Adding an overload of a function | X | | +-------+-+-----------------------------------------------------------+-------+--------+ | B.1 | | Exception: when causing ambiguities | | X | diff --git a/quip-0015-Security-Policy.rst b/quip-0015-Security-Policy.rst index c52738e..7259e91 100644 --- a/quip-0015-Security-Policy.rst +++ b/quip-0015-Security-Policy.rst @@ -23,7 +23,7 @@ The Core Security Team of Qt developers with `Approver`_ privileges is establish with the responsibility to ensure that this policy is followed. Any Approver may volunteer to become a member of the Core Security Team, but needs to be supported by at least one other approver. Members of the Core Security Team are added to -the security mailing list ([email protected]). +the `security mailing list`_ ([email protected]). .. _`Approver`: https://contribute.qt-project.org/quips/2#approvers diff --git a/quip-0016-branch-policy.rst b/quip-0016-branch-policy.rst index 6d9800f..703bbad 100644 --- a/quip-0016-branch-policy.rst +++ b/quip-0016-branch-policy.rst @@ -252,7 +252,7 @@ regressions. +----------------------------+--------+--------+-------------+---------+---------------------+ | Bugs: Other | x | | | | | +----------------------------+--------+--------+-------------+---------+---------------------+ -| Refactoring: for bug fix | * | * | * | * | * Branch depends on | +| Refactoring: for bug fix | \* | \* | \* | \* | \* Branch depends on| | | | | | | severity of bug; | | | | | | | i.e. a refactoring | | | | | | | for a security fix | |