diff --git a/docs/xml/lcl/clipbrd.xml b/docs/xml/lcl/clipbrd.xml
index 4830284e9a..52ba25f1b4 100644
--- a/docs/xml/lcl/clipbrd.xml
+++ b/docs/xml/lcl/clipbrd.xml
@@ -14,8 +14,8 @@ Definitions for the Clipboard to hold Cut or Copied data for Pasting.
 <p>
 <file>clipbrd.pp</file> contains classes, types, and routines used to 
 implement TClipboard. TClipboard encapsulates the system clipboard for 
-supported platforms. This file is part of the Lazarus Component Library 
-(<b>LCL</b>).
+supported platforms. <file>clipbrd.pp</file> is part of the Lazarus Component 
+Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/colorbox.xml b/docs/xml/lcl/colorbox.xml
index 5a91a28978..26ce874148 100644
--- a/docs/xml/lcl/colorbox.xml
+++ b/docs/xml/lcl/colorbox.xml
@@ -15,8 +15,7 @@ Defines classes for selecting a color from a combo-box or a list box.
 <file>colorbox.pas</file> contains <var>TColorBox</var> and 
 <var>TColorListBox</var>. TColorBox is a component that displays colors in a 
 combo-box control. TColorListBox is a component that displays colors in a 
-list box control. This file is part of the Lazarus Component Library 
-(<b>LCL</b>).
+list box control. <file>colorbox.pas</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 <p>
 The following components are added to the Lazarus IDE component palette:
diff --git a/docs/xml/lcl/comctrls.xml b/docs/xml/lcl/comctrls.xml
index a6d4dd8294..4f191f48d9 100644
--- a/docs/xml/lcl/comctrls.xml
+++ b/docs/xml/lcl/comctrls.xml
@@ -40,7 +40,7 @@ The following components are added but not displayed on the component palette:
 <li>TTabSheet</li>
 </ul>
 <p>
-This file is part of the <file>LCL</file> (Lazarus Component Library) package.
+<file>comctrls.pp</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/controls.xml b/docs/xml/lcl/controls.xml
index e7463e5794..7c9c556f04 100644
--- a/docs/xml/lcl/controls.xml
+++ b/docs/xml/lcl/controls.xml
@@ -34,7 +34,7 @@ component palette:
 <li>TGraphicControl</li>
 </ul>
 <p>
-This file is part of the Lazarus Component Library (LCL).
+<file>controls.pp</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/dbactns.xml b/docs/xml/lcl/dbactns.xml
index 642b928a96..09d5ab1904 100644
--- a/docs/xml/lcl/dbactns.xml
+++ b/docs/xml/lcl/dbactns.xml
@@ -17,7 +17,7 @@ Standard actions used to navigate and manipulate a dataset in a datasource.
 used to navigate and manipulate a dataset in a datasource.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>dbactns.pp</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 <p>
 The following components are registered but not displayed on the Lazarus IDE 
diff --git a/docs/xml/lcl/dbextctrls.xml b/docs/xml/lcl/dbextctrls.xml
index e349a23bd9..1dd79abef7 100644
--- a/docs/xml/lcl/dbextctrls.xml
+++ b/docs/xml/lcl/dbextctrls.xml
@@ -7,7 +7,7 @@
 <short>Contains extended database controls.</short>
 <descr>
 <p>
-<var>dbextctrls.pp</var> contains extended database-aware controls used in 
+<file>dbextctrls.pp</file> contains extended database-aware controls used in 
 the Lazarus Component Library (<b>LCL</b>).
 </p>
 <p>
diff --git a/docs/xml/lcl/dialogs.xml b/docs/xml/lcl/dialogs.xml
index 494c6fc584..e53bd72be3 100644
--- a/docs/xml/lcl/dialogs.xml
+++ b/docs/xml/lcl/dialogs.xml
@@ -11,8 +11,8 @@ Dialogs
 <descr>
 <p>
 <file>dialogs.pp</file> contains classes, types, and routines used to 
-implement common dialogs in an application. This file is part of the Lazarus 
-Component Library (<b>LCL</b>).
+implement common dialogs in an application. <file>dialogs.pp</file> is part of 
+the Lazarus Component Library (<b>LCL</b>).
 </p>
 <p>
 The following components are added to the Lazarus IDE component palette:
diff --git a/docs/xml/lcl/extgraphics.xml b/docs/xml/lcl/extgraphics.xml
index 658ae4369c..2eed85678b 100644
--- a/docs/xml/lcl/extgraphics.xml
+++ b/docs/xml/lcl/extgraphics.xml
@@ -13,8 +13,8 @@ Types and routines used to implement extended graphic drawing.
 <descr>
 <p>
 <file>extgraphics.pas</file> contains types and routines which implement 
