about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-01-21 07:32:39 +0900
committerGitHub <noreply@github.com>2020-01-21 07:32:39 +0900
commitec7f209ad426208c9bc40f4e49c870d5364b47b2 (patch)
treedebf14c47d1d4f1719b68aee391b7aa4ad197ec2
parent66b0c97070f422cb82baaaafc79ee94cab4396c5 (diff)
parent2ccf65c7eba519dcc407cb76f08d04ac00d05851 (diff)
downloadrust-ec7f209ad426208c9bc40f4e49c870d5364b47b2.tar.gz
rust-ec7f209ad426208c9bc40f4e49c870d5364b47b2.zip
Rollup merge of #67734 - XAMPPRocky:master, r=skade
Remove appendix from Apache license

Looking at the codebase I noticed an oddity, in that the appendix of how use the Apache licence is still contained in the licence file. We don't put licence headers at the top of all of our files so I don't think we need to keep this. Alternatively we could delete everything above line 191 to have a shorter licence file.
-rw-r--r--LICENSE-APACHE25
1 files changed, 0 insertions, 25 deletions
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
index 16fe87b06e8..1b5ec8b78e2 100644
--- a/LICENSE-APACHE
+++ b/LICENSE-APACHE
@@ -174,28 +174,3 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    of your accepting any such warranty or additional liability.
 
 END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.