diff --git a/src/accessories/audio.jd b/src/accessories/audio.jd
index 92ce6fe..9202438 100644
--- a/src/accessories/audio.jd
+++ b/src/accessories/audio.jd
@@ -56,7 +56,7 @@
 supported on Android 1.5 (API Level 3) and higher. An Android user can connect to an accessory
 that supports this profile using the system Settings &gt; Bluetooth and play music directly to the
 accessory without the need for a secondary application.</p>
-<p><strong>Note:</strong> If you want to provide a custom application for output to your audio
+<p class="note"><strong>Note:</strong> If you want to provide a custom application for output to your audio
 accessory, note that the Android 3.0 (API Level 11) allows applications to operate an A2DP
 connection using the
 <a href="http://developer.android.com/reference/android/bluetooth/BluetoothA2dp.html"><code>BluetoothA2dp</code></a>
@@ -71,6 +71,6 @@
   (<code>&lt;adk-src&gt;/adk2012/board/library/ADK2/</code>), which includes an example implementation
   of an audio playback accessory using a Bluetooth connection.</li>
 </ul>
-<p><strong>Note:</strong> The ADK 2012 source code includes an open source Bluetooth stack that
+<p class="note"><strong>Note:</strong> The ADK 2012 source code includes an open source Bluetooth stack that
 is built for the Texas Instruments CC2564 chip, but can work with any Bluetooth chip that
 implements a standard Host/Controller Interface (HCI).</p>
diff --git a/src/accessories/custom.jd b/src/accessories/custom.jd
index 560f182..f68ab8e 100644
--- a/src/accessories/custom.jd
+++ b/src/accessories/custom.jd
@@ -82,7 +82,7 @@
   <a href="http://developer.android.com/tools/adk/adk2.html#src-download">application source code</a>
   (<code>&lt;adk-src&gt;/adk2012/app/</code>).</li>
 </ul>
-<p><strong>Note:</strong> The ADK 2012 source code includes an open source Bluetooth stack which
+<p class="note"><strong>Note:</strong> The ADK 2012 source code includes an open source Bluetooth stack which
 is built for the Texas Instruments CC2564 chip, but can work with any Bluetooth chip that
 supports a standard Host/Controller Interface (HCI).</p>
 
@@ -92,7 +92,7 @@
 (API Level 16) and higher. Once an Android device connects to an accessory that supports this
 protocol, the Android system treats it as a standard audio output device and routes all audio to
 that accessory. No secondary software application is required on the Android device.</p>
-<p><strong>Note:</strong> Due to the low power output of Android devices, the Android Open Accessory
+<p class="note"><strong>Note:</strong> Due to the low power output of Android devices, the Android Open Accessory
 Protocol requires that accessories act as a USB host, which means that the connecting accessory
 must power the bus.</p>
 <h3 id="next-steps">Next steps</h3>
@@ -105,7 +105,7 @@
   (<code>&lt;adk-src&gt;/adk2012/board/library/ADK2/</code>), which includes an example implementation
   of an audio playback accessory using a USB connection.</li>
 </ul>
-<p><strong>Note:</strong> The AOA 2.0 protocol also supports the
+<p class="note"><strong>Note:</strong> The AOA 2.0 protocol also supports the
 <a href="{@docRoot}accessories/aoa2.html#hid-support">human interface device</a> (HID) protocol through a USB
 connection, enabling accessories such as audio docks to provide hardware play back controls such
 as pause, fast-forward or volume buttons.</p>
diff --git a/src/devices/audio/latency_measure.jd b/src/devices/audio/latency_measure.jd
index f6b1d3e..6285ff9 100644
--- a/src/devices/audio/latency_measure.jd
+++ b/src/devices/audio/latency_measure.jd
@@ -67,12 +67,10 @@
 <ol>
   <li>Run an app that periodically pulses the LED at
   the same time it outputs audio. 
-
-  <p class="note"><b>Note:</b> To get useful results, it is crucial to use the correct
+  <p class="note"><strong>Note:</strong> To get useful results, it is crucial to use the correct
   APIs in the test app so that you're exercising the fast audio output path.
   See <a href="latency_design.html">Design For Reduced Latency</a> for