-extended drawing routines for various shapes. This file is part of the 
-Lazarus Component Library (<b>LCL</b>).
+extended drawing routines for various shapes. <file>extgraphics.pas</file> is 
+part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/finddlgunit.xml b/docs/xml/lcl/finddlgunit.xml
index 984edf1f60..a6f6f5e851 100644
--- a/docs/xml/lcl/finddlgunit.xml
+++ b/docs/xml/lcl/finddlgunit.xml
@@ -17,7 +17,8 @@ not compiled into the LCL. This form is used to design the .lfm file.
 The source code is a copy of <file>../lcl/include/finddialog.inc</file>.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>finddlgunit.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/graphics.xml b/docs/xml/lcl/graphics.xml
index 65a8aaf221..ce35716056 100644
--- a/docs/xml/lcl/graphics.xml
+++ b/docs/xml/lcl/graphics.xml
@@ -31,7 +31,7 @@ used by the Run-time Library (<b>RTL</b>):
 <li>TRegion</li>
 </ul>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>graphics.pp</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/graphutil.xml b/docs/xml/lcl/graphutil.xml
index 802ba92111..a38348f91f 100644
--- a/docs/xml/lcl/graphutil.xml
+++ b/docs/xml/lcl/graphutil.xml
@@ -10,7 +10,7 @@ GraphUtil
 <short>Contains routines and types used when drawing graphics.</short>
 <descr>
 <p>
-<var>GraphUtil.pp</var> contains routines and types used when drawing 
+<file>graphutil.pp</file> contains routines and types used when drawing 
 graphics. They focus primarily on converting colors and drawing gradients, 
 scroll bars, and arrows.
 </p>
@@ -33,6 +33,10 @@ where a lightness value of 0 or 1 is fully black or white (respectively).
 GraphUtil is used in the Lazarus IDE, in LCL WidgetSet components, and 
 optional Lazarus components like FPReport, SynEdit, and TAChart.
 </p>
+<p>
+<file>graphutil.pp</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
+</p>
 </descr>
 
 <!-- unresolved type references Visibility: default -->
diff --git a/docs/xml/lcl/helpintfs.xml b/docs/xml/lcl/helpintfs.xml
index 8370ef3c60..fb8179c95f 100644
--- a/docs/xml/lcl/helpintfs.xml
+++ b/docs/xml/lcl/helpintfs.xml
@@ -21,7 +21,8 @@ help system. To create your own help system, implement a descendant of
 <var>THelpManager</var>.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>helpintfs.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 <p>
 Author: Mattias Gaertner
diff --git a/docs/xml/lcl/icnstypes.xml b/docs/xml/lcl/icnstypes.xml
index ea74a61389..49ae7cd673 100644
--- a/docs/xml/lcl/icnstypes.xml
+++ b/docs/xml/lcl/icnstypes.xml
@@ -20,7 +20,8 @@ taken from the univint package in FPC.
 Author: Paul Ishenin
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>)
+<file>icnstypes.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>)
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/imagelistcache.xml b/docs/xml/lcl/imagelistcache.xml
index 7ba9b4258d..bcbf16248d 100644
--- a/docs/xml/lcl/imagelistcache.xml
+++ b/docs/xml/lcl/imagelistcache.xml
@@ -19,7 +19,8 @@ implement a cache for <var>TCustomImageList</var> instances. It is used mainly
 to cache image lists with the glyphs used on button controls.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>imagelistcache.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/interfacebase.xml b/docs/xml/lcl/interfacebase.xml
index 15d47fd0c2..20881e81f7 100644
--- a/docs/xml/lcl/interfacebase.xml
+++ b/docs/xml/lcl/interfacebase.xml
@@ -17,7 +17,8 @@ define a platform-independent widgetset class (<var>TWidgetSet</var>) and
 helper functions.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>interfacebase.pp</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/lazfreetypeintfdrawer.xml b/docs/xml/lcl/lazfreetypeintfdrawer.xml
index 5a7bcd9052..d61db33a8f 100644
--- a/docs/xml/lcl/lazfreetypeintfdrawer.xml
+++ b/docs/xml/lcl/lazfreetypeintfdrawer.xml
@@ -14,7 +14,8 @@ LCL interface class for the text renderer in the FreeType package.
 </short>
 <descr>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>lazfreetypeintfdrawer.pas</file> is part of the Lazarus Component 
+Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/lclmemmanager.xml b/docs/xml/lcl/lclmemmanager.xml
index 096a8394ba..7fabb8fa58 100644
--- a/docs/xml/lcl/lclmemmanager.xml
+++ b/docs/xml/lcl/lclmemmanager.xml
@@ -13,13 +13,13 @@ Base class for a memory manager used in the LCL and its interfaces.
 <descr>
 <p>
 <file>lclmemmanager.pas</file> contains classes and type used to define the 
