diff --git a/docs/chapters/configuration.rst b/docs/chapters/configuration.rst index 909abed0..99503016 100644 --- a/docs/chapters/configuration.rst +++ b/docs/chapters/configuration.rst @@ -38,7 +38,7 @@ This is the default `bastille.conf` file. ## ports - The FreeBSD ports (3rd party applications) tree ## src - The source code to the kernel + userland ## test - The FreeBSD test suite - ## Whitespace separated list: + ## Whitespace-separated list: ## bastille_bootstrap_archives="base lib32 ports src test" bastille_bootstrap_archives="base" ## default: "base" @@ -56,7 +56,7 @@ This is the default `bastille.conf` file. ## optional-jail[-dbg] - Optional base system software for jails ## src - System source code ## tests - System test suite - ## Whitespace separated list: + ## Whitespace-separated list: ## bastille_pkgbase_packages="base-jail lib32-dbg src" bastille_pkgbase_packages="base-jail" ## default: "base-jail" diff --git a/docs/chapters/installation.rst b/docs/chapters/installation.rst index e62623bf..068342e1 100644 --- a/docs/chapters/installation.rst +++ b/docs/chapters/installation.rst @@ -5,7 +5,7 @@ Bastille is available in the official FreeBSD ports tree at ``sysutils/bastille``. Binary packages are available in quarterly and latest repositories. -Current version is ``1.2.2.251203``. +Current version is ``1.2.2.251204``. To install from the FreeBSD package repository: diff --git a/docs/chapters/pkgbase.rst b/docs/chapters/pkgbase.rst index 9cbaed71..f92e8aa9 100644 --- a/docs/chapters/pkgbase.rst +++ b/docs/chapters/pkgbase.rst @@ -49,7 +49,7 @@ before attempting to upgrade to 16.0-RELEASE. This can be done in two ways. ./pkgbasify.lua 2. Fetch the ``pkgbasify`` script and run it from the host using ``--rootdir``. - This requires using PR 34 in the ``pkgbasify`` repo. + This requires using `PR 34 `_ in the ``pkgbasify`` repo. .. code-block:: shell diff --git a/docs/chapters/usage.rst b/docs/chapters/usage.rst index 42c38698..e100bb0f 100644 --- a/docs/chapters/usage.rst +++ b/docs/chapters/usage.rst @@ -8,7 +8,7 @@ Usage containerized applications on FreeBSD. Usage: - bastille command [options(s)] TARGET [option(s)] [args] + bastille [option(s)] command [option(s)] TARGET ARGS Available Commands: bootstrap Bootstrap a release for jail base. @@ -52,4 +52,4 @@ Usage Use "bastille -v|--version" for version information. Use "bastille command -h|--help" for more information about a command. - Use "bastille -c|--config config.conf command" to specify a non-default config file. \ No newline at end of file + Use "bastille -c|--config FILE command" to specify a non-default config file. \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 858c57cf..7089853d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -7,7 +7,7 @@ author = 'Christer Edwards' # The short X.Y version version = '1.2.2' # The full version, including alpha/beta/rc tags -release = '1.2.2.251203' +release = '1.2.2.251204' # -- General configuration --------------------------------------------------- diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index 2d993651..8b8cb263 100755 --- a/usr/local/bin/bastille +++ b/usr/local/bin/bastille @@ -32,7 +32,7 @@ PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin -BASTILLE_VERSION=1.2.2.251203 +BASTILLE_VERSION=1.2.2.251204 # Validate config file # Copy default when 'setup' is called @@ -73,7 +73,7 @@ Bastille is an open-source system for automating deployment and management of containerized applications on FreeBSD. Usage: - bastille command [options(s)] TARGET [option(s)] [args] + bastille [option(s)] command [option(s)] TARGET ARGS Available Commands: bootstrap Bootstrap a release for jail base. @@ -117,7 +117,7 @@ Available Commands: Use "bastille -v|--version" for version information. Use "bastille command -h|--help" for more information about a command. -Use "bastille -c|--config config.conf command" to specify a non-default config file. +Use "bastille -c|--config FILE command" to specify a non-default config file. EOF exit 1