summaryrefslogtreecommitdiffstats
path: root/man
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 /man
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 'man')
-rw-r--r--man/man8/zed.8.in38
1 files changed, 12 insertions, 26 deletions
diff --git a/man/man8/zed.8.in b/man/man8/zed.8.in
index 71a1dce60..2ab088d98 100644
--- a/man/man8/zed.8.in
+++ b/man/man8/zed.8.in
@@ -1,25 +1,15 @@
.\"
-.\" CDDL HEADER START
-.\"
-.\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").
-.\" You may not use this file except in compliance with the License.
-.\"
-.\" You can obtain a copy of the license from the top-level
-.\" OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
-.\" See the License for the specific language governing permissions
-.\" and limitations under the License.
-.\"
-.\" When distributing Covered Code, include this CDDL HEADER in each file
-.\" and include the License file from the top-level OPENSOLARIS.LICENSE.
-.\" If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying
-.\" information: Portions Copyright [yyyy] [name of copyright owner]
-.\"
-.\" CDDL HEADER END
-.\"
+.\" This file is part of the ZFS Event Daemon (ZED)
+.\" for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
.\" Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
.\" Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
+.\" Refer to the ZoL git commit log for authoritative copyright attribution.
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License Version 1.0 (CDDL-1.0).
+.\" You can obtain a copy of the license from the top-level file
+.\" "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
+.\" You may not use this file except in compliance with the license.
.\"
.TH ZED 8 "Octember 1, 2013" "ZFS on Linux" "System Administration Commands"
@@ -250,16 +240,12 @@ The configuration file is not yet implemented.
.PP
The diagnosis engine is not yet implemented.
-.SH COPYRIGHT
-.PP
-Developed at Lawrence Livermore National Laboratory (LLNL\-CODE\-403049).
-.br
-Copyright (C) 2013\-2014 Lawrence Livermore National Security, LLC.
-
.SH LICENSE
.PP
\fBZED\fR (ZFS Event Daemon) is distributed under the terms of the
-Common Development and Distribution License (CDDL\-1.0).
+Common Development and Distribution License Version 1.0 (CDDL\-1.0).
+.PP
+Developed at Lawrence Livermore National Laboratory (LLNL\-CODE\-403049).
.SH SEE ALSO
.BR zfs (8),