summaryrefslogtreecommitdiffstats
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorChris Dunlap <[email protected]>2015-05-06 15:56:03 -0700
committerBrian Behlendorf <[email protected]>2015-05-11 15:07:00 -0700
commit492b1d2ef0aa14c22a8f075d948950d072970c17 (patch)
treeb839d1f8546862ced793cf2526da56f90374c0ba /COPYRIGHT
parent214806c7e9833fb525a78a335b56fff5e863942e (diff)
Update ZED copyright boilerplate
This commit updates the copyright boilerplate within the ZED subtree. The instructions for appending a contributor copyright line have been removed. Manually maintaining copyright notices in this manner is error-prone, imprecise at a file-scope granularity, and oftentimes inaccurate. These lines can become a pernicious source of merge conflicts. A commit log is better suited to maintaining this information. Consequently, a line has been added to the boilerplate to refer to the git commit log for authoritative copyright attribution. To account for the scenario where a file may become separated from the codebase and commit history (i.e., it is copied somewhere else), a line has been added to identify the file's origin. http://softwarefreedom.org/resources/2012/ManagingCopyrightInformation.html Signed-off-by: Chris Dunlap <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #3384
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT2
1 files changed, 2 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 8ba7a76ee..759a48439 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -29,3 +29,5 @@ Unless otherwise noted, all files in this distribution are released
under the Common Development and Distribution License (CDDL).
Exceptions are noted within the associated source files. See the file
OPENSOLARIS.LICENSE for more information.
+
+Refer to the git commit log for authoritative copyright attribution.