1 files changed, 78 insertions, 74 deletions

diff --git a/documentation/content/en/books/faq/_index.po b/documentation/content/en/books/faq/_index.po
index 5cd50c6175..141e38b4bd 100644
--- a/documentation/content/en/books/faq/_index.po
+++ b/documentation/content/en/books/faq/_index.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: FreeBSD Documentation VERSION\n"
-"POT-Creation-Date: 2022-08-07 10:35-0300\n"
+"POT-Creation-Date: 2022-09-09 20:50-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -356,12 +356,12 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:176
 msgid ""
-"extref:{handbook}[FreeBSD-CURRENT, current] is the development version of "
-"the operating system, which will in due course become the new FreeBSD-STABLE "
-"branch.  As such, it is really only of interest to developers working on the "
-"system and die-hard hobbyists.  See the extref:{handbook}[relevant section, "
-"current] in the extref:{handbook}[Handbook] for details on running _-"
-"CURRENT_."
+"extref:{handbook}cutting-edge/[FreeBSD-CURRENT, current] is the development "
+"version of the operating system, which will in due course become the new "
+"FreeBSD-STABLE branch.  As such, it is really only of interest to developers "
+"working on the system and die-hard hobbyists.  See the extref:{handbook}"
+"cutting-edge/[relevant section, current] in the extref:{handbook}[Handbook] "
+"for details on running _-CURRENT_."
 msgstr ""
 
 #. type: Plain text
@@ -1046,9 +1046,9 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:394
 msgid ""
-"Refer to the extref:{handbook}[Handbook entry on mailing-lists, eresources-"
-"mail] and the extref:{handbook}[Handbook entry on newsgroups, eresources-"
-"news]."
+"Refer to the extref:{handbook}eresources/[Handbook entry on mailing-lists, "
+"eresources-mail] and the extref:{handbook}eresources/[Handbook entry on "
+"newsgroups, eresources-news]."
 msgstr ""
 
 #. type: Title ===
@@ -1263,8 +1263,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:474
 msgid ""
-"Installation instructions can be found at extref:{handbook}[Handbook entry "
-"on installing FreeBSD, bsdinstall]."
+"Installation instructions can be found at extref:{handbook}bsdinstall/"
+"[Handbook entry on installing FreeBSD]."
 msgstr ""
 
 #. type: Title ===
@@ -2088,9 +2088,9 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:846
 msgid ""
-"To adjust the `kern.maxusers` value, see the extref:{handbook}[File/Process "
-"Limits, kern-maxfiles] section of the Handbook.  While that section refers "
-"to open files, the same limits apply to processes."
+"To adjust the `kern.maxusers` value, see the extref:{handbook}config/[File/"
+"Process Limits, kern-maxfiles] section of the Handbook.  While that section "
+"refers to open files, the same limits apply to processes."
 msgstr ""
 
 #. type: Plain text
@@ -2216,10 +2216,10 @@ msgstr ""
 #: documentation/content/en/books/faq/_index.adoc:899
 msgid ""
 "This error message indicates that the number of available file descriptors "
-"have been exhausted on the system.  Refer to the extref:{handbook}[kern."
-"maxfiles, kern-maxfiles] section of the extref:{handbook}[Tuning Kernel "
-"Limits, configtuning-kernel-limits] section of the Handbook for a discussion "
-"and solution."
+"have been exhausted on the system.  Refer to the extref:{handbook}config/"
+"[kern.maxfiles, kern-maxfiles] section of the extref:{handbook}config/"
+"[Tuning Kernel Limits, configtuning-kernel-limits] section of the Handbook "
+"for a discussion and solution."
 msgstr ""
 
 #. type: Title ===
@@ -2489,8 +2489,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1027
 msgid ""
-"See crossref:handbook[ports-using-installation-methods,Installing the Ports "
-"Collection]."
+"See extref:{handbook}ports/[Installing the Ports Collection, ports-using-"
+"installation-methods]"
 msgstr ""
 
 #. type: Title ===
@@ -2504,11 +2504,11 @@ msgstr ""
 msgid ""
 "If the installed FreeBSD version lags significantly behind _-CURRENT_ or _-"
 "STABLE_, update the Ports Collection using the instructions in extref:"
