diff --git a/docs/xml/lcl/lclclasses.xml b/docs/xml/lcl/lclclasses.xml
index 0c891dc0de..4b8fc1af04 100644
--- a/docs/xml/lcl/lclclasses.xml
+++ b/docs/xml/lcl/lclclasses.xml
@@ -18,7 +18,9 @@
       <element name="LCLProc"/>
 
       <element name="LazLongRec">
-        <short></short>
+        <short>
+          Represents a Long value as low- and high-order signed SmallInt values.
+        </short>
         <descr>
           <p>
             <file>SysUtils</file> has a <var>LongRec</var> structure which uses an unsigned <var>Word</var> type for <var>Lo</var> and <var>Hi</var>. <var>LazLongRec</var>  provides a similar record with signed <var>SmallInt</var> members.
diff --git a/docs/xml/lcl/maskedit.xml b/docs/xml/lcl/maskedit.xml
index 7d4ed8f786..4be84e2b26 100644
--- a/docs/xml/lcl/maskedit.xml
+++ b/docs/xml/lcl/maskedit.xml
@@ -6,7 +6,6 @@
       MaskEdit
     ====================================================================
     -->
-    <!-- TODO: Modified in 2.1. Needs review. -->
     <module name="MaskEdit">
       <short>
         Defines classes, types, and constants used to implement a masked edit control.
@@ -467,6 +466,18 @@
         <seealso/>
       </element>
 
+      <element name="EInvalidEditMask">
+        <short>Exception type raised for an invalid mask value in an edit mask.</short>
+        <descr>
+          <p>
+            Indicates that the content in <var>EditMask</var> is not a valid edit mask expression. Raised when a value is assigned to the EditMask property. Generally indicates that an invalid set declaration has been used in the edit mask.
+          </p>
+        </descr>
+        <seealso>
+          <link id="TCustomMaskEdit.EditMask"/>
+        </seealso>
+      </element>
+
       <element name="EInvalidUtf8">
         <short>Ancestor for UTF-8 exceptions.</short>
         <descr>
@@ -513,6 +524,50 @@
         </seealso>
       </element>
 
+      <element name="SFoundChar_Invalid">
+        <short>Exception message used when an invalid mask character is found.</short>
+        <descr/>
+        <seealso>
+          <link id="EDBEditError"/>
+        </seealso>
+      </element>
+
+      <element name="SUnclosedSet">
+        <short>Exception message used when an unclosed set is found in an edit mask.</short>
+        <descr/>
+        <seealso>
+          <link id="EInvalidEditMask"/>
+        </seealso>
+      </element>
+
+      <element name="SIllegalCharInSet">
+        <short>
+          Exception message used when a mask character not in the ASCII character set is used.
+        </short>
+        <descr/>
+        <seealso>
+          <link id="EInvalidEditMask"/>
+        </seealso>
+      </element>
+
+      <element name="SEmptySet">
+        <short>Exception message used when an empty set is specified in an edit mask.</short>
+        <descr/>
+        <seealso>
+          <link id="EInvalidEditMask"/>
+        </seealso>
+      </element>
+
+      <element name="SIllegalRangeChar">
+        <short>
+          Exception message used when more than one set range is used in an edit mask.
+        </short>
+        <descr/>
+        <seealso>
+          <link id="EInvalidEditMask"/>
+        </seealso>
+      </element>
+
       <element name="TCustomMaskEdit">
         <short>The base class for TMaskEdit.</short>
         <descr>
diff --git a/docs/xml/lcl/themes.xml b/docs/xml/lcl/themes.xml
index 3ce9bbb893..5910df5ff6 100644
--- a/docs/xml/lcl/themes.xml
+++ b/docs/xml/lcl/themes.xml
@@ -1851,18 +1851,27 @@ Mike Lischke (public@soft-gems.net, www.soft-gems.net).
 </element>
 
 <element name="TThemeOption">
-<short/>
+<short>
+  Represents glyph / image options that can be enabled or disabled for a theme.
+</short>
 <descr/>
-<seealso/>
+<seealso>
+  <link id="TThemeServices.GetOption"/>
+</seealso>
 </element>
 <element name="TThemeOption.toShowButtonImages">
 <short>Show images on buttons.</short>
 </element>
 <element name="TThemeOption.toShowMenuImages">
-<short>show images on menus.</short>
+<short>Show images on menus.</short>
 </element>
 <element name="TThemeOption.toUseGlyphEffects">
 <short>Use hot / down effects on (button) glyphs.</short>
+<descr>
+  <p>
+    The option is platform- or OS-dependent. Not supported for Windows or Mac. Requires WindowManager or Desktop Environment support on Linux platforms.
+  </p>
+</descr>
 </element>
 
 <element name="TThemeServices">