diff --git a/bin/generate-zbm b/bin/generate-zbm index 873136723..c1151bebe 100755 --- a/bin/generate-zbm +++ b/bin/generate-zbm @@ -4,7 +4,7 @@ use strict; use warnings; -our $VERSION = '2.2.2+dev'; +our $VERSION = '2.3.0'; use Getopt::Long qw(:config no_ignore_case auto_version); use Pod::Usage qw(pod2usage); diff --git a/docs/conf.py b/docs/conf.py index 6f9ab664a..c6dd767b9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -10,7 +10,7 @@ author = 'ZFSBootMenu Team' man_author = f'{author} ' copyright = f'2019 Zach Dykstra, 2020-2023 {author}' -release = '2.2.2' +release = '2.3.0' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/docs/man/dist/man5/generate-zbm.5 b/docs/man/dist/man5/generate-zbm.5 index c8895a662..901c90049 100644 --- a/docs/man/dist/man5/generate-zbm.5 +++ b/docs/man/dist/man5/generate-zbm.5 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "GENERATE-ZBM" "5" "2023-10-24" "" "ZFSBootMenu" +.TH "GENERATE-ZBM" "5" "2023-12-12" "" "ZFSBootMenu" .SH NAME generate-zbm \- configuration file for generate-zbm .SH SYNOPSIS @@ -122,7 +122,7 @@ The path of the directory containing executables that should be executed after a \fBCommandLine\fP .INDENT 0.0 .INDENT 3.5 -If you\(aqre making a unified EFI file or a syslinux configuration, this is the command line passed to the boot image. +If you\(aqre making a unified EFI file, this is the command line passed to the boot image. .UNINDENT .UNINDENT .sp @@ -170,21 +170,6 @@ When \fIfalse\fP or \fI0\fP, image versioning will be disabled; \fBgenerate\-zbm When \fItrue\fP (which behaves as \fI1\fP) or any positive integer, \fBgenerate\-zbm\fP will append the value of \fIGlobal.Version\fP to every image it produces, followed by a revision as \fI_$revision\fP\&. \fBgenerate\-zbm\fP will save \fIComponents.Versions\fP revisions of all images with versions matching the current value of \fIGlobal.Version\fP\&. In addition, \fBgenerate\-zbm\fP will save the highest revision of the most recent \fIComponents.Versions\fP image versions distinct from \fIGlobal.Version\fP\&. .UNINDENT .UNINDENT -.SS Components.syslinux -.sp -\fBEnabled\fP -.INDENT 0.0 -.INDENT 3.5 -When \fItrue\fP, syslinux configuration generation is enabled. The default value is \fIfalse\fP\&. -.UNINDENT -.UNINDENT -.sp -\fBConfig\fP -.INDENT 0.0 -.INDENT 3.5 -The path of the syslinux configuration file to produce. -.UNINDENT -.UNINDENT .SS EFI .sp \fBEnabled\fP @@ -230,9 +215,6 @@ Components: ImageDir: /boot/efi/EFI/zbm Versions: false Enabled: true - syslinux: - Config: /boot/syslinux/syslinux.cfg - Enabled: false EFI: ImageDir: /boot/efi/EFI/zbm Versions: 2 diff --git a/docs/man/dist/man7/zfsbootmenu.7 b/docs/man/dist/man7/zfsbootmenu.7 index a3d986c35..36b19a2e8 100644 --- a/docs/man/dist/man7/zfsbootmenu.7 +++ b/docs/man/dist/man7/zfsbootmenu.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "ZFSBOOTMENU" "7" "2023-10-24" "" "ZFSBootMenu" +.TH "ZFSBOOTMENU" "7" "2023-12-12" "" "ZFSBootMenu" .SH NAME zfsbootmenu \- System Integration .SH SYNOPSIS @@ -259,6 +259,13 @@ Skip execution of any early\-setup, setup, load\-key, boot\-selection or teardow \fBNOTE\fP: The \fIhooklist\fP argument \fBMUST NOT\fP contain spaces and \fBMUST NOT\fP be enclosed in quotes. .UNINDENT .UNINDENT +.sp +\fBzbm.autosize\fP +.INDENT 0.0 +.INDENT 3.5 +Enable automatic font resizing of the kernel console to normalize the apparent resolution for both low resolution and high resolution displays. This option is enabled by default. +.UNINDENT +.UNINDENT .SS Deprecated Parameters .sp \fBtimeout\fP diff --git a/docs/man/dist/man8/generate-zbm.8 b/docs/man/dist/man8/generate-zbm.8 index 05446f5d9..c3a32a873 100644 --- a/docs/man/dist/man8/generate-zbm.8 +++ b/docs/man/dist/man8/generate-zbm.8 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "GENERATE-ZBM" "8" "2023-10-24" "" "ZFSBootMenu" +.TH "GENERATE-ZBM" "8" "2023-12-12" "" "ZFSBootMenu" .SH NAME generate-zbm \- ZFSBootMenu initramfs generator .SH SYNOPSIS diff --git a/docs/man/dist/man8/zbm-kcl.8 b/docs/man/dist/man8/zbm-kcl.8 index 40b739c42..4bcf59a19 100644 --- a/docs/man/dist/man8/zbm-kcl.8 +++ b/docs/man/dist/man8/zbm-kcl.8 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "ZBM-KCL" "8" "2023-10-24" "" "ZFSBootMenu" +.TH "ZBM-KCL" "8" "2023-12-12" "" "ZFSBootMenu" .SH NAME zbm-kcl \- manipulate kernel command lines for boot environments and EFI executables .SH SYNOPSIS diff --git a/zfsbootmenu/zbm-release b/zfsbootmenu/zbm-release index 572dc603c..ee1f3f3f6 100644 --- a/zfsbootmenu/zbm-release +++ b/zfsbootmenu/zbm-release @@ -6,4 +6,4 @@ HOME_URL="https://zfsbootmenu.org" DOCUMENTATION_URL="https://docs.zfsbootmenu.org" BUG_REPORT_URL="https://github.com/zbm-dev/zfsbootmenu/issues" SUPPORT_URL="https://github.com/zbm-dev/zfsbootmenu/discussions" -VERSION="2.2.2+dev" +VERSION="2.3.0"