Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 186 insertions, 103 deletions

diff --git a/man8/iconvconfig.8 b/man8/iconvconfig.8
index f02eede..ab931d7 100644
--- a/man8/iconvconfig.8
+++ b/man8/iconvconfig.8
@@ -2,7 +2,7 @@
 .\"
 .\" SPDX-License-Identifier: GPL-2.0-or-later
 .\"
-.TH iconvconfig 8 2022-10-30 "Linux man-pages 6.05.01"
+.TH iconvconfig 8 2023-10-31 "Linux man-pages 6.7"
 .SH NAME
 iconvconfig \- create iconv module configuration cache
 .SH SYNOPSIS
@@ -21,12 +21,12 @@ Loading and parsing such a configuration file would slow down
 programs that use
 .BR iconv (3),
 so a caching mechanism is employed.
-.PP
+.P
 The
 .B iconvconfig
 program reads iconv module configuration files and writes
 a fast-loading gconv module configuration cache file.
-.PP
+.P
 In addition to the system provided gconv modules, the user can specify
 custom gconv module directories with the environment variable
 .BR GCONV_PATH .
@@ -40,7 +40,9 @@ is not set.
 Do not search the system default gconv directory,
 only the directories provided on the command line.
 .TP
-.BI \-o " outputfile" ", \-\-output=" outputfile
+.BI \-\-output= outputfile
+.TQ
+.BI \-o\~ outputfile
 Use
 .I outputfile
 for output instead of the system default cache location.
@@ -56,13 +58,17 @@ the gconv module configuration would be read from
 and the cache would be written to
 .IR foo/usr/lib/gconv/gconv\-modules.cache .
 .TP
-.BR \-? ", " \-\-help
+.B \-\-help
+.TQ
+.B \-?
 Print a usage summary and exit.
 .TP
-.B "\-\-usage"
+.B \-\-usage
 Print a short usage summary and exit.
 .TP
-.BR \-V ", " \-\-version
+.B \-\-version
+.TQ
+.B \-V
 Print the version number, license, and disclaimer of warranty for
 .BR iconv .
 .SH EXIT STATUS
@@ -77,7 +83,7 @@ Usual system default gconv module configuration file.
 .TP
 .I /usr/lib/gconv/gconv\-modules.cache
 Usual system gconv module configuration cache.
-.PP
+.P
 Depending on the architecture,
 the above files may instead be located at directories with the path prefix
 .IR /usr/lib64 .
diff --git a/man8/intro.8 b/man8/intro.8
index 23fbcbd..c1368eb 100644
--- a/man8/intro.8
+++ b/man8/intro.8
@@ -7,7 +7,7 @@
 .\" Modified Sat Jul 24 17:35:48 1993 by Rik Faith (faith@cs.unc.edu)
 .\" 2007-10-23 mtk: minor rewrites, and added paragraph on exit status
 .\"
-.TH intro 8 2022-10-30 "Linux man-pages 6.05.01"
+.TH intro 8 2023-10-31 "Linux man-pages 6.7"
 .SH NAME
 intro \- introduction to administration and privileged commands
 .SH DESCRIPTION
@@ -15,7 +15,7 @@ Section 8 of the manual describes commands
 which either can be or are used only by the superuser,
 like system-administration commands, daemons,
 and hardware-related commands.
-.PP
+.P
 As with the commands described in Section 1, the commands described
 in this section terminate with an exit status that indicates
 whether the command succeeded or failed.
diff --git a/man8/ld.so.8 b/man8/ld.so.8
index afd29c5..8767b50 100644
--- a/man8/ld.so.8
+++ b/man8/ld.so.8
@@ -4,7 +4,7 @@
 .\" Various parts:
 .\" Copyright (C) 2007-9, 2013, 2016 Michael Kerrisk <mtk.manpages@gmail.com>
 .\"
-.TH ld.so 8 2023-07-18 "Linux man-pages 6.05.01"
+.TH ld.so 8 2024-02-12 "Linux man-pages 6.7"
 .SH NAME
 ld.so, ld\-linux.so \- dynamic linker/loader
 .SH SYNOPSIS