-  background.
-  </p>
+  background.</p>
   </li>
   <li>Place a light sensor next to the LED.</li>
   <li>Connect the probes of a dual-channel oscilloscope to both the wired headphone
diff --git a/src/devices/audio/usb.jd b/src/devices/audio/usb.jd
index b885f60..5395560 100644
--- a/src/devices/audio/usb.jd
+++ b/src/devices/audio/usb.jd
@@ -67,7 +67,7 @@
 </p>
 
 <p>
-<b>Note:</b> the terms <i>device</i> or <i>accessory</i> are common synonyms for
+<p class="note"><strong>Note:</strong> The terms <i>device</i> and <i>accessory</i> are common synonyms for
 <i>peripheral</i>.  We avoid those terms here, as they could be confused with
 Android <a href="http://en.wikipedia.org/wiki/Mobile_device">device</a>
 or the Android-specific concept called
@@ -452,7 +452,7 @@
 <p>
 Which design is better?  The answer depends on your needs.
 Each has advantages and disadvantages.
-<b>Note:</b> this is an artificial comparison, since
+<p class="note"><strong>Note:</strong> This is an artificial comparison, since
 a real Android device would probably have both options available.
 </p>
 
diff --git a/src/devices/graphics/architecture.jd b/src/devices/graphics/architecture.jd
index 5b03ae5..77593f2 100644
--- a/src/devices/graphics/architecture.jd
+++ b/src/devices/graphics/architecture.jd
@@ -158,10 +158,12 @@
 primary component of which is a BufferQueue - for which SurfaceFlinger acts as
 the consumer.  A Binder object for the producer side is passed through the
 WindowManager to the app, which can then start sending frames directly to
-SurfaceFlinger.  (Note: The WindowManager uses the term "window" instead of
+SurfaceFlinger.</p>
+
+<p class="note"><strong>Note:</strong> The WindowManager uses the term "window" instead of
 "layer" for this and uses "layer" to mean something else.  We're going to use the
 SurfaceFlinger terminology.  It can be argued that SurfaceFlinger should really
-be called LayerFlinger.)</p>
+be called LayerFlinger.</p>
 
 <p>For most apps, there will be three layers on screen at any time: the "status
 bar" at the top of the screen, the "navigation bar" at the bottom or side, and
@@ -272,10 +274,11 @@
 layer's name is indicative of its original role: On a device with
 <code>/dev/graphics/fb0</code> and no overlays, all composition would be done
 with GLES, and the output would be written to the framebuffer.  On recent devices there
-generally is no simple framebuffer, so the FB_TARGET layer is a scratch buffer.
-(Note: This is why screen grabbers written for old versions of Android no
-longer work: They're trying to read from The Framebuffer, but there is no such
-thing.)</p>
+generally is no simple framebuffer, so the FB_TARGET layer is a scratch buffer.</p>
+
+<p class="note"><strong>Note:</strong> This is why screen grabbers written for old versions of Android no
+longer work: They're trying to read from the Framebuffer, but there is no such
+thing.</p>
 
 <p>The overlay planes have another important role: they're the only way to display
 DRM content.  DRM-protected buffers cannot be accessed by SurfaceFlinger or the
diff --git a/src/devices/sensors/sensor-types.jd b/src/devices/sensors/sensor-types.jd
index 7ebac25..baa2f76 100644
--- a/src/devices/sensors/sensor-types.jd
+++ b/src/devices/sensors/sensor-types.jd
@@ -608,7 +608,7 @@
   Gyroscope</p>
 <p>Reporting-mode: <em><a href="report-modes.html#continuous">Continuous</a></em></p>
 <p><code>getDefaultSensor(SENSOR_TYPE_ORIENTATION)</code> <em>returns a non-wake-up sensor</em></p>
-<p>Note: This is an older sensor type that has been deprecated in the Android SDK.
+<p class="note"><strong>Note:</strong> This is an older sensor type that has been deprecated in the Android SDK.
   It has been replaced by the rotation vector sensor, which is more clearly
   defined. Use the rotation vector sensor over the orientation sensor whenever
   possible.</p>
diff --git a/src/devices/sensors/versioning.jd b/src/devices/sensors/versioning.jd
index 130c58c..8fb2af0 100644
--- a/src/devices/sensors/versioning.jd
+++ b/src/devices/sensors/versioning.jd
@@ -129,12 +129,12 @@
 <p>For continuous sensors, set it to the maximum sampling period allowed in
 microseconds.</p>
 
