Skip to content

Commit

Permalink
Remove headers and amend the RFC
Browse files Browse the repository at this point in the history
  • Loading branch information
est31 committed Jul 27, 2017
1 parent 6d5fec6 commit a0afa50
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 51 deletions.
11 changes: 0 additions & 11 deletions 0000-template.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
<!---
Copyright <fill in year> The Rust Project Developers. See the COPYRIGHT
file at the top-level directory of this distribution.
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
option. This file may not be copied, modified, or distributed
except according to those terms.
-->

- Feature Name: (fill me in with a unique ident, my_awesome_feature)
- Start Date: (fill me in with today's date, YYYY-MM-DD)
- RFC PR: (leave this empty)
Expand Down
2 changes: 0 additions & 2 deletions LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Copyright (c) 2014 The Rust Project Developers

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Expand Down
40 changes: 2 additions & 38 deletions text/2044-license-rfcs.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
<!---
Copyright 2017 The Rust Project Developers. See the COPYRIGHT
file at the top-level directory of this distribution.
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
option. This file may not be copied, modified, or distributed
except according to those terms.
-->

- Feature Name: license_rfcs
- Start Date: 2017-06-26
- RFC PR: https://github.com/rust-lang/rfcs/pull/2044
Expand Down Expand Up @@ -70,9 +59,6 @@ After this RFC has been merged, all new RFCs will be required to be
dual-licensed under the MIT/Apache2. This includes RFCs currently being
[considered for merging].

This puts a responsibility on anyone who is merging RFCs to check for a
license header.

`README.md` should include a note that all contributions to the repo should be
licensed under the new terms.

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

To signify the terms, each RFC document shall start with a comment header like:

```
<!---
Copyright <year> The Rust Project Developers. See the COPYRIGHT
file at the top-level directory of this distribution.
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
option. This file may not be copied, modified, or distributed
except according to those terms.
-->
```

All new RFCs, including the ones in the queue as of when this RFC gets merged,
should start with such a section, and the RFC template should be changed
accordingly.

As more contributors sign off on the opened issue, sections may be added
to existing RFCs which have only contributors that have signed off.

Regarding non-RFC files in this repo, the intention is to get them licensed
as well, not just the RFCs themselves. Therefore, contributors should be asked
to license *all* their contributions to this repo, not just to the RFC files,
Expand All @@ -121,8 +85,8 @@ Also, after this RFC got merged, all RFCs in the queue will get a comment in
their Github PR and be asked to include the copyright section at the top of
their RFC file.

The note in README.md and the header in the template should should inform new
PR authors of the terms they put their contribution under.
The note in README.md should should inform new PR authors of the terms
they put their contribution under.

# Drawbacks
[drawbacks]: #drawbacks
Expand Down

0 comments on commit a0afa50

Please sign in to comment.