diff --git a/README.md b/README.md
index 7c890fb0..84e0d9c3 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ as a free software project.
 You can download the source code tarball of MiniGUI and the dependent libraries
 from the download zone of the site:
 
-  http://www.minigui.com
+http://www.minigui.com
 
 FMSoft also releases some open source apps for MiniGUI on the site above,
 for examples:
@@ -342,7 +342,9 @@ A brief history description of the development progress lay below:
 
 The original author of MiniGUI is WEI Yongming, and now MiniGUI is
 maintained by FMSoft. For more information, please browse
-our home page: http://www.fmsoft.cn.
+our home page:
+
+http://www.fmsoft.cn.
 
 
 ## IF YOU HAVE A PROBLEM
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index ba59179c..9f09c285 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -276,6 +276,10 @@ if you want to get the height and descent data of one font.
 * More fields added for GLYPHBITMAP structure in order to return the completed
 rasterized glyph bitmap information.
 
+* A new BITMAP type: `BMP_TYPE_REPLACEKEY`. When `bmType` of a BITMAP object
+has this bit set, any pixel which is equal to `bmColorKey` will be replaced by
+`bmColorRep`.
+
 * `GetGlyphInfo` now can return the basic glyph type and break type of a
 UNICODE character. If the glyph is an ASCII character, the old `MCHAR_TYPE`
 can also be returned.
@@ -288,17 +292,7 @@ avoid the conflict with typedef of UChar32 in 'unicode/umachine.h'.
 
 * Redefine `Uchar32` and `Glyph32` as `Uint32` instead of `int`.
 
-* Support for FreeType1 removed.
-
-You should always use FreeType2 to support vector fonts, such as TrueType
-fonts (TTF), TrueType collections (TTC), OpenType fonts (OTF, both TrueType
-and CFF variants), OpenType collections (OTC), and Type 1 fonts (PFA and PFB).
-
-* A new BITMAP type: `BMP_TYPE_REPLACEKEY`. When `bmType` of a BITMAP object
-has this bit set, any pixel which is equal to `bmColorKey` will be replaced by
-`bmColorRep`.
-
-#### Deprecated APIs
+#### Deprecated APIs or Features
 
 The following old APIs are deprecated, you should use the Unicode version
 APIs instead:
@@ -310,6 +304,11 @@ APIs instead:
 * BIDILogAChars2VisAChars
 * BIDIGetLogicalEmbedLevelsEx
 
+Support for FreeType1 was removed.
+You should always use FreeType2 to support vector fonts, such as TrueType
+fonts (TTF), TrueType collections (TTC), OpenType fonts (OTF, both TrueType
+and CFF variants), OpenType collections (OTC), and Type 1 fonts (PFA and PFB).
+
 ## Version 3.2.1
 
 The MiniGUI development team announces the availability of MiniGUI 3.2.1.
diff --git a/include/gdi.h b/include/gdi.h
index fb792caa..231ace57 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -6853,7 +6853,7 @@ typedef struct _FONTMETRICS {
  * \param font_metrics The buffer receives the metrics information.
  * \return None.
  *
- * \sa GetGlyphBitmap, FONTMETRICS
+ * \sa GetGlyphInfo, FONTMETRICS
  */
 MG_EXPORT void GUIAPI GetFontMetrics (LOGFONT* log_font,
                 FONTMETRICS* font_metrics);
@@ -12046,9 +12046,9 @@ MG_EXPORT int GUIAPI GetGlyphsExtentPoint (HDC hdc, Glyph32* glyphs,
 /** The type of glyph bitmap: grey (4-bit) */
 #define GLYPHBMP_TYPE_GREY4b    0x02
 /** The type of glyph bitmap: subpixel */
-#define GLYPHBMP_TYPE_SUBPIXEL  0x02
+#define GLYPHBMP_TYPE_SUBPIXEL  0x03
 /** The type of glyph bitmap: pre-rendered BITMAP object */
-#define GLYPHBMP_TYPE_PRERENDER 0x03
+#define GLYPHBMP_TYPE_PRERENDER 0x04
 
 /**
  * \var typedef struct  _GLYPHINFO GLYPHINFO