1 files changed, 20 insertions, 19 deletions
diff --git a/docs/SkPaint_Reference.bmh b/docs/SkPaint_Reference.bmh
index 0b80bf7e07..6dc3109e84 100644
--- a/docs/SkPaint_Reference.bmh
+++ b/docs/SkPaint_Reference.bmh
@@ -1,6 +1,8 @@
 #Topic Paint
 #Alias Paint_Reference
 
+#Class SkPaint
+
 Paint controls options applied when drawing and measuring. Paint collects all
 options outside of the Canvas_Clip and Canvas_Matrix.
 
@@ -27,8 +29,6 @@ Paint describes a single color, a single font, a single image quality, and so on
 Multiple colors are drawn either by using multiple paints or with objects like
 Shader attached to Paint.
 
-#Class SkPaint
-
 #Topic Overview
 
 #Subtopic Subtopics
@@ -4000,10 +4000,10 @@ All character encoding are able to represent all of Unicode, differing only
 in the total storage required.
 
 #A UTF-8 (RFC 3629) # https://tools.ietf.org/html/rfc3629 ## is made up of 8-bit bytes, 
-and encodes ASCII in one byte, and all valid code points in Unicode in multiple bytes.
-#A UTF-16 (RFC 2781) # https://tools.ietf.org/html/rfc2781 ## uses one or two 16-bit words, 
-and encodes Unicode ranges 0x0000 to 0xD7FF and 0xE000 to 0xFFFF in one word.
-#A UTF-32 # http://www.unicode.org/versions/Unicode5.0.0/ch03.pdf ## describes
+and encodes ASCII in one byte, and all valid code points in Unicode in multiple
+bytes. #A UTF-16 (RFC 2781) # https://tools.ietf.org/html/rfc2781 ## uses one or two 16-bit words, 
+and encodes Unicode ranges 0x0000 to 0xD7FF and 0xE000 to 0xFFFF in one 
+word. #A UTF-32 # http://www.unicode.org/versions/Unicode5.0.0/ch03.pdf ## describes
 a 32-bit word, which encodes all code points in Unicode.
 
 Font_Manager uses font data to convert character code points into glyph indices. 
@@ -4159,6 +4159,16 @@ void draw(SkCanvas* canvas) {
 
 #Struct FontMetrics
 
+    FontMetrics is filled out by getFontMetrics. FontMetrics contents reflect the values
+    computed by Font_Manager using Typeface. Values are set to zero if they are
+    not available.
+
+    fUnderlineThickness and fUnderlinePosition have a bit set in fFlags if their values
+    are valid, since their value may be zero.
+    
+    fStrikeoutThickness and fStrikeoutPosition have a bit set in fFlags if their values
+    are valid, since their value may be zero.
+
 #Code
     struct FontMetrics {
         enum FontMetricsFlags {
@@ -4192,17 +4202,12 @@ void draw(SkCanvas* canvas) {
     };
 ##
 
-    FontMetrics is filled out by getFontMetrics. FontMetrics contents reflect the values
-    computed by Font_Manager using Typeface. Values are set to zero if they are
-    not available.
+    #Enum FontMetricsFlags
 
-    fUnderlineThickness and fUnderlinePosition have a bit set in fFlags if their values
-    are valid, since their value may be zero.
-    
-    fStrikeoutThickness and fStrikeoutPosition have a bit set in fFlags if their values
-    are valid, since their value may be zero.
+    FontMetricsFlags are set in fFlags when underline and strikeout metrics are valid;
+    the underline or strikeout metric may be valid and zero.
+    Fonts with embedded bitmaps may not have valid underline or strikeout metrics.
 
-    #Enum FontMetricsFlags
     #Code
         enum FontMetricsFlags {
             kUnderlineThicknessIsValid_Flag = 1 << 0,
@@ -4212,10 +4217,6 @@ void draw(SkCanvas* canvas) {
         };
     ##
 
-        FontMetricsFlags are set in fFlags when underline and strikeout metrics are valid;
-        the underline or strikeout metric may be valid and zero.
-        Fonts with embedded bitmaps may not have valid underline or strikeout metrics.
-
         #Const kUnderlineThicknessIsValid_Flag 0x0001
             Set if fUnderlineThickness is valid.
         ##