Merge refactor into i2c-wip:

Squashed commit of the following:

commit 4d6662dadfda7f2fd55107535165dc98a0638a3c
Merge: 174d9ab 7ddc844
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 23:18:29 2011 -0500

    Merge remote branch 'origin/refactor' into refactor

commit 174d9ab73cc3387a3812e6f3d3e97519bf5b2150
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 23:16:53 2011 -0500

    USBSerial docs fix.

commit f217acb73d94f0a88bf33a42684e6e988dcb3685
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 20:25:26 2011 -0500

    Brought examples/ up to date; PIN_MAP bugfix for D24.

commit c4ba3ba05fc39ef260cd80d91759966952df74ae
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 19:16:42 2011 -0500

    Cosmetic/documentation changes to adc.c

commit e7747b4eb831621951deef6d31629f55cb5c3500
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 19:16:07 2011 -0500

    Cosmetic changes to wirish/main.cxx

commit e2f9d4116e59d8487c936989384228ea084a3501
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 19:15:24 2011 -0500

    Untabifying docs/source/conf.py

commit 7ddc84481b4eebe337065a0219e3d8dc000791e5
Author: Perry Hung <iperry@gmail.com>
Date:   Wed Mar 2 00:30:19 2011 -0500

    cscope: Find .S instead of .s files

commit 62cb09ed6357eae58b0234fbc074c44e9c0aa5e5
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Wed Mar 2 00:07:10 2011 -0500

    Fixing typo in main.cpp.example.

2 files changed, 30 insertions, 30 deletions

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 1ad4e57..f232b7c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -117,25 +117,25 @@ html_theme = 'default'
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-	## Sidebar placement options
-	#'stickysidebar' : 'true',
-	'rightsidebar' : 'true',
-	#'collapsiblesidebar' : 'true',
-	
-	## Color
-	'sidebarbgcolor' : '#C8C8C8',
-	'sidebarlinkcolor' : 'green',
-	'sidebartextcolor' : 'black',
+        ## Sidebar placement options
+        #'stickysidebar' : 'true',
+        'rightsidebar' : 'true',
+        #'collapsiblesidebar' : 'true',
+
+        ## Color
+        'sidebarbgcolor' : '#C8C8C8',
+        'sidebarlinkcolor' : 'green',
+        'sidebartextcolor' : 'black',
         #'sidebarbtncolor' : 'black',
-	'footerbgcolor' : 'green',
-	'relbarbgcolor' : 'green',
-	'headlinkcolor' : '#000000',
-	'linkcolor' : 'green',
-	'visitedlinkcolor' : 'green',
-	
-	## Font
-	'headfont' : 'Georgia',
-	'bodyfont' : 'Lucidia'
+        'footerbgcolor' : 'green',
+        'relbarbgcolor' : 'green',
+        'headlinkcolor' : '#000000',
+        'linkcolor' : 'green',
+        'visitedlinkcolor' : 'green',
+
+        ## Font
+        'headfont' : 'Georgia',
+        'bodyfont' : 'Lucidia'
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
@@ -174,7 +174,7 @@ html_last_updated_fmt = '%b %d, %Y'
 # re-add commented line when custom template for api finished
 html_sidebars = {
    '**': ['globaltoc.html', 'searchbox.html'],
-   #'lang/api**':['searchbox.html', 'apilist.html'], 
+   #'lang/api**':['searchbox.html', 'apilist.html'],
 }
 
 
diff --git a/docs/source/lang/api/serialusb.rst b/docs/source/lang/api/serialusb.rst
index 87fa641..4ddfa4a 100644
--- a/docs/source/lang/api/serialusb.rst
+++ b/docs/source/lang/api/serialusb.rst
@@ -224,7 +224,7 @@ running from battery, or connected but not monitored. You may need to
 experiment with the DTR/RTS logic for your platform and device
 configuration. ::
 
-    #define LED_PIN 13
+    #define LED_PIN BOARD_LED_PIN
 
     void setup() {
         /* Set up the LED to blink  */
@@ -232,22 +232,22 @@ configuration. ::
     }
 
     void loop() {
-        // LED will stay off if we are disconnected;
-        // will blink quickly if USB is unplugged (battery etc)
+        // LED will stay off if we are disconnected, and will blink
+        // quickly if USB is unplugged (battery power, etc.).
         if(SerialUSB.isConnected()) {
             digitalWrite(LED_PIN, 1);
         }
         delay(100);
 
-        // If this logic fails to detect if bytes are going to
-        // be read by the USB host, then the println() will fully
-        // many times, causing a very slow LED blink.
-        // If the characters are printed and read, the blink will
-        // only slow a small amount when "really" connected, and fast
-        // when the virtual port is only configured.
+        // If this logic fails to detect if bytes are going to be read
+        // by the USB host, then the println() take a long time,
+        // causing a very slow LED blink.  If the characters are
+        // printed and read, the blink will only slow a small amount
+        // when "really" connected, and will be fast fast when the
+        // virtual port is only configured.
         if(SerialUSB.isConnected() && (SerialUSB.getDTR() || SerialUSB.getRTS())) {
-            for(int i=0; i<10; i++) {
-               SerialUSB.println(123456,BIN);
+            for(int i = 0; i < 10; i++) {
+               SerialUSB.println(123456, BIN);
             }
         }
         digitalWrite(LED_PIN, 0);