-"{handbook}[Using the Ports Collection, ports-using].  If the system is up-to-"
-"date, someone might have committed a change to the port which works for _-"
-"CURRENT_ but which broke the port for _-STABLE_.  https://bugs.FreeBSD.org/"
-"submit/[Submit] a bug report, since the Ports Collection is supposed to work "
-"for both the _-CURRENT_ and _-STABLE_ branches."
+"{handbook}ports/[Using the Ports Collection, ports-using].  If the system is "
+"up-to-date, someone might have committed a change to the port which works "
+"for _-CURRENT_ but which broke the port for _-STABLE_.  https://bugs.FreeBSD."
+"org/submit/[Submit] a bug report, since the Ports Collection is supposed to "
+"work for both the _-CURRENT_ and _-STABLE_ branches."
 msgstr ""
 
 #. type: Title ===
@@ -2545,8 +2545,8 @@ msgstr ""
 msgid ""
 "FreeBSD does not include a port upgrading tool, but it does have some tools "
 "to make the upgrade process somewhat easier.  Additional tools are available "
-"to simplify port handling and are described the extref:{handbook}[Upgrading "
-"Ports, ports-using] section in the FreeBSD Handbook."
+"to simplify port handling and are described the extref:{handbook}ports/"
+"[Upgrading Ports, ports-using] section in the FreeBSD Handbook."
 msgstr ""
 
 #. type: Title ===
@@ -2575,8 +2575,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1060
 msgid ""
-"For more information, see extref:{handbook}[the section on upgrades, "
-"freebsdupdate-upgrade] in the FreeBSD Handbook."
+"For more information, see extref:{handbook}cutting-edge/[the section on "
+"upgrades, freebsdupdate-upgrade] in the FreeBSD Handbook."
 msgstr ""
 
 #. type: Title ===
@@ -2640,8 +2640,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1087
 msgid ""
-"Not at all! Check out the extref:{handbook}[kernel config section of the "
-"Handbook, kernelconfig]."
+"Not at all! Check out the extref:{handbook}kernelconfig/[kernel config "
+"section of the Handbook]."
 msgstr ""
 
 #. type: delimited block = 4
@@ -2760,7 +2760,8 @@ msgstr ""
 #: documentation/content/en/books/faq/_index.adoc:1144
 msgid ""
 "To put any of these options into effect, follow the instructions to extref:"
-"{handbook}[build and install, kernelconfig-building] the new kernel."
+"{handbook}kernelconfig/[build and install, kernelconfig-building] the new "
+"kernel."
 msgstr ""
 
 #. type: Plain text
@@ -2858,8 +2859,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1179
 msgid ""
-"See the extref:{handbook}[Adding Disks, disks-adding] section in the FreeBSD "
-"Handbook."
+"See the extref:{handbook}disks/[Adding Disks, disks-adding] section in the "
+"FreeBSD Handbook."
 msgstr ""
 
 #. type: Title ===
@@ -3192,8 +3193,9 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1327
 msgid ""
-"Yes, man:gbde[8] and man:geli[8].  See the extref:{handbook}[Encrypting Disk "
-"Partitions, disks-encrypting] section of the FreeBSD Handbook."
+"Yes, man:gbde[8] and man:geli[8].  See the extref:{handbook}disks/"
+"[Encrypting Disk Partitions, disks-encrypting] section of the FreeBSD "
+"Handbook."
 msgstr ""
 
 #. type: Title ===
@@ -3342,7 +3344,7 @@ msgstr ""
 #: documentation/content/en/books/faq/_index.adoc:1406
 msgid ""
 "The type of device to mount must be specified.  This is described in the "
-"Handbook section on extref:{handbook}[Using Data CDs, mounting-cd]."
+"Handbook section on extref:{handbook}disks/[Using Data CDs, mounting-cd]."
 msgstr ""
 
 #. type: Title ===
@@ -3355,8 +3357,8 @@ msgstr ""
 #: documentation/content/en/books/faq/_index.adoc:1412
 msgid ""
 "This generally means that there is no CD in the drive, or the drive is not "
-"visible on the bus.  Refer to the extref:{handbook}[Using Data CDs, mounting-"
-"cd] section of the Handbook for a detailed discussion of this issue."
+"visible on the bus.  Refer to the extref:{handbook}disks/[Using Data CDs, "
+"mounting-cd] section of the Handbook for a detailed discussion of this issue."
 msgstr ""
 
 #. type: Title ===
