Some corrections in the handbook

  Corrected Amazon AWS and Google cloud links
  Removed wrong man page reference
  Removed Windows XP warning
  Corrected wrong reference to the last release of FreeBSD
  Removed firefox-i18n and firefox-esr-i18n

Patch by:	carlavilla@
Approved by:	bcr@(mentor)
Differential Revision:	https://reviews.freebsd.org/D23890

2 files changed, 8 insertions, 20 deletions

diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 798f4931fa..ba8ed124a3 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -92,11 +92,11 @@
 
       <listitem>
 	<para>Virtual Machine images available at Amazon's <link
-	    xlink:href="https://aws.amazon.com/mp/solutions/freebsd/">AWS
+	    xlink:href="https://aws.amazon.com/marketplace/pp/B07L6QV354">AWS
 	    Marketplace</link>, <link
 	    xlink:href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps?search=freebsd&amp;page=1">Microsoft
 	    Azure Marketplace</link>, and <link
-	    xlink:href="https://console.cloud.google.com/launcher/details/freebsd-cloud/freebsd-11">Google
+	    xlink:href="https://console.cloud.google.com/marketplace/details/freebsd-cloud/freebsd-12">Google
 	    Cloud Platform</link>, to run on their respective hosting
 	  services.  For more information on deploying &os; on Azure
 	  please consult the relevant chapter in the <link
@@ -242,8 +242,8 @@
 	    the <acronym>PAE</acronym> feature enabled will detect
 	    memory above 4&nbsp;GB and allow it to be used by the
 	    system.  However, using <acronym>PAE</acronym> places
-	    constraints on device drivers and other features of &os;.
-	    Refer to &man.pae.4; for details.</para>
+	    constraints on device drivers and other features of
+	    &os;.</para>
 	</listitem>
       </varlistentry>
 
@@ -327,14 +327,6 @@
 	  implementations allow up to 128 partitions per disk,
 	  eliminating the need for logical partitions.</para>
 
-	<warning>
-	  <para>Some older operating systems, like &windows;&nbsp;XP,
-	    are not compatible with the <acronym>GPT</acronym>
-	    partition scheme.  If &os; will be sharing a disk with
-	    such an operating system, <acronym>MBR</acronym>
-	    partitioning is required.</para>
-	</warning>
-
 	<para>The &os; boot loader requires either a primary or
 	  <acronym>GPT</acronym> partition.  If all of the primary or
 	  <acronym>GPT</acronym> partitions are already in use, one
@@ -421,7 +413,7 @@
 	  those bugs affect the installation process.  As these
 	  problems are discovered and fixed, they are noted in the
 	  &os; Errata (<link
-	    xlink:href="&url.base;/releases/&rel.current;R/errata.html">https://www.freebsd.org/releases/&rel.current;R/errata.html</link>)
+	    xlink:href="&url.base;/releases/&rel121.current;R/errata.html">https://www.freebsd.org/releases/&rel121.current;R/errata.html</link>)
 	  on the &os; web site.  Check the errata before installing to
 	  make sure that there are no problems that might affect the
 	  installation.</para>
@@ -447,9 +439,9 @@
 	  xlink:href="&url.base;/where.html#download">www.freebsd.org/where.html#download</link>.
 	Each installation file's name includes the release version of
 	&os;, the architecture, and the type of file.  For example, to
-	install &os; 10.2 on an &arch.amd64; system from a
+	install &os; 12.1 on an &arch.amd64; system from a
 	<acronym>DVD</acronym>, download
-	<filename>FreeBSD-10.2-RELEASE-amd64-dvd1.iso</filename>, burn
+	<filename>FreeBSD-12.1-RELEASE-amd64-dvd1.iso</filename>, burn
 	this file to a <acronym>DVD</acronym>, and boot the system
 	with the <acronym>DVD</acronym> inserted.</para>
 
@@ -567,7 +559,7 @@
 	      <acronym>USB</acronym> device on an existing &os;
 	      system.</para>
 
-	    <screen>&prompt.root; <userinput>dd if=<replaceable>FreeBSD-10.2-RELEASE-amd64-memstick.img</replaceable> of=/dev/<replaceable>da0</replaceable> bs=1M conv=sync</userinput></screen>
+	    <screen>&prompt.root; <userinput>dd if=<replaceable>FreeBSD-12.1-RELEASE-amd64-memstick.img</replaceable> of=/dev/<replaceable>da0</replaceable> bs=1M conv=sync</userinput></screen>
 
 	    <para>If this command fails, verify that the
 	      <acronym>USB</acronym> stick is not mounted and that the
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
index 13afc5e06b..e3baf525b1 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -150,10 +150,6 @@
 
       <screen>&prompt.root; <userinput>pkg install firefox-esr</userinput></screen>
 
-      <para>Localized versions are available in
-	<package>www/firefox-i18n</package> and
-	<package>www/firefox-esr-i18n</package>.</para>
-
       <para>The Ports Collection can instead be used to compile the
 	desired version of <application>Firefox</application> from
 	source code.  This example builds