changeset 307:23bcbbbd99ea

FIX: Rename "ftjail-populate.rst" to "ftjail-populate-tmpl"
author Franz Glasner <fzglas.hg@dom66.de>
date Tue, 20 Sep 2022 09:16:13 +0200
parents 4ee4aea47532
children 2102b46566f0
files docs/conf.py docs/man/index8.rst docs/man/man8/ftjail-populate-tmpl.rst docs/man/man8/ftjail-populate.rst docs/man/man8/ftjail.rst docs/man/man8/local-bsdtools.rst pkg-plist sbin/ftjail
diffstat 8 files changed, 55 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/docs/conf.py	Mon Sep 19 09:35:26 2022 +0200
+++ b/docs/conf.py	Tue Sep 20 09:16:13 2022 +0200
@@ -77,7 +77,7 @@
     ("man/man8/ftjail-datasets-tmpl", "ftjail-datasets-tmpl", "Create ZFS datasets for new Thin Jails using base and skeleton", [author], 8),
     ("man/man8/ftjail-interlink-tmpl", "ftjail-interlink-tmpl", "Create proper symlinks for \"skeleton\" style Thin Jails", [author], 8),
     ("man/man8/ftjail-mount-tmpl", "ftjail-mount-tmpl", "Canonically mount the RO base and the RW skeleton of a Thin Jail", [author], 8),    
-("man/man8/ftjail-populate", "ftjail-populate", "Populate a prepared directory structure with the contents of a FreeBSD base system", [author], 8),
+("man/man8/ftjail-populate-tmpl", "ftjail-populate-tmpl", "Populate a prepared directory structure with the contents of a FreeBSD base system", [author], 8),
     ("man/man8/ftjail-snapshot-tmpl", "ftjail-snapshot-tmpl", "Recursively create ZFS snapshots of the RO base datasets and the RW skeleton datasets", [author], 8),
     ("man/man8/ftjail-umount-tmpl", "ftjail-umount-tmpl", "Unmount mounted Thin Jail template datasets", [author], 8),
     ("man/man8/fzfs", "fzfs", "A ZFS management helper tool", [author], 8),
--- a/docs/man/index8.rst	Mon Sep 19 09:35:26 2022 +0200
+++ b/docs/man/index8.rst	Tue Sep 20 09:16:13 2022 +0200
@@ -14,7 +14,7 @@
    man8/ftjail-datasets-tmpl
    man8/ftjail-interlink-tmpl
    man8/ftjail-mount-tmpl     
-   man8/ftjail-populate
+   man8/ftjail-populate-tmpl
    man8/ftjail-snapshot-tmpl
    man8/ftjail-umount-tmpl  
    man8/fzfs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/man/man8/ftjail-populate-tmpl.rst	Tue Sep 20 09:16:13 2022 +0200
