From 8798063e84884f3263f9b7abd9913308b7950063 Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Sat, 7 Dec 2013 03:18:16 +0100 Subject: Lots of spelling fixes in comments and man pages submitted by Paul Ivanov --- ezjail-admin | 2 +- ezjail.sh | 2 +- man5/ezjail.conf.5 | 8 ++++---- man7/ezjail.7 | 14 +++++++------- man8/ezjail-admin.8 | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ezjail-admin b/ezjail-admin index 8330d01..f8bb9a7 100755 --- a/ezjail-admin +++ b/ezjail-admin @@ -434,7 +434,7 @@ ensure_jailzfs() { _zfs_status=`/sbin/zfs list -H -o name ${ezjail_jailzfs} 2> /dev/null` [ "${_zfs_status}" = "${ezjail_jailzfs}" ] && return - # if a directoy already exists in that place, make sure it is empty, else bump user + # if a directory already exists in that place, make sure it is empty, else bump user [ -d "${ezjail_jaildir}" -a -n "`ls -A ${ezjail_jaildir}`" ] && exerr "Error: Can not create zfs at ${ezjail_jaildir}.\n There is a non-empty directory in the way." # create all parent file systems if necessary diff --git a/ezjail.sh b/ezjail.sh index 56c2f94..6f2a703 100755 --- a/ezjail.sh +++ b/ezjail.sh @@ -89,7 +89,7 @@ do_cmd() # Cannot auto mount blocking jails without interrupting boot process [ "${ezjail_fromrc}" -a "${action}" = "start" -a "${ezjail_blocking}" ] && echo -n " ...skipping blocking jail ${ezjail}" && continue - # Explicitely do only run blocking crypto jails when *crypto is requested + # Explicitly do only run blocking crypto jails when *crypto is requested [ "${action%crypto}" = "${action}" -o "${ezjail_blocking}" ] || continue # Try to attach (crypto) devices diff --git a/man5/ezjail.conf.5 b/man5/ezjail.conf.5 index 806e760..a86db07 100755 --- a/man5/ezjail.conf.5 +++ b/man5/ezjail.conf.5 @@ -1,4 +1,4 @@ -.Dd January 15, 2011 +.Dd December 5, 2013 .Dt EZJAIL.CONF 5 USD .Os FreeBSD .Sh NAME @@ -157,7 +157,7 @@ Default: .It ezjail_imagetype (one of simple, bde, eli, zfs) Type of jail to create when creating a jail with the .Fl i -flag without specifying the type explicitely. +flag without specifying the type explicitly. .br Default: .Em simple @@ -165,7 +165,7 @@ Default: .Sh ZFS OPTIONS .Bl -tag -width option .It ezjail_use_zfs (bool) -Set to YES, if ezjail should manage basejail and newjail in a seperate +Set to YES, if ezjail should manage basejail and newjail in a separate ZFS-datasets. .br Default: @@ -184,7 +184,7 @@ Default: The name of the parent ZFS-dataset which ezjail will use to create jails on. It will be mounted in .Em ezjail_jaildir . -Setting this will automaticly enable ezjail managing jails in seperate +Setting this will automatically enable ezjail managing jails in separate ZFS-datasets. .br Default: diff --git a/man7/ezjail.7 b/man7/ezjail.7 index d30fb2e..83a920b 100644 --- a/man7/ezjail.7 +++ b/man7/ezjail.7 @@ -1,4 +1,4 @@ -.Dd January 15, 2011 +.Dd December 5, 2013 .Dt EZJAIL 7 USD .Os .Sh NAME @@ -145,7 +145,7 @@ filesystem. See .Sx Jail Creation Examples for details. .Pp -Also, ezjail can be configured to install its basejail and the accompaning +Also, ezjail can be configured to install its basejail and the accompanying template for all new jails into its own filesystem. Set the .Dq Li $ezjail_use_zfs variable in your @@ -348,7 +348,7 @@ configuration, creating classes of jails for development or testing favourite web development framework), pre-creating local users, and so on. .Ss Updating the Base Jail -We already mentionned how easy it is to update jails, since only one +We already mentioned how easy it is to update jails, since only one copy needs to be updated. Ezjail only handles updating the base system; updating the ports is left to the administrator (but see .Dq Li ports-mgmt/jailaudit @@ -361,7 +361,7 @@ binary packages. If a base jail already exists, the command installs the world in a temporary directory before moving it to the basejail, thus leaving intact all installed libraries. After making sure all software running in the jails is linked with the new -librairies, you may want to remove the old library versions. It is +libraries, you may want to remove the old library versions. It is often a good idea to update the jails when a new kernel is installed in the host, using the same sources. .Ss Starting Jails @@ -433,7 +433,7 @@ knobs for allowing a jail to access raw sockets, see the man page for details. .Pp Once your jail has network access, then all your normal application -install functions are availabe, right from the jails console. In +install functions are available, right from the jails console. In particular, if the ports collection was installed, it can be used as if from the host system. A modified .Pa make.conf @@ -458,7 +458,7 @@ in .Pa rc.conf . It is possible to set this variable to .Dq Li NO -if the administrator wants to temporarily ezjail, or if she doesn't +if the administrator wants to temporarily disable ezjail, or if she doesn't want the jails to be automatically started on boot. .Pp The ezjail system may be reset to a pristine state by removing all its @@ -618,7 +618,7 @@ Create a new jail, placing it in directory instead of deriving the directory name of the jail from its host name. The jail will be created with the flavour .Ar example . -This jail will be given two IP addressses; this is possible only since +This jail will be given two IP addresses; this is possible only since FreeBSD 7.2. .It Nm Cm create Fl i Fl s Ar 600M sandbox2 10.0.10.4 This creates a new file-based jail having a file size of 600 megabytes diff --git a/man8/ezjail-admin.8 b/man8/ezjail-admin.8 index 72ef892..8382e44 100644 --- a/man8/ezjail-admin.8 +++ b/man8/ezjail-admin.8 @@ -1,4 +1,4 @@ -.Dd August 01, 2013 +.Dd December 5, 2013 .Dt EZJAIL-ADMIN 8 USD .Os FreeBSD .Sh NAME @@ -129,7 +129,7 @@ is used. Variable: .Pp It is possible to install from the .Li disc1 -CDRom, or an extracted -RELEASE directory, by specifying the +CD-ROM, or an extracted -RELEASE directory, by specifying the .Ar host argument as .Pa file://path/to/source . @@ -351,7 +351,7 @@ Use .Ar command instead of the default .Dq /usr/bin/login -f root . -loogin command. A one time change to use a different user can be +login command. A one time change to use a different user can be accomplished by using .Fl e Qq Li /usr/bin/login -f user . Variable: @@ -562,7 +562,7 @@ you may pass freebsd-update's call to .Dq uname -r via the .Pa UNAME_r -environment variable. Since there currently is no way of infering the +environment variable. Since there currently is no way of inferring the osversion currently installed in the basejail, you need to remember the original osversion and pass it to this script using the .Fl s -- cgit v1.2.3