From 5020d432d712f29d616a93d6597bedb40f2fc601 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Mon, 11 Apr 2011 23:46:28 -0400
Subject: Merging in changes from 0.0.9-maintenance.

---
 docs/source/maple-ide-install.rst | 15 ++++++++++-----
 docs/source/usb.rst               |  5 ++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'docs/source')

diff --git a/docs/source/maple-ide-install.rst b/docs/source/maple-ide-install.rst
index f439abe..5c79d41 100644
--- a/docs/source/maple-ide-install.rst
+++ b/docs/source/maple-ide-install.rst
@@ -17,7 +17,8 @@ us directly`_\ !
 Download
 --------
 
-Choose the correct version for your operating system:
+The current release of the Maple IDE is version 0.0.9.  Choose the
+correct version for your operating system:
 
 .. list-table::
    :widths: 15 30 50
@@ -28,15 +29,15 @@ Choose the correct version for your operating system:
      - IDE Package
    * - Windows
      - Tested on 32bit Windows XP
-     - `maple-ide-LATEST-windowsxp32.zip <http://static.leaflabs.com/pub/leaflabs/maple-ide/maple-ide-LATEST-windowsxp32.zip>`_ (about 75mb)
+     - `maple-ide-0.0.9-windowsxp32.zip <http://static.leaflabs.com/pub/leaflabs/maple-ide/maple-ide-0.0.9-windowsxp32.zip>`_ (about 75mb)
    * - Linux
      - Tested on Ubuntu 9.10 (64bit) and 10.04 (32bit)
-     - `maple-ide-LATEST-linux32.tgz <http://static.leaflabs.com/pub/leaflabs/maple-ide/maple-ide-LATEST-linux32.tgz>`_ (about 30mb)
+     - `maple-ide-0.0.9-linux32.tgz <http://static.leaflabs.com/pub/leaflabs/maple-ide/maple-ide-0.0.9-linux32.tgz>`_ (about 30mb)
 
-       `maple-ide-LATEST-linux64.tgz <http://static.leaflabs.com/pub/leaflabs/maple-ide/maple-ide-LATEST-linux64.tgz>`_ (about 30mb)
+       `maple-ide-0.0.9-linux64.tgz <http://static.leaflabs.com/pub/leaflabs/maple-ide/maple-ide-0.0.9-linux64.tgz>`_ (about 30mb)
    * - Mac OSX
      - Tested on Snow Leopard 10.6 (64bit and 32bit)
-     - `maple-ide-LATEST-macosx-10_6.dmg <http://static.leaflabs.com/pub/leaflabs/maple-ide/maple-ide-LATEST-macosx-10_6.dmg>`_ (about 40mb)
+     - `maple-ide-0.0.9-macosx-10_6.dmg <http://static.leaflabs.com/pub/leaflabs/maple-ide/maple-ide-0.0.9-macosx-10_6.dmg>`_ (about 40mb)
 
 The package bundles together a compiler, an upload utility, a software
 library, and a simple GUI text editor. All this software is `free and
@@ -46,6 +47,10 @@ open <http://fsf.org/>`_; we are grateful to the `Arduino
 `OpenMoko <http://openmoko.com/>`_ developers, as well as many others,
 who allow us to reuse their software.
 
+**Looking for something older?** `Source archives and binaries
+<http://static.leaflabs.com/pub/leaflabs/maple-ide/>`_ are available
+for previously-released versions.
+
 Installation
 ------------
 
diff --git a/docs/source/usb.rst b/docs/source/usb.rst
index f502f31..0468618 100644
--- a/docs/source/usb.rst
+++ b/docs/source/usb.rst
@@ -34,7 +34,10 @@ second problem is the use of :ref:`perpetual bootloader mode
 Recommended Reading
 -------------------
 
-* `USB in a NutShell <http://www.beyondlogic.org/usbnutshell/usb1.htm>`_ overview from Beyond Logic
+* `USB in a Nutshell <http://www.beyondlogic.org/usbnutshell/usb1.htm>`_, an overview from Beyond Logic
+* `USB made simple <http://www.usbmadesimple.co.uk/>`_, an illustrated series of articles on USB
+* The `USB 2.0 Specification <http://www.usb.org/developers/docs/>`_ (`direct link <http://www.usb.org/developers/docs/usb_20_021411.zip>`_)
+* `Embedded USB - a brief tutorial <http://www.computer-solutions.co.uk/info/Embedded_tutorials/usb_tutorial.htm>`_
 * `Wikipedia article on Universal Serial Bus (USB) <http://en.wikipedia.org/wiki/Universal_Serial_Bus>`_
 * Linux Kernel documentation for `USB ACM <http://www.kernel.org/doc/Documentation/usb/acm.txt>`_ and `USB Serial <http://www.kernel.org/doc/Documentation/usb/usb-serial.txt>`_
 * STMicro documentation for STM32F103RB microcontroller:
-- 
cgit v1.2.3