Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Sep 2012 07:30:43 +0200
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        Baptiste Daroussin <bapt@FreeBSD.org>
Cc:        svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org
Subject:   Re: svn commit: r240698 - head/cddl/contrib/opensolaris/cmd/zfs
Message-ID:  <20120921053043.GE1407@garage.freebsd.pl>
In-Reply-To: <20120920213843.GQ26107@ithaqua.etoilebsd.net>
References:  <201209191628.q8JGSckQ025683@svn.freebsd.org> <20120920211701.GD1407@garage.freebsd.pl> <20120920213843.GQ26107@ithaqua.etoilebsd.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--XuV1QlJbYrcVoo+x
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Sep 20, 2012 at 11:38:43PM +0200, Baptiste Daroussin wrote:
> On Thu, Sep 20, 2012 at 11:17:01PM +0200, Pawel Jakub Dawidek wrote:
> > On Wed, Sep 19, 2012 at 04:28:38PM +0000, Baptiste Daroussin wrote:
> > > Author: bapt
> > > Date: Wed Sep 19 16:28:38 2012
> > > New Revision: 240698
> > > URL: http://svn.freebsd.org/changeset/base/240698
> > >=20
> > > Log:
> > >   Update usage to show the possiblity to use jail name
> > >  =20
> > >   Reported by:	bdrewery
> > >   MFC after:	1 month
> > >=20
> > > Modified:
> > >   head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
> > >=20
> > > Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
> > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > > --- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed Sep 19 16:21=
:23 2012	(r240697)
> > > +++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed Sep 19 16:28=
:38 2012	(r240698)
> > > @@ -240,9 +240,9 @@ get_usage(zfs_help_t idx)
> > >  		return (gettext("\tupgrade [-v]\n"
> > >  		    "\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
> > >  	case HELP_JAIL:
> > > -		return (gettext("\tjail <jailid> <filesystem>\n"));
> > > +		return (gettext("\tjail <jailid|jailname> <filesystem>\n"));
> >=20
> > Please keep the style consistent. As you can see two lines above there
> > are spaces around |.
> >=20
>=20
> Sure but both syntax are present in the usage: <filesystem|volume|snapsho=
t> in
> fact the only one with space around | is the line above you are showing, =
all the
> rest of the usage is without space, That is why I did it without spaces.
>=20
> If you tell me it is better with spaces, I'll add space.

It is probably better to leave it as-is then, I only looked at the diff
context. Sorry for the noise.

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://tupytaj.pl

--XuV1QlJbYrcVoo+x
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlBb+4IACgkQForvXbEpPzQEMgCg1tY+3lZ1bJW3Pkad7xY8T6y8
qmEAoPPfoDOkRKwX+nKLdaTGPeUc0Tty
=4aL0
-----END PGP SIGNATURE-----

--XuV1QlJbYrcVoo+x--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120921053043.GE1407>