1 files changed, 18 insertions, 14 deletions
diff --git a/documentation/content/en/books/handbook/l10n/_index.adoc b/documentation/content/en/books/handbook/l10n/_index.adoc
index fcc0514c89..73d5f3cd99 100644
--- a/documentation/content/en/books/handbook/l10n/_index.adoc
+++ b/documentation/content/en/books/handbook/l10n/_index.adoc
@@ -1,13 +1,14 @@
 ---
-title: Chapter 23. Localization - i18n/L10n Usage and Setup
+title: Chapter 25. Localization - i18n/L10n Usage and Setup
 part: Part III. System Administration
 prev: books/handbook/virtualization
 next: books/handbook/cutting-edge
 description: FreeBSD supports localization into many languages, allowing users to view, input, or process data in non-English languages
 tags: ["i18n", "L10n", "localization", "Locale", "LANG", "MM_CHARSET", "cap_mkdb"]
 showBookMenu: true
-weight: 27
-path: "/books/handbook/"
+weight: 29
+params:
+  path: "/books/handbook/l10n/"
 ---
 
 [[l10n]]
@@ -18,7 +19,7 @@ path: "/books/handbook/"
 :icons: font
 :sectnums:
 :sectnumlevels: 6
-:sectnumoffset: 23
+:sectnumoffset: 25
 :partnums:
 :source-highlighter: rouge
 :experimental:
@@ -60,7 +61,8 @@ L10n uses the same naming scheme, but from `localization`.
 The i18n/L10n methods, protocols, and applications allow users to use languages of their choice.
 
 This chapter discusses the internationalization and localization features of FreeBSD.
-After reading this chapter, you will know:
+
+Read this chapter to learn:
 
 * How locale names are constructed.
 * How to set the locale for a login shell.
@@ -69,7 +71,7 @@ After reading this chapter, you will know:
 * How to find i18n-compliant applications.
 * Where to find more information for configuring specific languages.
 
-Before reading this chapter, you should:
+Before reading this chapter:
 
 * Know how to crossref:ports[ports,install additional third-party applications].
 
@@ -85,7 +87,7 @@ LanguageCode_CountryCode.Encoding
 ....
 
 The _LanguageCode_ and _CountryCode_ are used to determine the country and the specific language variation.
-<<locale-lang-country>> provides some examples of __LanguageCode_CountryCode__:
+crossref:l10n[locale-lang-country,Common Language and Country Codes] provides some examples of __LanguageCode_CountryCode__:
 
 [[locale-lang-country]]
 .Common Language and Country Codes
@@ -146,7 +148,9 @@ Two environment variables should be set:
 
 In addition to the user's shell configuration, these variables should also be set for specific application configuration and Xorg configuration.
 
-Two methods are available for making the needed variable assignments: the <<login-class,login class>> method, which is the recommended method, and the <<startup-file,startup file>> method.
+Two methods are available for making the needed variable assignments: the
+crossref:l10n[login-class,login class] method, which is the recommended method,
+and the crossref:l10n[startup-file,startup file] method.
 The next two sections demonstrate how to use both methods.
 
 [[login-class]]
@@ -263,7 +267,7 @@ Invoke it as superuser and provide the username to edit as the argument.
 ==== Shell Startup File Method
 
 This second method is not recommended as each shell that is used requires manual configuration, where each shell has a different configuration file and differing syntax.
-As an example, to set the German language for the `sh` shell, these lines could be added to [.filename]#~/.profile# to set the shell for that user only. 
+As an example, to set the German language for the `sh` shell, these lines could be added to [.filename]#~/.profile# to set the shell for that user only.
 These lines could also be added to [.filename]#/etc/profile# or [.filename]#/usr/share/skel/dot.profile# to set that shell for all users:
 
 [.programlisting]
@@ -330,7 +334,7 @@ To test keymaps without rebooting, use man:kbdmap[1].
 The `keychange` entry is usually needed to program function keys to match the selected terminal type because function key sequences cannot be defined in the keymap.
 
 Next, set the correct console terminal type in [.filename]#/etc/ttys# for all virtual terminal entries.
-<<locale-charset>> summarizes the available terminal types.:
+crossref:l10n[locale-charset,Defined Terminal Types for Character Sets] summarizes the available terminal types.:
 
 [[locale-charset]]
 .Defined Terminal Types for Character Sets
@@ -362,7 +366,7 @@ Next, set the correct console terminal type in [.filename]#/etc/ttys# for all vi
 |===
 
 For languages with wide or multibyte characters, install a console for that language from the FreeBSD Ports Collection.
-The available ports are summarized in <<locale-console>>.
+The available ports are summarized in crossref:l10n[locale-console,Available Console from Ports Collection].
 Once installed, refer to the port's [.filename]#pkg-message# or man pages for configuration and usage instructions.
 
 [[locale-console]]
@@ -407,7 +411,7 @@ When configuring Xorg for localization, additional fonts and input methods are a
 Application specific i18n settings such as fonts and menus can be tuned in [.filename]#~/.Xresources# and should allow users to view their selected language in graphical application menus.
 
 The X Input Method (XIM) protocol is an Xorg standard for inputting non-English characters.
-<<locale-xim>> summarizes the input method applications which are available in the FreeBSD Ports Collection.
+crossref:l10n[locale-xim,Available Input Methods] summarizes the input method applications which are available in the FreeBSD Ports Collection.
 Additional Fcitx and Uim applications are also available.
 
 [[locale-xim]]
@@ -520,7 +524,7 @@ Additional Fcitx and Uim applications are also available.
 i18n applications are programmed using i18n kits under libraries.
 These allow developers to write a simple file and translate displayed menus and texts to each language.
 
-The link:https://www.FreeBSD.org/ports/[FreeBSD Ports Collection] contains many applications with built-in support for wide or multibyte characters for several languages.
+The link:https://ports.FreeBSD.org[FreeBSD Ports Collection] contains many applications with built-in support for wide or multibyte characters for several languages.
 Such applications include `i18n` in their names for easy identification.
 However, they do not always support the language needed.
 
@@ -538,7 +542,7 @@ It then provides some additional resources for localizing other languages.
 === Russian Language (KOI8-R Encoding)
 
 This section shows the specific settings needed to localize a FreeBSD system for the Russian language.
-Refer to <<using-localization,Using Localization>> for a more complete description of each type of setting.
+Refer to crossref:l10n[using-localization,Using Localization] for a complete description of each type of setting.
 
 To set this locale for the login shell, add the following lines to each user's [.filename]#~/.login_conf#: