--- /dev/null
+[[!map pages="ChaosKey/* and ! ChaosKey/*/*"]]
--- /dev/null
+# ChaosKey
+
+This is a hardware True Random Number Generator that attaches via USB.
+
+## Version 0.2 ##
+
+Here's a photo of prototype version 0.2:
+
+<a href="v0.2/chaoskey-v0.2.jpg"> <img src="v0.2/chaoskey-v0.2-thumb.jpg"></a>
+
+### Version 0.2 Hardware ###
+
+ * [STM32F042](http://www.st.com/web/catalog/mmc/FM141/SC1169/SS1574/LN1823?icmp=stm32f0x2-line_pron_pr_jan2014&sc=stm32f0x2-pr) System-on-Chip
+ * ARM Cortex-M0 MCU
+ * 32k Flash
+ * 6k RAM
+ * USB 2.0
+ * Crystal-less operation
+ * ZXRE1004 zener-diode noise source
+ * 20V noise source
+ * AP3015A boost regulator
+ * back-to-back 3904 transistor noise
+
+## Version 0.1 ##
+
+These are photos of prototype version 0.1:
+
+<a href="v0.1/chaoskey-v0.1-top.jpg"> <img src="v0.1/chaoskey-v0.1-top-thumb.jpg"></a>
+<a href="v0.1/chaoskey-v0.1-bottom.jpg"> <img src="v0.1/chaoskey-v0.1-bottom-thumb.jpg"></a>
+
+### Version 0.1 Hardware ###
+
+ * [NXP LPC11U14](http://www.nxp.com/products/microcontrollers/cortex_m0_m0/LPC11U14FHI33.html) System-on-Chip
+ * ARM Cortex-M0 MCU
+ * 32k Flash
+ * 6k RAM
+ * USB 2.0
+ * 8 12-bit analog inputs
+ * I2C, SPI, async serial
+ * digital I/O
+ * ZXRE1004 zener diode noise source
+ * MCP6L92 dual op-amp
+
+## Software ##
+
+* Firmware Features
+ * [AltOS](../AltOS/) is written mostly in C with some ARM assembler
+* Tools Used
+ * [gEDA](http://www.gpleda.org/) for schematic capture and PCB layout
+ * [GCC](http://gcc.gnu.org/) compiler and source debugger
+* Licenses
+ * The hardware is licensed under the [TAPR](http://www.tapr.org) [Open Hardware License](http://www.tapr.org/ohl.html)
+ * The software is licensed [GPL version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+
+## Artifacts ##
+
+The hardware design files can be found on [git.gag.com](http://git.gag.com)
+in the project [hw/usbtrng](http://git.gag.com/?p=hw/usbtrng;a=summary).
+
--- /dev/null
+[[!map pages="ChaosKey/v0.1/* and ! ChaosKey/v0.1/*/*"]]
--- /dev/null
+[[!map pages="ChaosKey/v0.2/* and ! ChaosKey/v0.2/*/*"]]
+++ /dev/null
-[[!map pages="USBtrng/* and ! USBtrng/*/*"]]
+++ /dev/null
-# USBtrng
-
-This is a hardware True Random Number Generator that attaches via USB.
-
-## Version 2.0 ##
-
-Here's a photo of prototype version 2.0:
-
-<a href="v2.0/usbtrng-v2.0.jpg"> <img src="v2.0/usbtrng-v2.0-thumb.jpg"></a>
-
-### Version 2.0 Hardware ###
-
- * [STM32F042](http://www.st.com/web/catalog/mmc/FM141/SC1169/SS1574/LN1823?icmp=stm32f0x2-line_pron_pr_jan2014&sc=stm32f0x2-pr) System-on-Chip
- * ARM Cortex-M0 MCU
- * 32k Flash
- * 6k RAM
- * USB 2.0
- * Crystal-less operation
- * ZXRE1004 zener-diode noise source
- * 20V noise source
- * AP3015A boost regulator
- * back-to-back 3904 transistor noise
-
-## Version 0.1 ##
-
-These are photos of prototype version 0.1:
-
-<a href="v0.1/usbtrng-v0.1-top.jpg"> <img src="v0.1/usbtrng-v0.1-top-thumb.jpg"></a>
-<a href="v0.1/usbtrng-v0.1-bottom.jpg"> <img src="v0.1/usbtrng-v0.1-bottom-thumb.jpg"></a>
-
-### Version 0.1 Hardware ###
-
- * [NXP LPC11U14](http://www.nxp.com/products/microcontrollers/cortex_m0_m0/LPC11U14FHI33.html) System-on-Chip
- * ARM Cortex-M0 MCU
- * 32k Flash
- * 6k RAM
- * USB 2.0
- * 8 12-bit analog inputs
- * I2C, SPI, async serial
- * digital I/O
- * ZXRE1004 zener diode noise source
- * MCP6L92 dual op-amp
-
-## Software ##
-
-* Firmware Features
- * [AltOS](../AltOS/) is written mostly in C with some ARM assembler
-* Tools Used
- * [gEDA](http://www.gpleda.org/) for schematic capture and PCB layout
- * [GCC](http://gcc.gnu.org/) compiler and source debugger
-* Licenses
- * The hardware is licensed under the [TAPR](http://www.tapr.org) [Open Hardware License](http://www.tapr.org/ohl.html)
- * The software is licensed [GPL version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
-
-## Artifacts ##
-
-The hardware design files can be found on [git.gag.com](http://git.gag.com)
-in the project [hw/usbtrng](http://git.gag.com/?p=hw/usbtrng;a=summary).
-
+++ /dev/null
-[[!map pages="USBtrng/v0.1/* and ! USBtrng/v0.1/*/*"]]
+++ /dev/null
-[[!map pages="USBtrng/v2.0/* and ! USBtrng/v2.0/*/*"]]
* [TeleTerra](TeleTerra) is a hand-held ground station for use with
[TeleMetrum](TeleMetrum/) and [TeleMini](TeleMini/).
-* [USBtrng](USBtrng) is a USB-attached True Random Number Generator
+* [ChaosKey](ChaosKey) is a USB-attached True Random Number Generator
# [Documents](Documents) #