@@ -3370,7 +3372,7 @@ msgstr ""
 msgid ""
 "The CD probably uses the \"Joliet\" extension for storing information about "
 "files and directories.  This is discussed in the Handbook section on extref:"
-"{handbook}[Using Data CD-ROMs, mounting-cd]."
+"{handbook}disks/[Using Data CD-ROMs, mounting-cd]."
 msgstr ""
 
 #. type: Title ===
@@ -3383,8 +3385,8 @@ msgstr ""
 #: documentation/content/en/books/faq/_index.adoc:1424
 msgid ""
 "This means a raw file was burned to the CD, rather than creating an ISO 9660 "
-"file system.  Take a look at the Handbook section on extref:{handbook}[Using "
-"Data CDs]."
+"file system.  Take a look at the Handbook section on extref:{handbook}disks/"
+"[Using Data CDs]."
 msgstr ""
 
 #. type: Title ===
@@ -3396,10 +3398,10 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1430
 msgid ""
-"This is discussed in the Handbook section on extref:{handbook}[Writing Data "
-"to an ISO File System, mkisofs].  For more on working with CD-ROMs, see the "
-"extref:{handbook}[Creating CDs Section, creating-cds] in the Storage chapter "
-"in the Handbook."
+"This is discussed in the Handbook section on extref:{handbook}disks/[Writing "
+"Data to an ISO File System, mkisofs].  For more on working with CD-ROMs, see "
+"the extref:{handbook}disks/[Creating CDs Section, creating-cds] in the "
+"Storage chapter in the Handbook."
 msgstr ""
 
 #. type: Title ===
@@ -3576,8 +3578,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1522
 msgid ""
-"This section extref:{handbook}[of the Handbook, adding-swap-space] describes "
-"how to do this."
+"This section extref:{handbook}config/[of the Handbook, adding-swap-space] "
+"describes how to do this."
 msgstr ""
 
 #. type: Title ===
@@ -3973,7 +3975,7 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1712
 msgid ""
-"See the extref:{handbook}[Handbook entry on printing, printing] for "
+"See the extref:{handbook}printing/[Handbook entry on printing] for "
 "troubleshooting tips."
 msgstr ""
 
@@ -3986,9 +3988,9 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1718
 msgid ""
-"Refer to the Handbook section on extref:{handbook}[using localization, using-"
-"localization], specifically the section on extref:{handbook}[console setup, "
-"setting-console]."
+"Refer to the Handbook section on extref:{handbook}l10n/[using localization, "
+"using-localization], specifically the section on extref:{handbook}l10n/"
+"[console setup, setting-console]."
 msgstr ""
 
 #. type: Title ===
@@ -4014,8 +4016,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:1731
 msgid ""
-"Refer to the extref:{handbook}[Handbook entry on quotas, quotas] for full "
-"details."
+"Refer to the extref:{handbook}disks/[Handbook entry on quotas, quotas] for "
+"full details."
 msgstr ""
 
 #. type: Plain text
@@ -4154,7 +4156,8 @@ msgid ""
 "If the root partition cannot be mounted from single-user mode, it is "
 "possible that the partitions are encrypted and it is impossible to mount "
 "them without the access keys.  For more information see the section about "
-"encrypted disks in the FreeBSD extref:{handbook}[Handbook, disks-encrypting]."
+"encrypted disks in the FreeBSD extref:{handbook}disks/[Handbook, disks-"
+"encrypting]."
 msgstr ""
 
 #. type: Title ===
@@ -4611,7 +4614,7 @@ msgstr ""
 #: documentation/content/en/books/faq/_index.adoc:2009
 msgid ""
 "After the installation of Xorg, follow the instructions from the extref:"
-"{handbook}[X11 Configuration, x-config] section of the FreeBSD Handbook."
+"{handbook}x11/[X11 Configuration, x-config] section of the FreeBSD Handbook."
 msgstr ""
 
 #. type: Title ===
@@ -5287,8 +5290,8 @@ msgstr ""
 msgid ""
 "\"Diskless booting\" means that the FreeBSD box is booted over a network, "
 "and reads the necessary files from a server instead of its hard disk.  For "