-base
-class for various memory managers used in the Lazarus Component Library
+base class for various memory managers used in the Lazarus Component Library
 (<b>LCL</b>) and its interfaces. An own memory manager is somewhat faster and
 makes debugging and profiling easier.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>lclmemmanager.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 <p>
 Author: Mattias Gaertner
diff --git a/docs/xml/lcl/lclmessageglue.xml b/docs/xml/lcl/lclmessageglue.xml
index efdef3f2ee..965d356645 100644
--- a/docs/xml/lcl/lclmessageglue.xml
+++ b/docs/xml/lcl/lclmessageglue.xml
@@ -17,7 +17,8 @@ the LCL from the different widgetsets easier. Your mileage will vary if you
 try to use these procedures from within your program.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>lclmessageglue.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/lclplatformdef.xml b/docs/xml/lcl/lclplatformdef.xml
index 9bb0749ce1..a536e84b13 100644
--- a/docs/xml/lcl/lclplatformdef.xml
+++ b/docs/xml/lcl/lclplatformdef.xml
@@ -14,7 +14,8 @@ LCLPlatformDef
 routines used in LCL platform definitions.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>lclplatformdef.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/lclproc.xml b/docs/xml/lcl/lclproc.xml
index ecfd8f650f..302d1dcb17 100644
--- a/docs/xml/lcl/lclproc.xml
+++ b/docs/xml/lcl/lclproc.xml
@@ -14,7 +14,7 @@ LCLProc
 that are useful in LCL applications.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>lclproc.pas</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/lclrescache.xml b/docs/xml/lcl/lclrescache.xml
index 40ae4f5ba8..100b3be0cc 100644
--- a/docs/xml/lcl/lclrescache.xml
+++ b/docs/xml/lcl/lclrescache.xml
@@ -14,7 +14,8 @@ LCLResCache
 interface resources. See <file>graphics.pp</file> for examples.
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>lclrescache.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 <p>
 Author: Mattias Gaertner
diff --git a/docs/xml/lcl/lcltranslator.xml b/docs/xml/lcl/lcltranslator.xml
index ea5f959ed4..9446cf6e90 100644
--- a/docs/xml/lcl/lcltranslator.xml
+++ b/docs/xml/lcl/lcltranslator.xml
@@ -12,7 +12,7 @@ Performs string translation in the Lazarus IDE and LCL.
 </short>
 <descr>
 <p>
-<var>lcltranslator.pas</var> contains classes and routines used to perform 
+<file>lcltranslator.pas</file> contains classes and routines used to perform 
 translation for strings used in Lazarus IDE and LCL (Lazarus Component 
 Library). It searches for .po (Portable Object) and/or .mo (Machine Object) 
 files used to perform I18n internationalization and L10n localization. The 
@@ -41,6 +41,10 @@ href="http://wiki.lazarus.freepascal.org/Step-by-step_instructions_for_creating_
 Creating Multi-Language Applications
 </url>
 </p>
+<p>
+<file>lcltranslator.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
+</p>
 </descr>
 
 <element name="Classes"/>
diff --git a/docs/xml/lcl/ldocktree.xml b/docs/xml/lcl/ldocktree.xml
index f49ca3ef3d..f30354b650 100644
--- a/docs/xml/lcl/ldocktree.xml
+++ b/docs/xml/lcl/ldocktree.xml
@@ -16,7 +16,8 @@ This unit defines TLazDockTree, the default TDockTree used in the LCL.
 TDockTree used in the LCL.
 </p>
 <p>
-This file is part of the Lazarus Component Library (LCL).
+<file>ldocktree.pas</file> is part of the Lazarus Component Library 
+<b>(LCL)</b>.
 </p>
 </descr>
 <descr/>
diff --git a/docs/xml/lcl/lmessages.xml b/docs/xml/lcl/lmessages.xml
index f0c32c83e7..707828d906 100644
--- a/docs/xml/lcl/lmessages.xml
+++ b/docs/xml/lcl/lmessages.xml
@@ -15,7 +15,8 @@ for other platforms/widgetsets.
 <p>
 <file>lmessages.pp</file> contains Lazarus message codes and their mapping
 to message codes for other platforms/widgetsets.
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>lmessages.pp</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/lresources.xml b/docs/xml/lcl/lresources.xml
index 4cc3251a2f..8959f0cd10 100644
--- a/docs/xml/lcl/lresources.xml
+++ b/docs/xml/lcl/lresources.xml
@@ -36,7 +36,8 @@ Lazarus resource include file.
 Author: Mattias Gaertner
 </p>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>lresources.pp</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/maskedit.xml b/docs/xml/lcl/maskedit.xml