-<p>Note:</p>
+<p>The following are applicable for <code>period_ns</code>, <code>maxDelay</code>, and <code>minDelay</code>:</p>
 <ul>
 <li><code>period_ns</code> is in nanoseconds whereas
 <code>maxDelay</code>/<code>minDelay</code> are in microseconds.</li>
-<li><code>maxDelay </code>should always fit within a 32-bit signed integer. It
-is declared as 64 bit on 64 bit architectures only for binary compatibility reasons.</li>
+<li><code>maxDelay</code> should always fit within a 32-bit signed integer. It
+is declared as 64-bit on 64-bit architectures only for binary compatibility reasons.</li>
 </ul>
 
 <p><em>flags</em>: This field defines the reporting mode of the sensor and whether the sensor is
diff --git a/src/devices/tech/dalvik/dalvik-bytecode.jd b/src/devices/tech/dalvik/dalvik-bytecode.jd
index 5695440..f449bce 100644
--- a/src/devices/tech/dalvik/dalvik-bytecode.jd
+++ b/src/devices/tech/dalvik/dalvik-bytecode.jd
@@ -174,7 +174,7 @@
   <td>nop</td>
   <td>&nbsp;</td>
   <td>Waste cycles.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     Data-bearing pseudo-instructions are tagged with this opcode, in which
     case the high-order byte of the opcode unit indicates the nature of
     the data. See "<code>packed-switch-payload</code> Format",
@@ -209,7 +209,7 @@
   <td><code>A:</code> destination register pair (4 bits)<br/>
     <code>B:</code> source register pair (4 bits)</td>
   <td>Move the contents of one register-pair to another.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     It is legal to move from <code>v<i>N</i></code> to either
     <code>v<i>N-1</i></code> or <code>v<i>N+1</i></code>, so implementations
     must arrange for both halves of a register pair to be read before
@@ -222,7 +222,7 @@
   <td><code>A:</code> destination register pair (8 bits)<br/>
     <code>B:</code> source register pair (16 bits)</td>
   <td>Move the contents of one register-pair to another.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     Implementation considerations are the same as <code>move-wide</code>,
     above.</p>
   </td>
@@ -233,7 +233,7 @@
   <td><code>A:</code> destination register pair (16 bits)<br/>
     <code>B:</code> source register pair (16 bits)</td>
   <td>Move the contents of one register-pair to another.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     Implementation considerations are the same as <code>move-wide</code>,
     above.</p>
   </td>
@@ -425,7 +425,7 @@
   <td>monitor-exit vAA</td>
   <td><code>A:</code> reference-bearing register (8 bits)</td>
   <td>Release the monitor for the indicated object.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     If this instruction needs to throw an exception, it must do
     so as if the pc has already advanced past the instruction.
     It may be useful to think of this as the instruction successfully
@@ -446,7 +446,7 @@
     <code>B:</code> type index (16 bits)</td>
   <td>Throw a <code>ClassCastException</code> if the reference in the
     given register cannot be cast to the indicated type.
-    <p><b>Note:</b> Since <code>A</code> must always be a reference
+    <p class="note"><strong>Note:</strong> Since <code>A</code> must always be a reference
     (and not a primitive value), this will necessarily fail at runtime
     (that is, it will throw an exception) if <code>B</code> refers to a
     primitive type.</p>
@@ -461,7 +461,7 @@
   <td>Store in the given destination register <code>1</code>
     if the indicated reference is an instance of the given type,
     or <code>0</code> if not.
-    <p><b>Note:</b> Since <code>B</code> must always be a reference
+    <p class="note"><strong>Note:</strong> Since <code>B</code> must always be a reference
     (and not a primitive value), this will always result
     in <code>0</code> being stored if <code>C</code> refers to a primitive
     type.</td>
@@ -547,7 +547,7 @@
   <td>goto +AA</td>
   <td><code>A:</code> signed branch offset (8 bits)</td>
   <td>Unconditionally jump to the indicated instruction.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     The branch offset must not be <code>0</code>. (A spin
     loop may be legally constructed either with <code>goto/32</code> or
     by including a <code>nop</code> as a target before the branch.)</p>
