@@ -9,11 +9,11 @@ There are two mechanisms that the team can use to approve a proposal (not all ap
9
9
are suitable for each method of making a proposal - see below):
10
10
11
11
- r+
12
- - A proposal is r+'d when it is approved to be merged.
12
+ - A proposal (an RFC or an FCP) is r+'d when it is approved to be merged.
13
13
- r+ can only be used to approve a PR.
14
14
- FCP
15
- - A final comment period will require sign-off from a majority of the rustdoc team to approve
16
- a proposal and then a ten day waiting period.
15
+ - A final comment period will require sign-off from a majority (all members minus 2)
16
+ of the rustdoc team to approve a proposal and then a ten day waiting period.
17
17
- FCPs can be used to approve any form of proposal.
18
18
19
19
## Proposals
@@ -33,7 +33,8 @@ the nature of the proposal, described below.
33
33
proposal mechanism, suitable for most proposals. PRs are preferred when the proposal is
34
34
accompanied by a small patchset (such as stabilization of a compiler flag or addition of
35
35
a new target).
36
- - PR proposals can be approved by * FCPs* or * r+* .
36
+ - PR proposals can be approved by * FCPs* or * r+* . See * When are FCPs/RFCs required?*
37
+ section below when * r+* isn't sufficient alone.
37
38
38
39
[ rustdoc zulip thread ] : https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc
39
40
@@ -43,8 +44,8 @@ An FCP will be needed for any stabilization of small user-facing changes, like U
43
44
command-line arguments, new attributes, etc. However, if the change is considered too big/important,
44
45
an RFC will need to be written and approved before the change will be accepted.
45
46
46
- When opening an FCP, make sure only the relevant subteam is labeled on the issue, to avoid pinging
47
- people with changes they aren't interested in.
47
+ When starting an FCP, make sure only the relevant subteam is labeled on the issue/PR , to avoid
48
+ pinging people with changes they aren't interested in.
48
49
49
50
### What happens if someone makes a contribution that requires an approval and doesn't have one?
50
51
If the approval required for the contribution requires an RFC, then the contribution
@@ -69,10 +70,6 @@ A good proposal will address the following:
69
70
* ** Alternatives, concerns, and key decisions:** Were there any alternatives considered? If so, why
70
71
did you pick this design?
71
72
72
- ## What proposal/approval do I need?
73
- This section aims to exhaustively detail which proposal and approval is necessary for any given
74
- circumstance.
75
-
76
73
[ rfcs ] : https://github.com/rust-lang/rfcs
77
74
[ Haddock ] : https://haskell-haddock.readthedocs.io/latest/
78
75
[ Wikipedia ] : https://www.wikipedia.org/
0 commit comments