index d781ccebbf..fde02c64bf 100644
--- a/docs/xml/lcl/maskedit.xml
+++ b/docs/xml/lcl/maskedit.xml
@@ -23,7 +23,7 @@ following components are added to the Lazarus IDE component palette:
 <li>TMaskEdit</li>
 </ul>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>maskedit.pp</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/popupnotifier.xml b/docs/xml/lcl/popupnotifier.xml
index bd02d70bd4..a217642903 100644
--- a/docs/xml/lcl/popupnotifier.xml
+++ b/docs/xml/lcl/popupnotifier.xml
@@ -21,7 +21,8 @@ Please note that <var>ExtCtrls</var> has a dependency on the
 <var>popupnotifier</var> and other units should be avoided.
 </remark>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>popupnotifier.pas</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/propertystorage.xml b/docs/xml/lcl/propertystorage.xml
index 90b3e0e42a..86e60d492e 100644
--- a/docs/xml/lcl/propertystorage.xml
+++ b/docs/xml/lcl/propertystorage.xml
@@ -20,7 +20,8 @@ implemented in a descendent class. For example: TControlPropertyStorage,
 TFormPropertyStorage, TIniPropStorage, TJSONPropStorage, and TXMLPropStorage.
 </p>
 <p>
-This file is part of the <b>Lazarus Component Library (LCL)</b>.
+<file>propertystorage.pas</file> is part of the Lazarus Component Library 
+<b>(LCL)</b>.
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/spin.xml b/docs/xml/lcl/spin.xml
index e697582a93..15496d4be5 100644
--- a/docs/xml/lcl/spin.xml
+++ b/docs/xml/lcl/spin.xml
@@ -11,7 +11,7 @@ Spin
 <descr>
 <p>
 <file>spin.pp</file> contains classes which implement spin edit controls. 
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>spin.pp</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 <p>
 The following components are added to the Lazarus IDE component palette:
diff --git a/docs/xml/lcl/stdactns.xml b/docs/xml/lcl/stdactns.xml
index ec82c0f2df..dd06dcd78a 100644
--- a/docs/xml/lcl/stdactns.xml
+++ b/docs/xml/lcl/stdactns.xml
@@ -14,8 +14,8 @@ Defines standard actions used in Action Lists in the LCL.
 <p>
 <file>stdactns.pas</file> contains <var>TAction</var> descendents
 which can be used in <var>TActionList</var> for common actions
-performed using controls. This file is part of the Lazarus Component
-Library (<b>LCL</b>).
+performed using controls. <file>stdactns.pas</file> is part of the Lazarus 
+Component Library (<b>LCL</b>).
 </p>
 <p>
 The following components are registered but not displayed on the
diff --git a/docs/xml/lcl/utrace.xml b/docs/xml/lcl/utrace.xml
index e0642d4f41..8b75bd2de9 100644
--- a/docs/xml/lcl/utrace.xml
+++ b/docs/xml/lcl/utrace.xml
@@ -14,7 +14,7 @@ Defines an assertion error handler used for tracebacks in the debugger.
 </short>
 <descr>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>utrace.pp</file> is part of the Lazarus Component Library (<b>LCL</b>).
 </p>
 </descr>
 
diff --git a/docs/xml/lcl/wscontrols.xml b/docs/xml/lcl/wscontrols.xml
index 87ebf0a7ad..8d7015ccbe 100644
--- a/docs/xml/lcl/wscontrols.xml
+++ b/docs/xml/lcl/wscontrols.xml
@@ -10,7 +10,8 @@ WSControls
 <short>Contains the base interface classes for widgetset controls.</short>
 <descr>
 <p>
-This file is part of the Lazarus Component Library (<b>LCL</b>).
+<file>wscontrols.pp</file> is part of the Lazarus Component Library 
+(<b>LCL</b>).
 </p>
 </descr>
 
@@ -18,8 +19,10 @@ This file is part of the Lazarus Component Library (<b>LCL</b>).
 <element name="DefBtnColors">
 <short>Default colors used for button faces and button text.</short>
 <descr>
+<p>
 DefBtnColors is an array type which contains the default colors used for 
 button faces and button text in the widgetset class.
+</p>
 </descr>
 <seealso></seealso>
 </element>
@@ -27,7 +30,9 @@ button faces and button text in the widgetset class.
 <element name="TWSDragImageListResolution">
 <short></short>
 <descr>
+<p>
 TWSDragImageListResolution is a TWSCustomImageListResolution descendant.
+</p>
 </descr>
 <seealso></seealso>
 </element>
@@ -233,7 +238,9 @@ TWSDragImageListResolution is a TWSCustomImageListResolution descendant.
 <element name="TWSControl">
 <short></short>
 <descr>
+<p>
 TWSControl is a TWSLCLComponent descendant.
+</p>
 </descr>
 <seealso></seealso>
 </element>