diff --git a/documentation/content/en/books/handbook/advanced-networking/_index.adoc b/documentation/content/en/books/handbook/advanced-networking/_index.adoc
--- a/documentation/content/en/books/handbook/advanced-networking/_index.adoc
+++ b/documentation/content/en/books/handbook/advanced-networking/_index.adoc
@@ -68,9 +68,9 @@
 
 * Understand the basics of the [.filename]#/etc/rc# scripts.
 * Be familiar with basic network terminology.
-* Understand basic network configuration on FreeBSD (crossref:network[network,FreeBSD network]).
-* Know how to configure and install a new FreeBSD kernel (crossref:kernelconfig[kernelconfig,Configuring the FreeBSD Kernel]).
-* Know how to install additional third-party software (crossref:ports[ports,Installing Applications: Packages and Ports]).
+* Understand basic <<network,FreeBSD network configuration>>.
+* Know how to <<kernelconfig,configure and install a new FreeBSD Kernel>>.
+* Know how to <<ports,install additional third party software>>.
 
 [[network-routing]]
 == Gateways and Routes
@@ -384,7 +384,7 @@
 FreeBSD supports different ways of connecting to a wireless network.
 This section describes how to perform advanced authentication to a Wireless Network.
 
-To make a connection and basic authentication to a wireless network the section crossref:network[wireless-authentication,Connection and Authentication to a Wireless Network] in the Network Chapter describes how to do it.
+Basic <<network-wireless,wireless network connection and authentication>> is explained in the Network Chapter.
 
 [[network-wireless-wpa-eap-tls]]
 === WPA with EAP-TLS
@@ -656,7 +656,7 @@
 ==== Basic Settings
 
 Before configuring a FreeBSD machine as an AP, the kernel must be configured with the appropriate networking support for the wireless card as well as the security protocols being used.
-For more details, see <<network-wireless-basic>>.
+For more details, see <<network-wireless>>.
 
 [NOTE]
 ====
@@ -756,7 +756,7 @@
 ==== WPA2 Host-based Access Point
 
 This section focuses on setting up a FreeBSD access point using the WPA2 security protocol.
-More details regarding WPA and the configuration of WPA-based wireless clients can be found in <<network-wireless-wpa>>.
+More details regarding WPA and the configuration of WPA-based wireless clients can be found in <<network-wireless>>.
 
 The man:hostapd[8] daemon is used to deal with client authentication and key management on the WPA2-enabled AP.
 
@@ -824,7 +824,7 @@
 ....
 
 Once the AP is running, the clients can associate with it.
-See <<network-wireless-wpa>> for more details.
+See <<network-wireless>> for more details.
 It is possible to see the stations associated with the AP using `ifconfig _wlan0_ list sta`.
 
 [[network-usb-tethering]]
@@ -1959,12 +1959,12 @@
 When a computer PXE boots, it receives information over DHCP about where to obtain the initial boot loader file.
 After the host computer receives this information, it downloads the boot loader via TFTP and then executes the boot loader.
 In FreeBSD, the boot loader file is [.filename]#/boot/pxeboot#.
-After [.filename]#/boot/pxeboot# executes, the FreeBSD kernel is loaded and the rest of the FreeBSD bootup sequence proceeds, as described in crossref:boot[boot,The FreeBSD Booting Process].
+After [.filename]#/boot/pxeboot# executes, the FreeBSD kernel is loaded and the rest of the FreeBSD bootup sequence proceeds, as described in <<boot,The FreeBSD Booting Process>>.
 
 [NOTE]
 ====
 For UEFI PXE based boot, the actual boot loader file to use is [.filename]#/boot/loader.efi#.
-See the below section crossref:advanced-networking[_debugging_pxe_problems,Debugging PXE Problems] on how to use [.filename]#/boot/loader.efi#.
+See the below section <<_debugging_pxe_problems,Debugging PXE Problems>> on how to use [.filename]#/boot/loader.efi#.
 ====
 
 This section describes how to configure these services on a FreeBSD system so that other systems can PXE boot into FreeBSD.
@@ -2048,7 +2048,7 @@
 # service inetd start
 ....
 
-. Install the base system into [.filename]#${NFSROOTDIR}#, either by decompressing the official archives or by rebuilding the FreeBSD kernel and userland (refer to crossref:cutting-edge[makeworld,“Updating FreeBSD from Source”] for more detailed instructions, but do not forget to add `DESTDIR=_${NFSROOTDIR}_` when running the `make installkernel` and `make installworld` commands.
+. Install the base system into [.filename]#${NFSROOTDIR}#, either by decompressing the official archives or by rebuilding the FreeBSD kernel and userland (refer to <<makeworld,Updating FreeBSD from Source>> for more detailed instructions, but do not forget to add `DESTDIR=_${NFSROOTDIR}_` when running the `make installkernel` and `make installworld` commands.
 . Test that the TFTP server works and can download the boot loader which will be obtained via PXE:
 +
 [source,shell]
@@ -2237,7 +2237,7 @@
 # kldload carp
 ....
 
-For users who prefer to use a custom kernel, include the following line in the custom kernel configuration file and compile the kernel as described in crossref:kernelconfig[kernelconfig,Configuring the FreeBSD Kernel]:
+For users who prefer to use a custom kernel, include the following line in the custom kernel configuration file and compile the kernel as described in <<kernelconfig,Configuring the FreeBSD Kernel>>:
 
 [.programlisting]
 ....