@@ -0,0 +1,47 @@
+.. -*- coding: utf-8; indent-tabs-mode: nil; -*-
+
+ftjail-populate-tmpl
+====================
+
+Synopsis
+--------
+
+**ftjail populate-tmpl** **-L** `directory` `path/to/base.txz`
+
+**ftjail populate-tmpl** **-P** `directory` `path/to/base.txz`
+
+
+Description
+-----------
+
+Populate the directory in `directory` with a FreeBSD base system.
+The base system's archive ist in `path/to/base.txz`.
+
+The directory in `directory` must already have a proper
+directory layout.
+This can be accomplished by :manpage:`ftjail-mount-tmpl(8)`.
+
+Apply knowledge of the type and typical layout of the RW skeleton
+(e.g. handle the :file:`skeleton` symlink properly).
+
+
+Options
+-------
+
+.. program:: ftjail populate-tmpl
+
+.. option:: -L
+
+   Copy dataset properties optimized for employing a :file:`skeleton`
+   subdirectory.
+
+.. option:: -P
+
+   Copy dataset properties optimized for direct mounts of skeleton
+   children over an already mounted base.
+
+
+See Also
+--------
+
+:manpage:`ftjail(8)`, :manpage:`ftjail-mount-tmpl(8)`
--- a/docs/man/man8/ftjail-populate.rst	Mon Sep 19 09:35:26 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-.. -*- coding: utf-8; indent-tabs-mode: nil; -*-
-
-ftjail-populate
-===============
-
-Synopsis
---------
-
-**ftjail populate** **-L** `directory` `path/to/base.txz`
-
-**ftjail populate** **-P** `directory` `path/to/base.txz`
-
-
-Description
------------
-
-Populate the directory in `directory` with a FreeBSD base system.
-The base system's archive ist in `path/to/base.txz`.
-
-The directory in `directory` must already have a proper
-directory layout.
-This can be accomplished by :manpage:`ftjail-mount-tmpl(8)`.
-
-Apply knowledge of the type and typical layout of the RW skeleton
-(e.g. handle the :file:`skeleton` symlink properly).
-
-
-Options
--------
-
-.. program:: ftjail populate
-
-.. option:: -L
-
-   Copy dataset properties optimized for employing a :file:`skeleton`
-   subdirectory.
-
-.. option:: -P
-
-   Copy dataset properties optimized for direct mounts of skeleton
-   children over an already mounted base.
-
-
-See Also
---------
-
-:manpage:`ftjail(8)`, :manpage:`ftjail-mount-tmpl(8)`
--- a/docs/man/man8/ftjail.rst	Mon Sep 19 09:35:26 2022 +0200
+++ b/docs/man/man8/ftjail.rst	Tue Sep 20 09:16:13 2022 +0200
@@ -37,7 +37,7 @@
 
     Create proper symlinks for "skeleton" style Thin Jails
 
-:manpage:`ftjail-populate(8)`
+:manpage:`ftjail-populate-tmpl(8)`
 
     Populate a prepared directory structure with the contents of a
     FreeBSD base system
@@ -55,7 +55,7 @@
 Implementation Notes
 --------------------
 
-All commands with the exception of :command:`ftjail populate` and
+All commands with the exception of :command:`ftjail populate-tmpl` and
 :command:`ftjail interlink-tmpl` require ZFS as filesystem.
 
 
--- a/docs/man/man8/local-bsdtools.rst	Mon Sep 19 09:35:26 2022 +0200
+++ b/docs/man/man8/local-bsdtools.rst	Tue Sep 20 09:16:13 2022 +0200
@@ -20,7 +20,7 @@
   * :manpage:`ftjail-datasets-tmpl(8)`
   * :manpage:`ftjail-interlink-tmpl(8)`
   * :manpage:`ftjail-mount-tmpl(8)`
-  * :manpage:`ftjail-populate(8)`
+  * :manpage:`ftjail-populate-tmpl(8)`
   * :manpage:`ftjail-snapshot-tmpl(8)`
   * :manpage:`ftjail-umount-tmpl(8)`
 
--- a/pkg-plist	Mon Sep 19 09:35:26 2022 +0200
+++ b/pkg-plist	Tue Sep 20 09:16:13 2022 +0200
@@ -12,7 +12,7 @@
 %%DOCS%%man/man8/ftjail-datasets-tmpl.8.gz
 %%DOCS%%man/man8/ftjail-interlink-tmpl.8.gz
 %%DOCS%%man/man8/ftjail-mount-tmpl.8.gz
-%%DOCS%%man/man8/ftjail-populate.8.gz
+%%DOCS%%man/man8/ftjail-populate-tmpl.8.gz
 %%DOCS%%man/man8/ftjail-snapshot-tmpl.8.gz
 %%DOCS%%man/man8/ftjail-umount-tmpl.8.gz
 %%DOCS%%man/man8/fzfs.8.gz
--- a/sbin/ftjail	Mon Sep 19 09:35:26 2022 +0200
+++ b/sbin/ftjail	Tue Sep 20 09:16:13 2022 +0200
@@ -36,7 +36,7 @@
 
   interlink-tmpl MOUNTPOINT
 
-  populate -L|-P DIRECTORY BASETXZ
+  populate-tmpl -L|-P DIRECTORY BASETXZ
 
   snapshot-tmpl BASE-RO SKELETON-RW SNAPSHOT-NAME
 
@@ -48,7 +48,7 @@
 
 DESCRIPTION:
 
-  All commands with the exception of "populate" require ZFS as
+  All commands with the exception of "populate-tmpl" require ZFS as
   filesystem.
 '