7 files changed, 31 insertions, 40 deletions
diff --git a/docs/hardware/c201.md b/docs/hardware/c201.md
index f268e6f6..2fd9b973 100644
--- a/docs/hardware/c201.md
+++ b/docs/hardware/c201.md
@@ -92,8 +92,9 @@ well. Ask on IRC if you think you can contribute.
 Caution: WiFi requires a non-free blob, a USB dongle can be used instead.
 =========================================================================
 
-These laptops have non-removeable (soldered on) WiFi chips, which
-require non-free firmware in the Linux kernel in order to work.
+These laptops have non-removeable (soldered on) M.2 Type 1216 card
+with WiFi+Bluetooth, which requires non-free firmware to be loaded by
+the Linux kernel in order to work.
 
 The libreboot project recommends using an external USB wifi dongle that
 works with free software. See
diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md
index b2f8db8b..0ac2f49b 100644
--- a/docs/hardware/gm45_remove_me.md
+++ b/docs/hardware/gm45_remove_me.md
@@ -297,27 +297,21 @@ Early notes {#early_notes}
 
 Flash chips {#flashchips}
 -----------
+-   X200 laptop (Mocha-1):
+    ICH9-M overrides ifd permissions with a strap connected to GPIO33 pin (see IRC notes below)
 
--   Schematics for X200 laptop:
-    <http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006075.pdf>
-    **~~- Page 20 and page 9 refer to SDA\_HDO or SDA\_HDOUT~~** only on
-    series 6 or higher chipsets. ICH9-M (X200) does it with a strap
-    connected to GPIO33 pin (see IRC notes below)
-
-    - According to page 29, the X200 can have any of the following flash
+    - The X200 can be found with any of the following flash
     chips:
-    -   ATMEL AT26DF321-SU 72.26321.A01 - this is a 32Mb (4MiB) chip
-    -   MXIC (Macronix?) MX25L3205DM2I-12G 72.25325.A01 - another 32Mb
-        (4MiB) chip
-    -   MXIC (Macronix?) MX25L6405DMI-12G 41R0820AA - this is a 64Mb
-        (8MiB) chip
-    -   Winbond W25X64VSFIG 41R0820BA - another 64Mb (8MiB) chip
-
-    sgsit says that the X200s with the 64Mb flash chips are (probably)
+        -   ATMEL AT26DF321-SU 72.26321.A01 - this is a 32Mb (4MiB) chip
+        -   MXIC (Macronix?) MX25L3205DM2I-12G 72.25325.A01 - another 32Mb
+            (4MiB) chip
+        -   MXIC (Macronix?) MX25L6405DMI-12G 41R0820AA - this is a 64Mb
+            (8MiB) chip
+        -   Winbond W25X64VSFIG 41R0820BA - another 64Mb (8MiB) chip
+
+    sgsit says that the X200s (Pecan-1) with the 64Mb flash chips are (probably)
     the ones with AMT (alongside the ME), whereas the 32Mb chips contain
     only the ME.
--   Schematics for X200s laptop:
-    <http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006104.pdf>.
 
 Early development notes {#early_development_notes}
 -----------------------
diff --git a/docs/hardware/index.md b/docs/hardware/index.md
index 01719ada..259fc854 100644
--- a/docs/hardware/index.md
+++ b/docs/hardware/index.md
@@ -31,8 +31,8 @@ Libreboot supports the following systems in this release:
 
 ### Laptops (Intel, x86)
 
--   [Lenovo ThinkPad X60/X60s](#list-of-supported-x60s)
--   [Lenovo ThinkPad X60 Tablet](#list-of-supported-x60-tablets)
+-   [Lenovo ThinkPad X60/X60s](#list-of-supported-thinkpad-x60s)
+-   [Lenovo ThinkPad X60 Tablet](#list-of-supported-thinkpad-x60-tablets)
 -   [Lenovo ThinkPad T60](#supported-t60-list) (some exceptions)
 -   [Lenovo ThinkPad X200](x200.md)
 -   [Lenovo ThinkPad R400](r400.md)
@@ -54,7 +54,7 @@ EC update on i945 (X60, T60) and GM45 (X200, T400, T500, R400, W500)
 ==============================================================
 
 It is recommended that you update to the latest EC firmware version. The
-[EC firmware](../../faq.md#firmware-ec) is separate from
+[EC firmware](../../faq.md#ec-embedded-controller-firmware) is separate from
 libreboot, so we don't actually provide that, but if you still have
 Lenovo BIOS then you can just run the Lenovo BIOS update utility, which
 will update both the BIOS and EC version. See:
@@ -224,7 +224,7 @@ To find what LCD panel you have, see:
 [../misc/\#get\_edid\_panelname](../misc/#get_edid_panelname).
 
 *Some T60 variants have ATI GPUs, and all T60p laptops have ATI GPUs These are
-incompatible! See [\#t60\_ati\_intel](#t60_ati_intel) for how to remedy
+incompatible! See [\#thinkpad-t60-ati-gpu-and-thinkpad-t60-intel-gpu-differences](#thinkpad-t60-ati-gpu-and-thinkpad-t60-intel-gpu-differences) for how to remedy
 this.*
 
 Tested LCD panels: (working)
@@ -290,7 +290,7 @@ is very easily replaced; just remove the card and install another one
 *after* libreboot is installed. See
 [\#recommended\_wifi](#recommended_wifi) for replacements.
 
-ThinkPad T60 (ATI GPU) and ThinkPad T60 (Intel GPU) differences.
+ThinkPad T60 (ATI GPU) and ThinkPad T60 (Intel GPU) differences
 ----------------------------------------------------------------
 
 If your T60 is a 14.1" or 15.1" model with an ATI GPU, it won't work
@@ -337,14 +337,14 @@ Information about the macbook1,1
 
 There is an Apple laptop called the macbook1,1 from 2006 which uses the
 same i945 chipset as the ThinkPad X60/T60. A developer ported the
-[MacBook2,1](#macbook21) to coreboot, the ROM images also work on the
+[MacBook2,1](#information-about-the-macbook21) to coreboot, the ROM images also work on the
 macbook1,1.
 
-You can refer to [\#macbook21](#macbook21) for most of this. Macbook2,1
-laptops come with Core 2 Duo processors which support 64-bit operating
-systems (and 32-bit). The MacBook1,1 uses Core Duo processors (supports
-32-bit OS but not 64-bit), and it is believed that this is the only
-difference.
+You can refer to [\#information-about-the-macbook21](#information-about-the-macbook21)
+for most of this. Macbook2,1 laptops come with Core 2 Duo processors
+which support 64-bit operating systems (and 32-bit). The MacBook1,1
+uses Core Duo processors (supports 32-bit OS but not 64-bit), and it is
+believed that this is the only difference.
 
 It is believed that all models are compatible, listed here:
 
@@ -358,14 +358,10 @@ Specifically (Order No. / Model No. / CPU):
 -   MA254LL/A / A1181 (EMC 2092) / Core Duo T2400 *(tested - working)*
 -   MA472LL/A / A1181 (EMC 2092) / Core Duo T2500 (untested)
 
-Also of interest:
-[../git/\#config\_macbook21](../git/#config_macbook21).
-
 Unbricking: [this page shows disassembly
 guides](https://www.ifixit.com/Device/MacBook_Core_2_Duo) and mono's
-page (see [\#macbook21](#macbook21)) shows the location of the SPI flash
-chip on the motherboard. [How to remove the
-motherboard](https://www.ifixit.com/Guide/MacBook+Core+2+Duo+PRAM+Battery+Replacement/529).
+page (see [\#information-about-the-macbook21](#information-about-the-macbook21))
+shows the location of the SPI flash chip on the motherboard. [How to remove the motherboard](https://www.ifixit.com/Guide/MacBook+Core+2+Duo+PRAM+Battery+Replacement/529).
 
 No method is yet known for flashing in GNU+Linux while the Apple
 firmware is running. You will need to disassemble the system and flash
diff --git a/docs/hardware/r400.md b/docs/hardware/r400.md
index 4e0a0b19..ae22c50f 100644
--- a/docs/hardware/r400.md
+++ b/docs/hardware/r400.md
@@ -23,7 +23,7 @@ EC update {#ecupdate}
 =========
 
 It is recommended that you update to the latest EC firmware version. The
-[EC firmware](../../faq.md#firmware-ec) is separate from
+[EC firmware](../../faq.md#ec-embedded-controller-firmware) is separate from
 libreboot, so we don't actually provide that, but if you still have
 Lenovo BIOS then you can just run the Lenovo BIOS update utility, which
 will update both the BIOS and EC version. See:
diff --git a/docs/hardware/t400.md b/docs/hardware/t400.md
index 7464f682..df7f0082 100644
--- a/docs/hardware/t400.md
+++ b/docs/hardware/t400.md
@@ -23,7 +23,7 @@ EC update {#ecupdate}
 =========
 
 It is recommended that you update to the latest EC firmware version. The
-[EC firmware](../../faq.md#firmware-ec) is separate from
+[EC firmware](../../faq.md#ec-embedded-controller-firmware) is separate from
 libreboot, so we don't actually provide that, but if you still have
 Lenovo BIOS then you can just run the Lenovo BIOS update utility, which
 will update both the BIOS and EC version. See:
diff --git a/docs/hardware/t500.md b/docs/hardware/t500.md
index fdbca0d1..3973346c 100644
--- a/docs/hardware/t500.md
+++ b/docs/hardware/t500.md
@@ -25,7 +25,7 @@ EC update {#ecupdate}
 =========
 
 It is recommended that you update to the latest EC firmware version. The
-[EC firmware](../../faq.md#firmware-ec) is separate from
+[EC firmware](../../faq.md#ec-embedded-controller-firmware) is separate from
 libreboot, so we don't actually provide that, but if you still have
 Lenovo BIOS then you can just run the Lenovo BIOS update utility, which
 will update both the BIOS and EC version. See:
diff --git a/docs/hardware/x200.md b/docs/hardware/x200.md
index b7bb434b..10f5f621 100644
--- a/docs/hardware/x200.md
+++ b/docs/hardware/x200.md
@@ -25,7 +25,7 @@ EC update {#ecupdate}
 =========
 
 It is recommended that you update to the latest EC firmware version. The
-[EC firmware](../../faq.md#firmware-ec) is separate from
+[EC firmware](../../faq.md#ec-embedded-controller-firmware) is separate from
 libreboot, so we don't actually provide that, but if you still have
 Lenovo BIOS then you can just run the Lenovo BIOS update utility, which
 will update both the BIOS and EC version. See: