Skip to content

Commit 22badf1

Browse files
committed
Remove the header and amend the RFC
1 parent 5e8ff31 commit 22badf1

File tree

2 files changed

+2
-40
lines changed

2 files changed

+2
-40
lines changed

LICENSE-MIT

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Copyright (c) 2014 The Rust Project Developers
2-
31
Permission is hereby granted, free of charge, to any
42
person obtaining a copy of this software and associated
53
documentation files (the "Software"), to deal in the

text/2044-license-rfcs.md

+2-38
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
<!---
2-
Copyright 2017 The Rust Project Developers. See the COPYRIGHT
3-
file at the top-level directory of this distribution.
4-
5-
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
option. This file may not be copied, modified, or distributed
9-
except according to those terms.
10-
-->
11-
121
- Feature Name: license_rfcs
132
- Start Date: 2017-06-26
143
- RFC PR: https://github.com/rust-lang/rfcs/pull/2044
@@ -70,9 +59,6 @@ After this RFC has been merged, all new RFCs will be required to be
7059
dual-licensed under the MIT/Apache2. This includes RFCs currently being
7160
[considered for merging].
7261

73-
This puts a responsibility on anyone who is merging RFCs to check for a
74-
license header.
75-
7662
`README.md` should include a note that all contributions to the repo should be
7763
licensed under the new terms.
7864

@@ -81,28 +67,6 @@ created on rust-lang/rfcs with a list of past contributors to the repo,
8167
asking every contributor to agree to their contributions to be licensed under
8268
those terms.
8369

84-
To signify the terms, each RFC document shall start with a comment header like:
85-
86-
```
87-
<!---
88-
Copyright <year> The Rust Project Developers. See the COPYRIGHT
89-
file at the top-level directory of this distribution.
90-
91-
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
92-
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
93-
<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
94-
option. This file may not be copied, modified, or distributed
95-
except according to those terms.
96-
-->
97-
```
98-
99-
All new RFCs, including the ones in the queue as of when this RFC gets merged,
100-
should start with such a section, and the RFC template should be changed
101-
accordingly.
102-
103-
As more contributors sign off on the opened issue, sections may be added
104-
to existing RFCs which have only contributors that have signed off.
105-
10670
Regarding non-RFC files in this repo, the intention is to get them licensed
10771
as well, not just the RFCs themselves. Therefore, contributors should be asked
10872
to license *all* their contributions to this repo, not just to the RFC files,
@@ -121,8 +85,8 @@ Also, after this RFC got merged, all RFCs in the queue will get a comment in
12185
their Github PR and be asked to include the copyright section at the top of
12286
their RFC file.
12387

124-
The note in README.md and the header in the template should should inform new
125-
PR authors of the terms they put their contribution under.
88+
The note in README.md should should inform new PR authors of the terms
89+
they put their contribution under.
12690

12791
# Drawbacks
12892
[drawbacks]: #drawbacks

0 commit comments

Comments
 (0)