From owner-svn-src-head@FreeBSD.ORG Wed Nov 14 01:16:30 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 123A2593; Wed, 14 Nov 2012 01:16:30 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E168D8FC12; Wed, 14 Nov 2012 01:16:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAE1GTME063369; Wed, 14 Nov 2012 01:16:29 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAE1GTeH063364; Wed, 14 Nov 2012 01:16:29 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201211140116.qAE1GTeH063364@svn.freebsd.org> From: Martin Matuska Date: Wed, 14 Nov 2012 01:16:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243014 - in head: . cddl/contrib/opensolaris/cmd/zpool cddl/sbin/zpool X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2012 01:16:30 -0000 Author: mm Date: Wed Nov 14 01:16:29 2012 New Revision: 243014 URL: http://svnweb.freebsd.org/changeset/base/243014 Log: Move zpool-features manual page from section 5 to section 7 and fix references Reported by: pluknet MFC after: 1 week Added: head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 - copied, changed from r243013, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 Deleted: head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 Modified: head/ObsoleteFiles.inc head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c head/cddl/sbin/zpool/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Nov 14 00:43:27 2012 (r243013) +++ head/ObsoleteFiles.inc Wed Nov 14 01:16:29 2012 (r243014) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20121114: zpool-features manual page moved from section 5 to 7 +OLD_FILES+=usr/share/man/man5/zpool-features.5.gz # 20121022: VFS_LOCK_GIANT elimination OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz Copied and modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 (from r243013, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5) ============================================================================== --- head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 Wed Nov 14 00:43:27 2012 (r243013, copy source) +++ head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Wed Nov 14 01:16:29 2012 (r243014) @@ -22,7 +22,7 @@ .\" $FreeBSD$ .\" .Dd Aug 28, 2012 -.Dt ZPOOL-FEATURES 5 +.Dt ZPOOL-FEATURES 7 .Os .Sh NAME .Nm zpool-features Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Wed Nov 14 00:43:27 2012 (r243013) +++ head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Wed Nov 14 01:16:29 2012 (r243014) @@ -567,7 +567,7 @@ Total size of the storage pool. .It Sy unsupported@ Ns Ar feature_guid Information about unsupported features that are enabled on the pool. See -.Xr zpool-features 5 +.Xr zpool-features 7 for details. .It Sy used Amount of storage space used within the pool. @@ -717,7 +717,7 @@ which moves .Ar feature_name to the enabled state. See -.Xr zpool-features 5 +.Xr zpool-features 7 for details on feature states. .It Sy listsnaps Ns = Ns Cm on No | Cm off Controls whether information about snapshots associated with this pool is @@ -915,7 +915,7 @@ with the .Fl o option. See -.Xr zpool-features 5 +.Xr zpool-features 7 for details about feature properties. .It Xo .Fl o Ar property Ns = Ns Ar value @@ -1651,7 +1651,7 @@ Displays legacy .Tn ZFS versions supported by the current software. See -.Xr zpool-features.5 +.Xr zpool-features 7 for a description of feature flags features supported by the current software. .El .It Xo @@ -1665,7 +1665,7 @@ Enables all supported features on the gi Once this is done, the pool will no longer be accessible on systems that do not support feature flags. See -.Xr zpool-features.5 +.Xr zpool-features 7 for details on compatability with system sthat support feature flags, but do not support all features enabled on the pool. .Bl -tag -width indent @@ -1928,7 +1928,7 @@ Discarded approximately 29 seconds of tr .El .Sh SEE ALSO .Xr zfs 8 -.Xr zpool-features 5 +.Xr zpool-features 7 .Sh AUTHORS This manual page is a .Xr mdoc 7 Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed Nov 14 00:43:27 2012 (r243013) +++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed Nov 14 01:16:29 2012 (r243014) @@ -345,7 +345,7 @@ usage(boolean_t requested) (void) fprintf(fp, "YES disabled | enabled | active\n"); (void) fprintf(fp, gettext("\nThe feature@ properties must be " - "appended with a feature name.\nSee zpool-features(5).\n")); + "appended with a feature name.\nSee zpool-features(7).\n")); } /* @@ -4170,7 +4170,7 @@ status_callback(zpool_handle_t *zhp, voi (void) printf(gettext("action: Enable all features using " "'zpool upgrade'. Once this is done,\n\tthe pool may no " "longer be accessible by software that does not support\n\t" - "the features. See zpool-features(5) for details.\n")); + "the features. See zpool-features(7) for details.\n")); break; case ZPOOL_STATUS_UNSUP_FEAT_READ: @@ -4630,7 +4630,7 @@ upgrade_list_disabled_cb(zpool_handle_t "pool may become incompatible with " "software\nthat does not support " "the feature. See " - "zpool-features(5) for " + "zpool-features(7) for " "details.\n\n")); (void) printf(gettext("POOL " "FEATURE\n")); Modified: head/cddl/sbin/zpool/Makefile ============================================================================== --- head/cddl/sbin/zpool/Makefile Wed Nov 14 00:43:27 2012 (r243013) +++ head/cddl/sbin/zpool/Makefile Wed Nov 14 01:16:29 2012 (r243014) @@ -5,7 +5,7 @@ .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs PROG= zpool -MAN= zpool.8 zpool-features.5 +MAN= zpool.8 zpool-features.7 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c SRCS+= timestamp.c