-"full details, see extref:{handbook}[the Handbook entry on diskless booting, "
-"network-diskless]."
+"full details, see extref:{handbook}advanced-networking/[the Handbook entry "
+"on diskless booting, network-diskless]."
 msgstr ""
 
 #. type: Title ===
@@ -5300,9 +5303,9 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:2340
 msgid ""
-"Yes. Refer to the Handbook entry on extref:{handbook}[advanced networking, "
-"advanced-networking], specifically the section on extref:{handbook}[routing "
-"and gateways, network-routing]."
+"Yes. Refer to the Handbook entry on extref:{handbook}advanced-networking/"
+"[advanced networking, advanced-networking], specifically the section on "
+"extref:{handbook}advanced-networking/[routing and gateways, network-routing]."
 msgstr ""
 
 #. type: Title ===
@@ -5315,9 +5318,9 @@ msgstr ""
 #: documentation/content/en/books/faq/_index.adoc:2346
 msgid ""
 "Yes. For instructions on how to use NAT over a PPP connection, see the "
-"extref:{handbook}[Handbook entry on PPP, userppp].  To use NAT over some "
-"other sort of network connection, look at the extref:{handbook}[natd, "
-"network-natd] section of the Handbook."
+"extref:{handbook}ppp-and-slip/[Handbook entry on PPP, userppp].  To use NAT "
+"over some other sort of network connection, look at the extref:{handbook}"
+"[natd, network-natd] section of the Handbook."
 msgstr ""
 
 #. type: Title ===
@@ -5353,8 +5356,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:2365
 msgid ""
-"More information can be found in the FreeBSD extref:{handbook}[Handbook, "
-"configtuning-virtual-hosts]."
+"More information can be found in the FreeBSD extref:{handbook}config/"
+"[Handbook, configtuning-virtual-hosts]."
 msgstr ""
 
 #. type: Title ===
@@ -5387,8 +5390,8 @@ msgstr ""
 msgid ""
 "The most frequent problem is not understanding the correct format of [."
 "filename]#/etc/exports#.  Review man:exports[5] and the extref:{handbook}"
-"[NFS, network-nfs] entry in the Handbook, especially the section on extref:"
-"{handbook}[configuring NFS, configuring-nfs]."
+"network-servers/[NFS, network-nfs] entry in the Handbook, especially the "
+"section on extref:{handbook}[configuring NFS, configuring-nfs]."
 msgstr ""
 
 #. type: Title ===
@@ -5413,7 +5416,7 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:2392
 msgid ""
-"See the answer in the FreeBSD extref:{handbook}[Handbook, mail-trouble]."
+"See the answer in the FreeBSD extref:{handbook}mail/[Handbook, mail-trouble]."
 msgstr ""
 
 #. type: Title ===
@@ -5451,7 +5454,7 @@ msgstr ""
 #: documentation/content/en/books/faq/_index.adoc:2409
 msgid ""
 "For further information on configuring this firewall, see the extref:"
-"{handbook}[Handbook chapter, firewalls-ipfw]."
+"{handbook}firewalls/[Handbook chapter, firewalls-ipfw]."
 msgstr ""
 
 #. type: Title ===
@@ -5951,7 +5954,8 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:2636
 msgid ""
-"See extref:{handbook}[this section of the Handbook, serialconsole-setup]."
+"See extref:{handbook}serialcomms/[this section of the Handbook, "
+"serialconsole-setup]."
 msgstr ""
 
 #. type: Title ===
@@ -6092,7 +6096,7 @@ msgstr ""
 #. type: Plain text
 #: documentation/content/en/books/faq/_index.adoc:2711
 msgid ""
-"See the extref:{handbook}serialcomms[Serial Communications, serial-hw-"
+"See the extref:{handbook}serialcomms/[Serial Communications, serial-hw-"
 "config] section in the FreeBSD Handbook."
 msgstr ""
 
@@ -6422,7 +6426,7 @@ msgstr ""
 
 #. type: delimited block = 4
 #: documentation/content/en/books/faq/_index.adoc:2852
-msgid "Refer to the extref:{handbook}[FreeBSD Glossary, freebsd-glossary]."
+msgid "Refer to the extref:{handbook}glossary/[FreeBSD Glossary]."
 msgstr ""
 
 #. type: Title ===