Feature #1801
closed
update zfs and zpool manpages from CDDL-licensed files
0%
Description
The zfs.1m and zpool.1m manpages released in Solaris 11 11/11 do not contain the CDDL header anymore.
But this is not true for the files in the Solaris 11 Express Live ISO from november 2010.
The headers clearly say:
zfs.1m:
.\" Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. .\" 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 at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. .\" 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 at usr/src/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]
zpool.1m:
.\" Copyright (c) 2004, 2010, Oracle and/or its .\" affiliates. All rights reserved. .\" 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 at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. .\" 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 at usr/src/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]
Therefore, as to my opinion we can merge content from these files.
Files
Updated by Martin Matuška over 11 years ago
Updated by Martin Matuška over 11 years ago
The manpages in OpenSolaris dev build 134 already contain the majority of the text, too.
Here is an updated, revised webrev: http://cr.illumos.org/view/jt5drjoh/zfs_manpages_v2
Updated by Martin Matuška over 11 years ago
- File zfs.1m-dist-osol134.diff zfs.1m-dist-osol134.diff added
- File zfs.1m-dist-sol11ex.diff zfs.1m-dist-sol11ex.diff added
- File zfs.1m-osol134-sol11ex.diff zfs.1m-osol134-sol11ex.diff added
- File zpool.1m-dist-osol134.diff zpool.1m-dist-osol134.diff added
- File zpool.1m-dist-sol11ex.diff zpool.1m-dist-sol11ex.diff added
- File zpool.1m-osol134-sol11ex.diff zpool.1m-osol134-sol11ex.diff added
Here are some diffs to ease the review.
Updated by Martin Matuška over 11 years ago
Fixed some spaces at end of lines and zfs send:
http://cr.illumos.org/view/m1u57xze/zfs_manpages_v3
Updated by Rich Lowe over 11 years ago
Oracle indicated that the presence of the CDDL headers in the 11/11 files was not intended to suggest the files were under that license. The removal of the CDDL from the package license info (pkg info --license) was meant to be the important thing.
We can't integrate files from S11X.
We chose not to integrate files from 134, just because it's less obviously safe than from the last source tarball. It's probably fine, just not certainly fine.
The 134 manual pages were also damaged because of a bug in the conversion process to nroff, you should diff against the older pages and watch out for things being removed.
Updated by Martin Matuška over 11 years ago
So in other words we have to rewrite the text parts with our own wording? The functional parts are already in zfs source code IMO (the options itself) and we can sort these alphabetically as used.
Updated by