Project

General

Profile

Feature #1801

update zfs and zpool manpages from CDDL-licensed files

Added by Martin Matuška almost 9 years ago. Updated over 3 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
-
Start date:
2011-11-21
Due date:
% Done:

0%

Estimated time:
Difficulty:
Medium
Tags:
needs-triage
Gerrit CR:

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

zpool.1m (61.4 KB) zpool.1m Martin Matuška, 2011-11-21 08:59 AM
zfs.1m (122 KB) zfs.1m Martin Matuška, 2011-11-21 08:59 AM
zfs.1m-dist-osol134.diff (21 KB) zfs.1m-dist-osol134.diff zfs.1m diff between sunosman-20090930 and OpenSolaris snv_134 Martin Matuška, 2011-11-21 11:07 AM
zfs.1m-dist-sol11ex.diff (75.2 KB) zfs.1m-dist-sol11ex.diff zfs.1m diff between sunosman-20090930 and Solaris Express 11 (10/2010) Martin Matuška, 2011-11-21 11:07 AM
zfs.1m-osol134-sol11ex.diff (64.9 KB) zfs.1m-osol134-sol11ex.diff zfs.1m diff between OpenSolaris snv_134 and Solaris Express 11 (10/2010) Martin Matuška, 2011-11-21 11:07 AM
zpool.1m-dist-osol134.diff (30.1 KB) zpool.1m-dist-osol134.diff zpool.1m diff between sunosman-20090930 and OpenSolaris snv_134 Martin Matuška, 2011-11-21 11:07 AM
zpool.1m-dist-sol11ex.diff (45.8 KB) zpool.1m-dist-sol11ex.diff zpool.1m diff between sunosman-20090930 and Solaris Express 11 (10/2010) Martin Matuška, 2011-11-21 11:07 AM
zpool.1m-osol134-sol11ex.diff (23.3 KB) zpool.1m-osol134-sol11ex.diff zpool.1m diff between OpenSolaris snv_134 and Solaris Express 11 (10/2010) Martin Matuška, 2011-11-21 11:07 AM
#2

Updated by Martin Matuška almost 9 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

#4

Updated by Martin Matuška almost 9 years ago

Fixed some spaces at end of lines and zfs send:
http://cr.illumos.org/view/m1u57xze/zfs_manpages_v3

#5

Updated by Rich Lowe almost 9 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.

#6

Updated by Martin Matuška almost 9 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.

#7

Updated by Yuri Pankov over 3 years ago

  • Status changed from New to Closed

Also available in: Atom PDF