@@ -15,7 +15,7 @@ to the dynamic linker can be passed and, in the ELF case, the dynamic linker
 which is stored in the
 .B .interp
 section of the program is executed) or directly by running:
-.PP
+.P
 .I /lib/ld\-linux.so.*
 [OPTIONS] [PROGRAM [ARGUMENTS]]
 .SH DESCRIPTION
@@ -25,14 +25,14 @@ and
 .B ld\-linux.so*
 find and load the shared objects (shared libraries) needed by a program,
 prepare the program to run, and then run it.
-.PP
+.P
 Linux binaries require dynamic linking (linking at run time)
 unless the
 .B \-static
 option was given to
 .BR ld (1)
 during compilation.
-.PP
+.P
 The program
 .B ld.so
 handles a.out binaries, a binary format used long ago.
@@ -46,7 +46,7 @@ support files and programs
 .BR ldconfig (8),
 and
 .IR /etc/ld.so.conf ).
-.PP
+.P
 When resolving shared object dependencies,
 the dynamic linker first inspects each dependency
 string to see if it contains a slash (this can occur if
@@ -54,7 +54,7 @@ a shared object pathname containing slashes was specified at link time).
 If a slash is found, then the dependency string is interpreted as
 a (relative or absolute) pathname,
 and the shared object is loaded using that pathname.
-.PP
+.P
 If a shared object dependency does not contain a slash,
 then it is searched for in the following order:
 .IP (1) 5
@@ -132,7 +132,7 @@ in the filename arguments to the
 and
 .BR dlmopen (3)
 functions.
-.PP
+.P
 The substituted tokens are as follows:
 .TP
 .IR $ORIGIN " (or equivalently " ${ORIGIN} )
