[gentoo-commits] proj/locale-gen:master commit in: /

["Kerin Millar" <kfm@plushkava.net>]

commit:     d864bb47d8831da997793d90ccbc0faaac7748c4
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Tue Oct 28 16:45:41 2025 +0000
Commit:     Kerin Millar <kfm <AT> plushkava <DOT> net>
CommitDate: Tue Oct 28 16:57:35 2025 +0000
URL:        https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=d864bb47

locale.gen.5: amend the EXAMPLES section

The locale-gen(8) utility no longer permits localename/charmap
combinations that are unlisted by the SUPPORTED file. Amend the EXAMPLES
section so as to better reflect the new behaviour. Similarly, amend a
sentence in the CHARACTER MAPS section.

See-also: 588e3ede89a6b630420839e704cf975a28f0d981
Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>

 locale.gen.5 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/locale.gen.5 b/locale.gen.5
index b8eab26..37eafa9 100644
--- a/locale.gen.5
+++ b/locale.gen.5
@@ -26,7 +26,7 @@ A \fIcharmap\fR, also known as a character set or codeset, is a mapping of chara
 .P
 A complete list of supported \fIcharmap\fR values can be obtained by reading the second column of the \fI/usr/share/i18n/SUPPORTED\fR file. Its values map directly to the names of files residing in the \fI/usr/share/i18n/charmaps\fR directory, notwithstanding that the names may have a suffix as a consequence of having been compressed.
 .P
-Given that not all values of \fIlocalename\fR incorporate a codeset, the configuration file requires for the second field of each line to define a \fIcharmap\fR.
+Given that not all supported values of \fIlocalename\fR incorporate a codeset, the configuration file requires for the second field of each line to define a \fIcharmap\fR.
 .SH "EXAMPLES"
 .EX
 # This is a comment, followed by some valid locale declarations.
@@ -35,13 +35,12 @@ zh_CN.UTF\-8  UTF\-8
 de_DE.UTF\-8  UTF\-8
 hi_IN.UTF\-8  UTF\-8
 ja_JP.UTF\-8  UTF\-8 # trailing comments are permitted
-
 .sp
-# This is invalid because the charmap field is missing.
-en_US.UTF\-8
+# This is invalid because the localename/charmap combination is unsupported.
+en_US        GB2312
 .sp
-# This is invalid because the charmap does not match the codeset.
-en_US.UTF\-8  ISO\-8859\-1
+# This is invalid because the charmap field is missing.
+en_US
 .EE
 .SH "FILES"
 .TP