@@ -558,7 +558,7 @@
   <td>goto/16 +AAAA</td>
   <td><code>A:</code> signed branch offset (16 bits)<br/></td>
   <td>Unconditionally jump to the indicated instruction.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     The branch offset must not be <code>0</code>. (A spin
     loop may be legally constructed either with <code>goto/32</code> or
     by including a <code>nop</code> as a target before the branch.)</p>
@@ -640,7 +640,7 @@
     <code>C:</code> signed branch offset (16 bits)</td>
   <td>Branch to the given destination if the given two registers' values
     compare as specified.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     The branch offset must not be <code>0</code>. (A spin
     loop may be legally constructed either by branching around a
     backward <code>goto</code> or by including a <code>nop</code> as
@@ -661,7 +661,7 @@
     <code>B:</code> signed branch offset (16 bits)</td>
   <td>Branch to the given destination if the given register's value compares
     with 0 as specified.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     The branch offset must not be <code>0</code>. (A spin
     loop may be legally constructed either by branching around a
     backward <code>goto</code> or by including a <code>nop</code> as
@@ -723,7 +723,7 @@
     <code>C:</code> instance field reference index (16 bits)</td>
   <td>Perform the identified object instance field operation with
     the identified field, loading or storing into the value register.
-    <p><b>Note:</b> These opcodes are reasonable candidates for static linking,
+    <p class="note"><strong>Note:</strong> These opcodes are reasonable candidates for static linking,
     altering the field argument to be a more direct offset.</p>
   </td>
 </tr>
@@ -750,7 +750,7 @@
     <code>B:</code> static field reference index (16 bits)</td>
   <td>Perform the identified object static field operation with the identified
     static field, loading or storing into the value register.
-    <p><b>Note:</b> These opcodes are reasonable candidates for static linking,
+    <p class="note"><strong>Note:</strong> These opcodes are reasonable candidates for static linking,
     altering the field argument to be a more direct offset.</p>
   </td>
 </tr>
@@ -788,7 +788,7 @@
     <code>interface</code> method, that is, on an object whose concrete
     class isn't known, using a <code>method_id</code> that refers to
     an <code>interface</code>.</p>
-    <p><b>Note:</b> These opcodes are reasonable candidates for static linking,
+    <p class="note"><strong>Note:</strong> These opcodes are reasonable candidates for static linking,
     altering the method argument to be a more direct offset
     (or pair thereof).</p>
   </td>
@@ -955,7 +955,7 @@
   <td>Perform the indicated binary op on the indicated register (first
     argument) and literal value (second argument), storing the result in
     the destination register.
-    <p><b>Note:</b>
+    <p class="note"><strong>Note:</strong>
     <code>rsub-int</code> does not have a suffix since this version is the
     main opcode of its family. Also, see below for details on its semantics.
     </p>
@@ -982,7 +982,7 @@
   <td>Perform the indicated binary op on the indicated register (first
     argument) and literal value (second argument), storing the result
     in the destination register.
-    <p><b>Note:</b> See below for details on the semantics of
+    <p class="note"><strong>Note:</strong> See below for details on the semantics of
     <code>rsub-int</code>.</p>
   </td>
 </tr>
@@ -1031,7 +1031,7 @@
 </tbody>
 </table>
 
-<p><b>Note:</b> The total number of code units for an instance of this
+<p class="note"><strong>Note:</strong> The total number of code units for an instance of this
 table is <code>(size * 2) + 4</code>.</p>
 
 <h2 id="sparse-switch">sparse-switch-payload format</h2>
@@ -1071,7 +1071,7 @@
 </tbody>
 </table>
 
-<p><b>Note:</b> The total number of code units for an instance of this
+<p class="note"><strong>Note:</strong> The total number of code units for an instance of this
 table is <code>(size * 4) + 2</code>.</p>
 
 <h2 id="fill-array">fill-array-data-payload format</h2>
@@ -1108,13 +1108,13 @@
 </tbody>
 </table>
 
-<p><b>Note:</b> The total number of code units for an instance of this
+<p class="note"><strong>Note:</strong> The total number of code units for an instance of this
 table is <code>(size * element_width + 1) / 2 + 4</code>.</p>
 
 
 <h2 id="math">Mathematical operation details</h2>
 
-<p><b>Note:</b> Floating point operations must follow IEEE 754 rules, using
+<p class="note"><strong>Note:</strong> Floating point operations must follow IEEE 754 rules, using
 round-to-nearest and gradual underflow, except where stated otherwise.</p>
 
 <table class="math">
diff --git a/src/devices/tech/dalvik/dex-format.jd b/src/devices/tech/dalvik/dex-format.jd
index bd167fb..9b7a6a2 100644
--- a/src/devices/tech/dalvik/dex-format.jd
+++ b/src/devices/tech/dalvik/dex-format.jd
@@ -275,7 +275,7 @@
                         = "dex\n035\0"
 </pre>
 
-<p><b>Note:</b> At least a couple earlier versions of the format have
+<p class="note"><strong>Note:</strong> At least a couple earlier versions of the format have
 been used in widely-available public software releases. For example,
 version <code>009</code> was used for the M3 releases of the
 Android platform (November&ndash;December 2007),
@@ -306,10 +306,10 @@
 <p>The constant <code>NO_INDEX</code> is used to indicate that
 an index value is absent.</p>
 
-<p><b>Note:</b> This value isn't defined to be
+<p class="note"><strong>Note:</strong> This value isn't defined to be
 <code>0</code>, because that is in fact typically a valid index.</p>
 
-<p><b>Also Note:</b> The chosen value for <code>NO_INDEX</code> is
+<p>The chosen value for <code>NO_INDEX</code> is
 representable as a single byte in the <code>uleb128p1</code> encoding.</p>
 
 <pre>
@@ -381,8 +381,8 @@
   <td>&nbsp;</td>
   <td>&nbsp;</td>
   <td><code>synchronized</code>: associated lock automatically acquired
-    around call to this method. <b>Note:</b> This is only valid to set when
-    <code>ACC_NATIVE</code> is also set.</td>
+    around call to this method. <p class="note"><strong>Note:</strong> This is only valid to set when
+    <code>ACC_NATIVE</code> is also set. </p></td>
 </tr>
 <tr>
   <td>ACC_VOLATILE</td>
@@ -482,8 +482,8 @@
   <td>0x20000</td>
   <td>&nbsp;</td>
   <td>&nbsp;</td>
-  <td>declared <code>synchronized</code>. <b>Note:</b> This has no effect on
-    execution (other than in reflection of this flag, per se).
+  <td>declared <code>synchronized</code>. <p class="note"><strong>Note:</strong> This has no effect on
+    execution (other than in reflection of this flag, per se).</p>
   </td>
 </tr>
 </tbody>
@@ -1567,7 +1567,7 @@
     followed by a byte of value <code>0</code>. See
     "MUTF-8 (Modified UTF-8) Encoding" above for details and
     discussion about the data format.
-    <p><b>Note:</b> It is acceptable to have a string which includes
+    <p class="note"><strong>Note:</strong> It is acceptable to have a string which includes
     (the encoded form of) UTF-16 surrogate code units (that is,
     <code>U+d800</code> &hellip; <code>U+dfff</code>)
     either in isolation or out-of-order with respect to the usual
@@ -1897,7 +1897,7 @@
 </tbody>
 </table>
 
-<p><b>Note:</b> All elements' <code>field_id</code>s and
+<p class="note"><strong>Note:</strong> All elements' <code>field_id</code>s and
 <code>method_id</code>s must refer to the same defining class.</p>
 
 <h3 id="encoded-field-format">encoded_field format</h3>
@@ -2381,7 +2381,7 @@
     to indicate that that value is unknown. (If <code>sig_idx</code> is
     <code>-1</code>, though, the same data could be represented more
     efficiently using the opcode <code>DBG_START_LOCAL</code>.)
-    <p><b>Note:</b> See the discussion under
+    <p class="note"><strong>Note:</strong> See the discussion under
     "<code>dalvik.annotation.Signature</code>" below for caveats about
     handling signatures.</p>
   </td>
@@ -2538,7 +2538,7 @@
 </tbody>
 </table>
 
-<p><b>Note:</b> All elements' <code>field_id</code>s and
+<p class="note"><strong>Note:</strong> All elements' <code>field_id</code>s and
 <code>method_id</code>s must refer to the same defining class.</p>
 
 <h3 id="field-annotation">field_annotation format</h3>
diff --git a/src/devices/tech/power/index.jd b/src/devices/tech/power/index.jd
index c3a6a9a..c64676f 100644
--- a/src/devices/tech/power/index.jd
+++ b/src/devices/tech/power/index.jd
@@ -91,8 +91,7 @@
 nominal voltage using an external power monitor, such as a bench power supply or specialized
 battery-monitoring tools (such as Monsoon Solution Inc. Power Monitor and Power Tool software).</p>
 
-<p class="note">
-<strong>Note:</strong> Manufacturers often supply information about the current consumed by an
+<p class="note"><strong>Note:</strong> Manufacturers often supply information about the current consumed by an
 individual component. Use this information if it accurately represents the current drawn from the
 device battery in practice. However, validate manufacturer-provided values before
 using those values in your device power profile.</p>
diff --git a/src/devices/tech/test_infra/tradefed/full_example.jd b/src/devices/tech/test_infra/tradefed/full_example.jd
index 1be769f..a9f57bc 100644
--- a/src/devices/tech/test_infra/tradefed/full_example.jd
+++ b/src/devices/tech/test_infra/tradefed/full_example.jd
@@ -336,10 +336,10 @@
 <p>This is accomplished via the <code>@Option</code> annotation. To participate, a Configuration object class
 would apply the <code>@Option</code> annotation to a member field, and provide it a unique name. This would
 allow that member field's value to be populated via a command line option, and would also
-automatically add that option to the configuration help system (Note: not all field types are
-supported: see the
+automatically add that option to the configuration help system.</p>
+<p class="note"><strong>Note:</strong> Not all field types are supported. See the
 <a href="/reference/com/android/tradefed/config/OptionSetter.html">OptionSetter javadoc</a> for a
-description of supported types).</p>
+description of supported types.</p>
 
 <p>Let's add an <code>@Option</code> to the HelloWorldTest:</p>
 <pre><code>@Option(name="my_option",
diff --git a/src/devices/tech/test_infra/tradefed/fundamentals/options.jd b/src/devices/tech/test_infra/tradefed/fundamentals/options.jd
index 930be9e..3874256 100644
--- a/src/devices/tech/test_infra/tradefed/fundamentals/options.jd
+++ b/src/devices/tech/test_infra/tradefed/fundamentals/options.jd
@@ -25,7 +25,7 @@
 the Test Runner.  This mechanism works for all Java intrinsic types, as well as for any
 <code>Map</code>s or <code>Collection</code>s of intrinsic types.</p>
 
-<p><em>Note:</em> the option-handling mechanism only works for classes implementing one of the
+<p class="note"><strong>Note:</strong> The option-handling mechanism only works for classes implementing one of the
 interfaces included in the <a href="lifecycle.html">Test Lifecycle</a>, and only when that class is
 <em>instantiated</em> by the lifecycle machinery.</p>
 
diff --git a/src/source/building-dream.jd b/src/source/building-dream.jd
index 1b6d9ac..13ec46a 100644
--- a/src/source/building-dream.jd
+++ b/src/source/building-dream.jd
@@ -58,5 +58,5 @@
 <p>from this point, the fastboot tool (which is put automatically in your path) can be used to flash a device: boot the device into the bootloader by holding the back key while pressing the power key, and run <code>fastboot -w flashall</code>.</p>
 </li>
 </ol>
-<p>Note: these instructions work for the sapphire (ADP2) build target, as
+<p class="note"><strong>Note:</strong> These instructions work for the sapphire (ADP2) build target, as
 well. Simply replace "dream" with "sapphire" above.</p>
diff --git a/src/source/developing.jd b/src/source/developing.jd
index c47f425..7788f56 100644
--- a/src/source/developing.jd
+++ b/src/source/developing.jd
@@ -101,7 +101,8 @@
 <pre><code>$ repo branches
 </code></pre>
 <p>The name of the current branch will be preceded by an asterisk.</p>
-<p><em>Note: A bug might be causing <code>repo sync</code> to reset the local topic branch. If <code>git branch</code> shows * (no branch) after you run <code>repo sync</code>, then run <code>git checkout</code> again.</em></p>
+<p class="note"><strong>Note:</strong> A bug might be causing <code>repo sync</code> to reset the local topic branch. 
+If <code>git branch</code> shows * (no branch) after you run <code>repo sync</code>, then run <code>git checkout</code> again.</p>
 <h2 id="staging-files">Staging files</h2>
 <p>By default, Git notices but does not track the changes you make in a project. In order to tell git to preserve your changes, you must mark them for inclusion in a commit. This is also called "staging". </p>
 <p>You can stage your changes by running</p>
diff --git a/src/source/initializing.jd b/src/source/initializing.jd
index 829a975..7d9e000 100644
--- a/src/source/initializing.jd
+++ b/src/source/initializing.jd
@@ -47,7 +47,7 @@
 <p>For Gingerbread (2.3.x) and newer versions, including the <code>master</code>
 branch, a 64-bit environment is required. Older versions can be
 compiled on 32-bit systems.</p>
-<p><strong>Note</strong>: See the <a href="building.html">Downloading and
+<p class="note"><strong>Note:</strong> See the <a href="building.html">Downloading and
 Building</a> page for the list of hardware and software requirements. Then
 follow the detailed instructions for Ubuntu and Mac OS below.</p>
 
@@ -74,7 +74,7 @@
 Java 6: for Gingerbread through KitKat<br/>
 Java 5: for Cupcake through Froyo</p>
 
-<p><strong>Note</strong>: The <code>lunch</code> command in the build step will ensure that the Sun JDK is
+<p class="note"><strong>Note:</strong> The <code>lunch</code> command in the build step will ensure that the Sun JDK is
 used instead of any previously installed JDK.</p>
 
 <h3 id="installing-required-packages-ubuntu-1404">Installing required packages (Ubuntu 14.04)</h3>
@@ -212,7 +212,7 @@
 <pre><code># mount the android file image
 function mountAndroid { hdiutil attach ~/android.dmg -mountpoint /Volumes/android; }
 </code></pre>
-<p><strong>Note</strong>: If your system created a <code>.dmg.sparsefile</code> file, replace <code>~/android.dmg</code> with <code>~/android.dmg.sparsefile</code>.</p>
+<p class="note"><strong>Note:</strong> If your system created a <code>.dmg.sparsefile</code> file, replace <code>~/android.dmg</code> with <code>~/android.dmg.sparsefile</code>.</p>
 </li>
 <li>
 <p>To unmount it when you execute <code>umountAndroid</code>:</p>
@@ -266,13 +266,11 @@
 </li>
 <li>
 <p>Install MacPorts from <a href="http://www.macports.org/install.php">macports.org</a>.</p>
-<p><em>Note: Make sure that <code>/opt/local/bin</code> appears in your path BEFORE <code>/usr/bin</code>.  If not, add</em> </p>
-<pre><code>export PATH=/opt/local/bin:$PATH
-</code></pre>
-<p><em>to your <code>~/.bash_profile</code>.</em></p>
-
-<p><strong>Note</strong>: If you do not have a <code>.bash_profile</code> file in your home directory, create one.</p>
-
+<p class="note"><strong>Note:</strong> Make sure that <code>/opt/local/bin</code> appears in your path <strong>before</strong> <code>/usr/bin</code>. If not, please add the following to your <code>~/.bash_profile</code> file:</p>
+<pre>
+<code>export PATH=/opt/local/bin:$PATH</code>
+</pre>
+<p class="note"><strong>Note:</strong> If you do not have a <code>.bash_profile</code> file in your home directory, create one.</p>
 </li>
 <li>
 <p>Get make, git, and GPG packages from MacPorts: </p>
diff --git a/src/source/roles.jd b/src/source/roles.jd
index dccd402..34c9e46 100644
--- a/src/source/roles.jd
+++ b/src/source/roles.jd
@@ -51,8 +51,8 @@
 <h2 id="verifier">Verifier</h2>
 <p>"Verifiers" are responsible for testing change requests. After individuals
 have submitted a significant amount of high-quality code to the project, the
-project leads might invite them to become verifiers. <em>Note: at this
-time, verifiers act similarly to approvers.</em></p>
+project leads might invite them to become verifiers.</p>
+<p class="note"><strong>Note:</strong> At this time, verifiers act similarly to approvers.</p>
 <h2 id="approver">Approver</h2>
 <p>"Approvers" are experienced members of the project who have demonstrated their
 design skills and have made significant technical contributions to the
diff --git a/src/source/using-eclipse.jd b/src/source/using-eclipse.jd
index 4d78c42..12ee1eb 100644
--- a/src/source/using-eclipse.jd
+++ b/src/source/using-eclipse.jd
@@ -24,10 +24,10 @@
   </div>
 </div>
 <p>This document will help you set up the Eclipse IDE for Android platform development.</p>
-<p><em>Note: if you are looking for information on how to use
+<p class="note"><strong>Note:</strong> If you are looking for information on how to use
 Eclipse to develop applications that run on Android, this is not the right
 page for you. You probably would find <a href="https://developer.android.com/sdk/eclipse-adt.html">the Eclipse page on 
-developer.android.com</a> more useful.</em></p>
+developer.android.com</a> more useful.</p>
 <h2 id="basic-setup">Basic setup</h2>
 <p>First, it's important to make sure the regular Android development system is set up.</p>
 <pre><code>cd /path/to/android/root 
@@ -81,7 +81,7 @@
 </li>
 </ol>
 <p>Once the project workspace is created, Eclipse should start building. In theory, it should build with no errors and you should be set to go. If necessary, uncheck and re-check Project Build Automatically to force a rebuild.</p>
-<p><em>Note:</em> Eclipse sometimes likes to add an <code>import android.R</code> statement at the top of your files that use resources, especially when you ask eclipse to sort or otherwise manage imports. This will cause your make to break. Look out for these erroneous import statements and delete them.</p>
+<p class="note"><strong>Note:</strong> Eclipse sometimes adds an <code>import android.R</code> statement at the top of your files that use resources, especially when you ask eclipse to sort or otherwise manage imports. This will cause your make to break. Look out for these erroneous import statements and delete them.</p>
 <h3 id="when-you-sync">When You Sync</h3>
 <p>Every time you repo sync, or otherwise change files outside of Eclipse (especially the .classpath), you need to refresh Eclipse's view of things:</p>
 <ol>
diff --git a/src/source/using-repo.jd b/src/source/using-repo.jd
index 57a93c9..61d40eb 100644
--- a/src/source/using-repo.jd
+++ b/src/source/using-repo.jd
@@ -58,7 +58,7 @@
 <p><code>-b</code>: specify a revision, i.e., a particular manifest-branch.</p>
 </li>
 </ul>
-<p><em>Note: For all remaining Repo commands, the current working directory must either be the parent directory of <code>.repo/</code> or a subdirectory of the parent directory.</em></p>
+<p class="note"><strong>Note:</strong> For all remaining Repo commands, the current working directory must either be the parent directory of <code>.repo/</code> or a subdirectory of the parent directory.</p>
 <h2 id="sync">sync</h2>
 <pre><code>repo sync [<em>&lt;PROJECT_LIST&gt;</em>]
 </code></pre>
@@ -134,7 +134,7 @@
 <pre><code>$ repo download platform/build 23823
 </code></pre>
 <p>A <code>repo sync</code> should effectively remove any commits retrieved via <code>repo download</code>. Or, you can check out the remote branch; e.g., <code>git checkout m/master</code>.</p>
-<p>*Note: There is a slight mirroring lag between when a change is visible on
+<p class="note"><strong>Note:</strong> There is a slight mirroring lag between when a change is visible on
 the web in <a href="https://android-review.googlesource.com/">Gerrit</a> and when
 <code>repo download</code> will be able to find it for all users, because of replication
 delays to all servers worldwide.</p>
@@ -181,7 +181,7 @@
 <p>Begins a new branch for development, starting from the revision specified in the manifest.</p>
 <p>The <code><em>&lt;BRANCH_NAME&gt;</em></code> argument should provide a short description of the change you are trying to make to the projects.If you don't know, consider using the name default.</p>
 <p>The <code><em>&lt;PROJECT_LIST&gt;</em></code> specifies which projects will participate in this topic branch. </p>
-<p><em>Note: "." is a useful shorthand for the project in the current working directory.</em></p>
+<p class="note"><strong>Note:</strong> "." is a useful shorthand for the project in the current working directory.</p>
 <h2 id="status">status</h2>
 <pre><code>repo status [<em>&lt;PROJECT_LIST&gt;</em>]
 </code></pre>