@@ -187,7 +187,7 @@ value in the auxiliary vector (see
 .\"
 .\" ld.so lets names be abbreviated, so $O will work for $ORIGIN;
 .\" Don't do this!!
-.PP
+.P
 Note that the dynamic string tokens have to be quoted properly when
 set from a shell,
 to prevent their expansion as shell or environment variables.
@@ -208,6 +208,14 @@ The objects in
 .I list
 are delimited by colons.
 .TP
+.BI \-\-glibc-hwcaps-mask " list"
+only search built-in subdirectories if in
+.IR list .
+.TP
+.BI \-\-glibc-hwcaps-prepend " list"
+Search glibc-hwcaps subdirectories in
+.IR list .
+.TP
 .B \-\-inhibit\-cache
 Do not use
 .IR /etc/ld.so.cache .
@@ -238,6 +246,16 @@ are delimited by colons or spaces.
 .B \-\-list
 List all dependencies and how they are resolved.
 .TP
+.BR \-\-list\-diagnostics " (since glibc 2.33)"
+Print system diagnostic information in a machine-readable format,
+such as some internal loader variables,
+the auxiliary vector
+(see
+.BR getauxval (3)),
+and the environment variables.
+On some architectures,
+the command might print additional information
+(like the cpu features used in GNU indirect function selection on x86).
 .BR \-\-list\-tunables " (since glibc 2.33)"
 Print the names and values of all tunables,
 along with the minimum and maximum allowed values.
@@ -280,6 +298,17 @@ Other environment variables treated in this way include:
 .BR GETCONF_DIR ,
 .BR HOSTALIASES ,
 .BR LOCALDOMAIN ,
+.BR LD_AUDIT ,
+.BR LD_DEBUG ,
+.BR LD_DEBUG_OUTPUT ,
+.BR LD_DYNAMIC_WEAK ,
+.BR LD_HWCAP_MASK ,
+.BR LD_LIBRARY_PATH ,
+.BR LD_ORIGIN_PATH ,
+.BR LD_PRELOAD ,
+.BR LD_PROFILE ,
+.BR LD_SHOW_AUXV ,
+.BR LOCALDOMAIN ,
 .BR LOCPATH ,
 .BR MALLOC_TRACE ,
 .BR NIS_PATH ,
@@ -289,7 +318,7 @@ Other environment variables treated in this way include:
 .BR TMPDIR ,
 and
 .BR TZDIR .
-.PP
+.P
 A binary is executed in secure-execution mode if the
 .B AT_SECURE
 entry in the auxiliary vector (see
@@ -310,7 +339,7 @@ A nonzero value may have been set by a Linux Security Module.
 .SS Environment variables
 Among the more important environment variables are the following:
 .TP
-.BR LD_ASSUME_KERNEL " (since glibc 2.2.3)"
+.BR LD_ASSUME_KERNEL " (from glibc 2.2.3 to glibc 2.36)"
 Each shared object can inform the dynamic linker of the minimum kernel ABI
 version that it requires.
 (This requirement is encoded in an ELF note section that is viewable via
@@ -457,7 +486,7 @@ If set (to any value), causes the program to list its dynamic
 dependencies, as if run by
 .BR ldd (1),
 instead of running normally.
-.PP
+.P
 Then there are lots of more or less obscure variables,
 many obsolete or only for internal use.
 .TP
@@ -627,8 +656,11 @@ Since glibc 2.3.4,
 .B LD_DYNAMIC_WEAK
 is ignored in secure-execution mode.
 .TP
-.BR LD_HWCAP_MASK " (since glibc 2.1)"
+.BR LD_HWCAP_MASK " (from glibc 2.1 to glibc 2.38)"
 Mask for hardware capabilities.
+Since glibc 2.26,
+the option might be ignored
+if glibc does not support tunables.
 .TP
 .BR LD_ORIGIN_PATH " (since glibc 2.1)"
 Path where the binary is found.
@@ -663,7 +695,7 @@ Profiling output is appended to the file whose name is:
 .IP
 Since glibc 2.2.5,
 .B LD_PROFILE
-is ignored in secure-execution mode.
+uses a different default path in secure-execution mode.
 .TP
 .BR LD_PROFILE_OUTPUT " (since glibc 2.1)"
 Directory where
@@ -677,10 +709,6 @@ then the default is
 is ignored in secure-execution mode; instead
 .I /var/profile
 is always used.
-(This detail is relevant only before glibc 2.2.5,
-since in later glibc versions,
-.B LD_PROFILE
-is also ignored in secure-execution mode.)
 .TP
 .BR LD_SHOW_AUXV " (since glibc 2.1)"
 If this environment variable is defined (with any value),
@@ -691,7 +719,7 @@ Since glibc 2.3.4,
 .B LD_SHOW_AUXV
 is ignored in secure-execution mode.
 .TP
-.BR LD_TRACE_PRELINKING " (since glibc 2.4)"
+.BR LD_TRACE_PRELINKING " (from glibc 2.4 to glibc 2.35)"
 If this environment variable is defined,
 trace prelinking of the object whose name is assigned to
 this environment variable.
@@ -702,7 +730,7 @@ If the object name is not recognized,
 .\" (This is what seems to happen, from experimenting)
 then all prelinking activity is traced.
 .TP
-.BR LD_USE_LOAD_BIAS " (since glibc 2.3.3)"
+.BR LD_USE_LOAD_BIAS " (from glibc 2.3.3 to glibc 2.35)"
 .\" http://sources.redhat.com/ml/libc-hacker/2003-11/msg00127.html
 .\" Subject: [PATCH] Support LD_USE_LOAD_BIAS
 .\" Jakub Jelinek
@@ -788,7 +816,7 @@ as a temporary workaround to a library misconfiguration issue.)
 .I lib*.so*
 shared objects
 .SH NOTES
-.SS Hardware capabilities
+.SS Legacy Hardware capabilities (from glibc 2.5 to glibc 2.37)
 Some shared objects are compiled using hardware-specific instructions which do
 not exist on every CPU.
 Such objects should be installed in directories whose names define the
@@ -823,6 +851,65 @@ z900, z990, z9-109, z10, zarch
 .B x86 (32-bit only)
 acpi, apic, clflush, cmov, cx8, dts, fxsr, ht, i386, i486, i586, i686, mca, mmx,
 mtrr, pat, pbe, pge, pn, pse36, sep, ss, sse, sse2, tm
+.P
+The legacy hardware capabilities support has the drawback that
+each new feature added grows the search path exponentially,
+because it has to be added to
+every combination of the other existing features.
+.P
+For instance, on x86 32-bit,
+if the hardware supports
+.B i686
+and
+.BR sse2 ,
+the resulting search path will be
+.BR i686/sse2:i686:sse2:. .
+A new capability
+.B newcap
+will set the search path to
+.BR newcap/i686/sse2:newcap/i686:newcap/sse2:newcap:i686/sse2:i686:sse2: .
+.\"
+.SS glibc Hardware capabilities (from glibc 2.33)
+.TP
+.\" The initial discussion on various pitfalls of the old scheme is
+.\" <https://sourceware.org/pipermail/libc-alpha/2020-May/113757.html>
+.\" and the patchset that proposes the glibc-hwcap support is
+.\" <https://sourceware.org/pipermail/libc-alpha/2020-June/115250.html>
+glibc 2.33 added a new hardware capability scheme,
+where under each CPU architecture,
+certain levels can be defined,
+grouping support for certain features or special instructions.
+Each architecture level has
+a fixed set of paths that it adds to the dynamic linker search list,
+depending on the hardware of the machine.
+Since each new architecture level is
+not combined with previously existing ones,
+the new scheme does not have the drawback of
+growing the dynamic linker search list uncontrollably.
+.P
+For instance, on x86 64-bit,
+if the hardware supports
+.B x86_64-v3
+(for instance Intel Haswell or AMD Excavator),
+the resulting search path will be
+.B glibc-hwcaps/x86-64-v3:glibc-hwcaps/x86-64-v2:.
+.\" The x86_64 architectures levels are defined the official ABI:
+.\" <https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex>
+.\" The PowerPC and s390x are glibc defined ones based on chip
+.\" support (which maps to ISA levels).
+The following paths are currently supported, in priority order.
+.TP
+.B PowerPC (64-bit little-endian only)
+power10, power9
+.TP
+.B s390 (64-bit only)
+z16, z15, z14, z13
+.TP
+.B x86 (64-bit only)
+x86-64-v4, x86-64-v3, x86-64-v2
+.P
+glibc 2.37 removed support for the legacy hardware capabilities.
+.\"
 .SH SEE ALSO
 .BR ld (1),
 .BR ldd (1),
diff --git a/man8/ldconfig.8 b/man8/ldconfig.8
index 5bbfd86..1b51742 100644
--- a/man8/ldconfig.8
+++ b/man8/ldconfig.8
@@ -5,7 +5,7 @@
 .\"
 .\" Modified, 6 May 2002, Michael Kerrisk, <mtk.manpages@gmail.com>
 .\"   Change listed order of /usr/lib and /lib
-.TH ldconfig 8 2023-03-11 "Linux man-pages 6.05.01"
+.TH ldconfig 8 2023-10-31 "Linux man-pages 6.7"
 .SH NAME
 ldconfig \- configure dynamic linker run-time bindings
 .SH SYNOPSIS
@@ -49,7 +49,7 @@ while
 and
 .I /usr/lib64
 are used for 64-bit libraries.
-.PP
+.P
 The cache is used by the run-time linker,
 .I ld.so
 or
@@ -63,7 +63,7 @@ determining which versions should have their links updated.
 .B \%ldconfig
 should normally be run by the superuser as it may require write
 permission on some root owned directories and files.
-.PP
+.P
 .B \%ldconfig
 will look only at files that are named
 .I lib*.so*
@@ -78,20 +78,20 @@ like this example,
 where the middle file
 .RB ( libfoo.so.1
 here) is the SONAME for the library:
-.PP
+.P
 .in +4n
 .EX
 libfoo.so \-> libfoo.so.1 \-> libfoo.so.1.12
 .EE
 .in
-.PP
+.P
 Failure to follow this pattern may result in compatibility issues
 after an upgrade.
 .SH OPTIONS
 .TP
-.BI \-c\~ fmt
-.TQ
 .BI \-\-format= fmt
+.TQ
+.BI \-c\~ fmt
 (Since glibc 2.2)
 .\" commit 45eca4d141c047950db48c69c8941163d0a61fcd
 Use cache format
@@ -121,9 +121,9 @@ Use
 instead of
 .IR /etc/ld.so.conf .
 .TP
-.B \-i
-.TQ
 .B \-\-ignore\-aux\-cache
+.TQ
+.B \-i
 (Since glibc 2.7)
 .\" commit 27d9ffda17df4d2388687afd12897774fde39bcc
 Ignore auxiliary cache file.
@@ -148,9 +148,9 @@ Unless
 is also specified,
 links are still updated.
 .TP
-.B \-p
-.TQ
 .B \-\-print\-cache
+.TQ
+.B \-p
 Print the lists of directories and candidate libraries stored in
 the current cache.
 .TP
@@ -159,18 +159,18 @@ Change to and use
 .I root
 as the root directory.
 .TP
-.B \-v
-.TQ
 .B \-\-verbose
+.TQ
+.B \-v
 Verbose mode.
 Print current version number,
 the name of each directory as it is scanned,
 and any links that are created.
 Overrides quiet mode.
 .TP
-.B \-V
-.TQ
 .B \-\-version
+.TQ
+.B \-V
 Print program version.
 .TP
 .B \-X
diff --git a/man8/nscd.8 b/man8/nscd.8
index 1b39b95..3d2204e 100644
--- a/man8/nscd.8
+++ b/man8/nscd.8
@@ -6,7 +6,7 @@
 .\" 2008-12-05 Petr Baudis <pasky@suse.cz>
 .\"	Rewrite the NOTES section to reflect modern reality
 .\"
-.TH nscd 8 2022-10-30 "Linux man-pages 6.05.01"
+.TH nscd 8 2023-10-31 "Linux man-pages 6.7"
 .SH NAME
 nscd \- name service cache daemon
 .SH DESCRIPTION
@@ -18,7 +18,7 @@ The default configuration file,
 determines the behavior of the cache daemon.
 See
 .BR nscd.conf (5).
-.PP
+.P
 .B nscd
 provides caching for accesses of the
 .BR passwd (5),
@@ -34,7 +34,7 @@ databases through standard libc interfaces, such as
 .BR getgrgid (3),
 .BR gethostbyname (3),
 and others.
-.PP
+.P
 There are two caches for each database:
 a positive one for items found, and a negative one
 for items not found.
@@ -70,7 +70,7 @@ In that case, you need to run the following command
 after changing the configuration file of the database so that
 .B nscd
 invalidates its cache:
-.PP
+.P
 .in +4n
 .EX
 $ \fBnscd \-i\fP \fI<database>\fP
diff --git a/man8/sln.8 b/man8/sln.8
index 81d9078..29d960b 100644
--- a/man8/sln.8
+++ b/man8/sln.8
@@ -2,7 +2,7 @@
 .\"
 .\" SPDX-License-Identifier: Linux-man-pages-copyleft
 .\"
-.TH sln 8 2023-01-07 "Linux man-pages 6.05.01"
+.TH sln 8 2023-10-31 "Linux man-pages 6.7"
 .SH NAME
 sln \- create symbolic links
 .SH SYNOPSIS
@@ -20,13 +20,13 @@ program, it is statically linked.
 This means that if for some reason the dynamic linker is not working,
 .B sln
 can be used to make symbolic links to dynamic libraries.
-.PP
+.P
 The command line has two forms.
 In the first form, it creates
 .I dest
 as a new symbolic link to
 .IR source .
-.PP
+.P
 In the second form,
 .I filelist
 is a list of space-separated pathname pairs,
@@ -34,7 +34,7 @@ and the effect is as if
 .B sln
 was executed once for each line of the file,
 with the two pathnames as the arguments.
-.PP
+.P
 The
 .B sln
 program supports no command-line options.
diff --git a/man8/tzselect.8 b/man8/tzselect.8
index 4578090..ee03161 100644
--- a/man8/tzselect.8
+++ b/man8/tzselect.8
@@ -95,7 +95,7 @@ Output version information and exit.
 .SH "ENVIRONMENT VARIABLES"
 .TP
 \f3AWK\fP
-Name of a Posix-compliant
+Name of a POSIX-compliant
 .B awk
 program (default:
 .BR awk ).
diff --git a/man8/zdump.8 b/man8/zdump.8
index f77c0c7..c3f0bba 100644
--- a/man8/zdump.8
+++ b/man8/zdump.8
@@ -152,10 +152,9 @@ tabbed columns line up.)
 .nf
 .sp
 .if \n(.g .ft CR
-.if t .in +.5i
-.if n .in +2
+.in +2
 .nr w \w'1896-01-13  'u+\n(.i
-.ta \w'1896-01-13  'u +\w'12:01:26  'u +\w'-103126  'u +\w'HWT  'u
+.ta \w'1896-01-13\0\0'u +\w'12:01:26\0\0'u +\w'-103126\0\0'u +\w'HWT\0\0'u
 TZ="Pacific/Honolulu"
 -	-	-103126	LMT
 1896-01-13	12:01:26	-1030	HST
diff --git a/man8/zic.8 b/man8/zic.8
index c467efe..0ad373a 100644
--- a/man8/zic.8
+++ b/man8/zic.8
@@ -95,7 +95,7 @@ as local time.
 .B zic
 will act as if the input contained a link line of the form
 .sp
-.ti +.5i
+.ti +2
 .ta \w'Link\0\0'u  +\w'\fItimezone\fP\0\0'u
 Link	\fItimezone\fP		localtime
 .sp
@@ -118,9 +118,15 @@ TZ strings like "EET\*-2EEST" that lack transition rules.
 .B zic
 will act as if the input contained a link line of the form
 .sp
-.ti +.5i
+.ti +2
 Link	\fItimezone\fP		posixrules
 .sp
+If
+.I timezone
+is
+.q "\*-"
+(the default), any already-existing link is removed.
+.sp
 Unless
 .I timezone is
 .q "\*-" ,
@@ -131,12 +137,6 @@ and it should not be combined with
 if
 .IR timezone 's
 transitions are at standard time or Universal Time (UT) instead of local time.
-.sp
-If
-.I timezone
-is
-.BR \*- ,
-any already-existing link is removed.
 .TP
 .BR "\*-r " "[\fB@\fP\fIlo\fP][\fB/@\fP\fIhi\fP]"
 Limit the applicability of output files
@@ -171,7 +171,7 @@ boundaries, particularly if
 causes a TZif file to contain explicit entries for
 .RI pre- hi
 transitions rather than concisely representing them
-with an extended POSIX TZ string.
+with an extended POSIX.1-2017 TZ string.
 Also see the
 .B "\*-b slim"
 option for another way to shrink output size.
@@ -181,10 +181,10 @@ Generate redundant trailing explicit transitions for timestamps
 that occur less than
 .I hi
 seconds since the Epoch, even though the transitions could be
-more concisely represented via the extended POSIX TZ string.
+more concisely represented via the extended POSIX.1-2017 TZ string.
 This option does not affect the represented timestamps.
 Although it accommodates nonstandard TZif readers
-that ignore the extended POSIX TZ string,
+that ignore the extended POSIX.1-2017 TZ string,
 it increases the size of the altered output files.
 .TP
 .BI "\*-t " file
@@ -245,10 +245,10 @@ for
 .PP
 The output file does not contain all the information about the
 long-term future of a timezone, because the future cannot be summarized as
-an extended POSIX TZ string.  For example, as of 2023 this problem
+an extended POSIX.1-2017 TZ string.  For example, as of 2023 this problem
 occurs for Morocco's daylight-saving rules, as these rules are based
 on predictions for when Ramadan will be observed, something that
-an extended POSIX TZ string cannot represent.
+an extended POSIX.1-2017 TZ string cannot represent.
 .PP
 The output contains data that may not be handled properly by client
 code designed for older
@@ -330,19 +330,19 @@ abbreviation must be unambiguous in context.
 .PP
 A rule line has the form
 .nf
-.ti +.5i
+.ti +2
 .ta \w'Rule\0\0'u +\w'NAME\0\0'u +\w'FROM\0\0'u +\w'1973\0\0'u +\w'\*-\0\0'u +\w'Apr\0\0'u +\w'lastSun\0\0'u +\w'2:00w\0\0'u +\w'1:00d\0\0'u
 .sp
 Rule	NAME	FROM	TO	\*-	IN	ON	AT	SAVE	LETTER/S
 .sp
 For example:
-.ti +.5i
+.ti +2
 .sp
 Rule	US	1967	1973	\*-	Apr	lastSun	2:00w	1:00d	D
 .sp
 .fi
 The fields that make up a rule line are:
-.TP "\w'LETTER/S'u"
+.TP
 .B NAME
 Gives the name of the rule set that contains this line.
 The name must start with a character that is neither
@@ -360,24 +360,15 @@ an unquoted name should not contain characters from the set
 Gives the first year in which the rule applies.
 Any signed integer year can be supplied; the proleptic Gregorian calendar
 is assumed, with year 0 preceding year 1.
-The word
-.B minimum
-(or an abbreviation) means the indefinite past.
-The word
-.B maximum
-(or an abbreviation) means the indefinite future.
 Rules can describe times that are not representable as time values,
 with the unrepresentable times ignored; this allows rules to be portable
 among hosts with differing time value types.
 .TP
 .B TO
 Gives the final year in which the rule applies.
-In addition to
-.B minimum
-and
+The word
 .B maximum
-(as above),
-the word
+(or an abbreviation) means the indefinite future, and the word
 .B only
 (or an abbreviation)
 may be used to repeat the value of the
@@ -404,7 +395,7 @@ Month names may be abbreviated.
 Gives the day on which the rule takes effect.
 Recognized forms include:
 .nf
-.in +.5i
+.in +2
 .sp
 .ta \w'Sun<=25\0\0'u
 5	the fifth of the month
@@ -413,7 +404,7 @@ lastMon	the last Monday in the month
 Sun>=8	first Sunday on or after the eighth
 Sun<=25	last Sunday on or before the 25th
 .fi
-.in -.5i
+.in
 .sp
 A weekday name (e.g.,
 .BR "Sunday" )
@@ -440,7 +431,7 @@ Gives the time of day at which the rule takes effect,
 relative to 00:00, the start of a calendar day.
 Recognized forms include:
 .nf
-.in +.5i
+.in +2
 .sp
 .ta \w'00:19:32.13\0\0'u
 2	time in hours
@@ -454,7 +445,7 @@ Recognized forms include:
 \*-2:30	2.5 hours before 00:00
 \*-	equivalent to 0
 .fi
-.in -.5i
+.in
 .sp
 Although
 .B zic
@@ -532,18 +523,18 @@ the variable part is null.
 A zone line has the form
 .sp
 .nf
-.ti +.5i
+.ti +2
 .ta \w'Zone\0\0'u +\w'Asia/Amman\0\0'u +\w'STDOFF\0\0'u +\w'Jordan\0\0'u +\w'FORMAT\0\0'u
 Zone	NAME	STDOFF	RULES	FORMAT	[UNTIL]
 .sp
 For example:
 .sp
-.ti +.5i
+.ti +2
 Zone	Asia/Amman	2:00	Jordan	EE%sT	2017 Oct 27 01:00
 .sp
 .fi
 The fields that make up a zone line are:
-.TP "\w'STDOFF'u"
+.TP
 .B NAME
 The name of the timezone.
 This is the name used in creating the time conversion information file for the
@@ -663,15 +654,15 @@ For example:
 .br
 .ne 7
 .nf
-.in +2m
+.in +2
 .ta \w'# Rule\0\0'u +\w'NAME\0\0'u +\w'FROM\0\0'u +\w'2006\0\0'u +\w'\*-\0\0'u +\w'Oct\0\0'u +\w'lastSun\0\0'u +\w'2:00\0\0'u +\w'SAVE\0\0'u
 .sp
 # Rule	NAME	FROM	TO	\*-	IN	ON	AT	SAVE	LETTER/S
 Rule	US	1967	2006	-	Oct	lastSun	2:00	0	S
 Rule	US	1967	1973	-	Apr	lastSun	2:00	1:00	D
-.ta \w'Zone\0\0America/Menominee\0\0'u +\w'STDOFF\0\0'u +\w'RULES\0\0'u +\w'FORMAT\0\0'u
-# Zone\0\0NAME	STDOFF	RULES	FORMAT	[UNTIL]
-Zone\0\0America/Menominee	\*-5:00	\*-	EST	1973 Apr 29 2:00
+.ta \w'# Zone\0\0'u +\w'America/Menominee\0\0'u +\w'STDOFF\0\0'u +\w'RULES\0\0'u +\w'FORMAT\0\0'u
+# Zone	NAME	STDOFF	RULES	FORMAT	[UNTIL]
+Zone	America/Menominee	\*-5:00	\*-	EST	1973 Apr 29 2:00
 	\*-6:00	US	C%sT
 .sp
 .in
@@ -687,13 +678,13 @@ interprets this more sensibly as a single transition from 02:00 CST (\*-05) to
 A link line has the form
 .sp
 .nf
-.ti +.5i
+.ti +2
 .ta \w'Link\0\0'u +\w'Europe/Istanbul\0\0'u
 Link	TARGET	LINK-NAME
 .sp
 For example:
 .sp
-.ti +.5i
+.ti +2
 Link	Europe/Istanbul	Asia/Istanbul
 .sp
 .fi
@@ -717,7 +708,7 @@ For example:
 .sp
 .ne 3
 .nf
-.in +2m
+.in +2
 .ta \w'Zone\0\0'u +\w'Greenwich\0\0'u
 Link	Greenwich	G_M_T
 Link	Etc/GMT	Greenwich
@@ -737,13 +728,13 @@ The file that describes leap seconds can have leap lines and an
 expiration line.
 Leap lines have the following form:
 .nf
-.ti +.5i
+.ti +2
 .ta \w'Leap\0\0'u +\w'YEAR\0\0'u +\w'MONTH\0\0'u +\w'DAY\0\0'u +\w'HH:MM:SS\0\0'u +\w'CORR\0\0'u
 .sp
 Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
 .sp
 For example:
-.ti +.5i
+.ti +2
 .sp
 Leap	2016	Dec	31	23:59:60	+	S
 .sp
@@ -791,13 +782,13 @@ option is used.
 .PP
 The expiration line, if present, has the form:
 .nf
-.ti +.5i
+.ti +2
 .ta \w'Expires\0\0'u +\w'YEAR\0\0'u +\w'MONTH\0\0'u +\w'DAY\0\0'u
 .sp
 Expires	YEAR	MONTH	DAY	HH:MM:SS
 .sp
 For example:
-.ti +.5i
+.ti +2
 .sp
 Expires	2020	Dec	28	00:00:00
 .sp
@@ -816,7 +807,7 @@ Here is an extended example of
 .B zic
 input, intended to illustrate many of its features.
 .nf
-.in +2m
+.in +2
 .ta \w'# Rule\0\0'u +\w'NAME\0\0'u +\w'FROM\0\0'u +\w'1973\0\0'u +\w'\*-\0\0'u +\w'Apr\0\0'u +\w'lastSun\0\0'u +\w'2:00\0\0'u +\w'SAVE\0\0'u
 .sp
 # Rule	NAME	FROM	TO	\*-	IN	ON	AT	SAVE	LETTER/S