svn commit: r360111 - stable/12/usr.sbin/jail

[Eugene Grosbein]

Author: eugen
Date: Mon Apr 20 08:12:40 2020
New Revision: 360111
URL: https://svnweb.freebsd.org/changeset/base/360111

Log:
  MFC r360040: jail(8): improve manual and usage information
  with more clear description for "jail -e" mode
  to show that it does not take additional jail name argument.
  
  Reported by:	David Marec <david.marec at davenulle.org>

Modified:
  stable/12/usr.sbin/jail/jail.8
  stable/12/usr.sbin/jail/jail.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/jail/jail.8
==============================================================================
--- stable/12/usr.sbin/jail/jail.8	Mon Apr 20 01:26:18 2020	(r360110)
+++ stable/12/usr.sbin/jail/jail.8	Mon Apr 20 08:12:40 2020	(r360111)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 6, 2019
+.Dd April 17, 2020
 .Dt JAIL 8
 .Os
 .Sh NAME
@@ -49,7 +49,6 @@
 .Nm
 .Op Fl qv
 .Op Fl f Ar conf_file
-.Op Fl e Ar separator
 .Op Fl rR
 .Op Cm * | Ar jail ...
 .Nm
@@ -60,6 +59,10 @@
 .Op Fl n Ar jailname
 .Op Fl s Ar securelevel
 .Op Ar path hostname [ Ar ip Ns [ Ns Ar ,... Ns ]] Ar command ...
+.Nm
+.Op Fl f Ar conf_file
+.Fl e
+.Ar separator
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/usr.sbin/jail/jail.c
==============================================================================
--- stable/12/usr.sbin/jail/jail.c	Mon Apr 20 01:26:18 2020	(r360110)
+++ stable/12/usr.sbin/jail/jail.c	Mon Apr 20 08:12:40 2020	(r360111)
@@ -1040,10 +1040,11 @@ usage(void)
 	(void)fprintf(stderr,
 	    "usage: jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n"
 	    "            -[cmr] param=value ... [command=command ...]\n"
-	    "       jail [-dqv] [-f file] [-e separator] -[cmr] [jail]\n"
+	    "       jail [-dqv] [-f file] -[cmr] [jail]\n"
 	    "       jail [-qv] [-f file] -[rR] ['*' | jail ...]\n"
 	    "       jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n"
 	    "            [-n jailname] [-s securelevel]\n"
-	    "            path hostname [ip[,...]] command ...\n");
+	    "            path hostname [ip[,...]] command ...\n"
+	    "       jail [-f file] -e separator\n");
 	exit(1);
 }