diff options
| author | mm <mm@FreeBSD.org> | 2011-11-21 15:33:37 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-11-21 15:33:37 +0000 |
| commit | c40e1792cb2819f698b5b9b354cb35b6e0c59b90 (patch) | |
| tree | 35bbc269e864b5f3b62ea238c0bf15349330b272 | |
| parent | ef1f257773d4049cdd18061b1aa3b8b2c01ea43a (diff) | |
| download | FreeBSD-src-c40e1792cb2819f698b5b9b354cb35b6e0c59b90.zip FreeBSD-src-c40e1792cb2819f698b5b9b354cb35b6e0c59b90.tar.gz | |
Fix mismerge in copyright of zpool(8).
MFC after: 4 days
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool.8 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 b/cddl/contrib/opensolaris/cmd/zpool/zpool.8 index b121a0e..dc5f913 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8 @@ -1,6 +1,5 @@ '\" te .\" Copyright (c) 2004, 2010, Oracle and/or its -.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved. .\" affiliates. All rights reserved. .\" The contents of this file are subject to the .\" terms of the Common Development and Distribution License (the "License"). @@ -12,6 +11,9 @@ .\" 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] +.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved. +.\" Portions Copyright 2011 Justin T. Gibbs <gibbs@FreeBSD.org> +.\" Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> .TH ZPOOL 8 "November 21, 2011" FreeBSD .SH NAME zpool \- configures ZFS storage pools |
