From: luzpaz <luzpaz@users.noreply.github.com>
Date: Sat, 8 Nov 2025 09:24:07 +0000 (-0500)
Subject: Documentation - Fix whitespaces (#807)
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=e52550047003b7c740af5108a14a32185cd4e080;p=occt.git

Documentation - Fix whitespaces (#807)

- Reformatted multi-line documentation comments to improve readability
- Removed trailing whitespace and unnecessary separators
- Improved logical grouping of related documentation items
---

diff --git a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_ShapeTool.hxx b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_ShapeTool.hxx
index 41c6101109..6d3721739a 100644
--- a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_ShapeTool.hxx
+++ b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_ShapeTool.hxx
@@ -120,7 +120,7 @@ public:
   //! Returns True if the label is not used by any assembly, i.e.
   //! contains sublabels which are assembly components
   //! This is relevant only if IsShape() is True
-  //! (There  is  no  Father TreeNode on  this  <L>)
+  //! (There is no Father TreeNode on this <L>)
   Standard_EXPORT static Standard_Boolean IsFree(const TDF_Label& L);
 
   //! Returns True if the label represents a shape (simple shape,
diff --git a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_ViewTool.hxx b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_ViewTool.hxx
index 610a904e05..b8a8710ee4 100644
--- a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_ViewTool.hxx
+++ b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_ViewTool.hxx
@@ -77,7 +77,7 @@ public:
                                const TDF_LabelSequence& theGDTs,
                                const TDF_Label&         theViewL) const;
 
-  //! Set Clipping planes to  given View
+  //! Set Clipping planes to given View
   Standard_EXPORT void SetClippingPlanes(const TDF_LabelSequence& theClippingPlaneLabels,
                                          const TDF_Label&         theViewL) const;
 
diff --git a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SessionFile.hxx b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SessionFile.hxx
index 6015aac052..707e62d34a 100644
--- a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SessionFile.hxx
+++ b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SessionFile.hxx
@@ -120,7 +120,7 @@ public:
   //! Performs a Read Operation from a file to a WorkSession
   //! i.e. calls ReadFile, then ReadSession and ReadEnd
   //! Returned Value is : 0 for OK, -1 File could not be opened,
-  //! >0 Error during Read  (see WriteSession)
+  //! >0 Error during Read (see WriteSession)
   //! IsDone can be called too (will return True for OK)
   Standard_EXPORT Standard_Integer Read(const Standard_CString filename);
 
diff --git a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SessionPilot.hxx b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SessionPilot.hxx
index 1a13ec2b68..8353df53a2 100644
--- a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SessionPilot.hxx
+++ b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SessionPilot.hxx
@@ -52,7 +52,7 @@ DEFINE_STANDARD_HANDLE(IFSelect_SessionPilot, IFSelect_Activator)
 //! -> such a command may be called :
 //! - directly, it will add an item with no name
 //! - by command xset, in the following form :
-//! xset name command ...  calls the command and adds the item
+//! xset name command ... calls the command and adds the item
 //! to the session under the specified name (if not yet known)
 //!
 //! Thus, to a specific Norm or way of working, only Activators
diff --git a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SignCounter.hxx b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SignCounter.hxx
index 9eb1110b1d..2ef928996e 100644
--- a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SignCounter.hxx
+++ b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SignCounter.hxx
@@ -122,7 +122,8 @@ public:
 
   //! Changes the mode of working with the selection :
   //! -1 just clears optimisation data and nothing else
-  //! 0 clears it   1 inhibits it for computing (but no clearing)
+  //! 0 clears it
+  //! 1 inhibits it for computing (but no clearing)
   //! 2 sets it active for computing
   //! Default at creation is 0, after SetSelection (not null) is 2
   Standard_EXPORT void SetSelMode(const Standard_Integer selmode);
diff --git a/src/DataExchange/TKXSBase/IFSelect/IFSelect_Signature.hxx b/src/DataExchange/TKXSBase/IFSelect/IFSelect_Signature.hxx
index 7b6401ab32..192dc8df40 100644
--- a/src/DataExchange/TKXSBase/IFSelect/IFSelect_Signature.hxx
+++ b/src/DataExchange/TKXSBase/IFSelect/IFSelect_Signature.hxx
@@ -64,7 +64,7 @@ public:
 
   //! Returns the predefined list of possible cases, filled by AddCase
   //! Null Handle if no predefined list (hence, to be counted)
-  //! Useful to filter on  really possible vase, for instance, or
+  //! Useful to filter on really possible vase, for instance, or
   //! for a help
   Standard_EXPORT Handle(TColStd_HSequenceOfAsciiString) CaseList() const;
 
diff --git a/src/DataExchange/TKXSBase/IFSelect/IFSelect_TransformStandard.hxx b/src/DataExchange/TKXSBase/IFSelect/IFSelect_TransformStandard.hxx
index 525458a753..e750d49b86 100644
--- a/src/DataExchange/TKXSBase/IFSelect/IFSelect_TransformStandard.hxx
+++ b/src/DataExchange/TKXSBase/IFSelect/IFSelect_TransformStandard.hxx
@@ -70,7 +70,7 @@ public:
   Standard_EXPORT IFSelect_TransformStandard();
 
   //! Sets the Copy option to a new value :
-  //! - True for StandardCopy  - False for OnTheSpot
+  //! True for StandardCopy. False for OnTheSpot
   Standard_EXPORT void SetCopyOption(const Standard_Boolean option);
 
   //! Returns the Copy option
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_Category.hxx b/src/DataExchange/TKXSBase/Interface/Interface_Category.hxx
index e50d0aee1c..b51ffc6e22 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_Category.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_Category.hxx
@@ -42,10 +42,10 @@ class Interface_InterfaceModel;
 //! Drawing (Drawing, Views, Annotations, Pictures, Sketches ...)
 //! Structure (Component & Part, Groups & Patterns ...)
 //! Description (Meta-Data : Relations, Properties, Product ...)
-//! Auxiliary   (those which do not enter in the above list)
+//! Auxiliary (those which do not enter in the above list)
 //! and some dedicated categories
-//! FEA , Kinematics , Piping , etc...
-//! plus Professional  for other dedicated non-classed categories
+//! FEA, Kinematics, Piping, etc...
+//! plus Professional for other dedicated non-classed categories
 //!
 //! In addition, this class provides a way to compute then quickly
 //! query category numbers for an entire model.
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_CheckIterator.hxx b/src/DataExchange/TKXSBase/Interface/Interface_CheckIterator.hxx
index 8bc691f386..c4d2a89185 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_CheckIterator.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_CheckIterator.hxx
@@ -111,7 +111,7 @@ public:
   Standard_EXPORT Interface_CheckStatus Status() const;
 
   //! Tells if this check list complies with a given status :
-  //! OK (i.e. empty),  Warning (at least one Warning, but no Fail),
+  //! OK (i.e. empty), Warning (at least one Warning, but no Fail),
   //! Fail (at least one), Message (not OK), NoFail, Any
   Standard_EXPORT Standard_Boolean Complies(const Interface_CheckStatus status) const;
 
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_EntityIterator.hxx b/src/DataExchange/TKXSBase/Interface/Interface_EntityIterator.hxx
index 022744eddc..d7663bfb85 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_EntityIterator.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_EntityIterator.hxx
@@ -50,7 +50,7 @@ public:
   //! same as AddItem (kept for compatibility)
   Standard_EXPORT void GetOneItem(const Handle(Standard_Transient)& anentity);
 
-  //! Selects entities with are Kind of a given type,  keep only
+  //! Selects entities with are Kind of a given type, keep only
   //! them (is keep is True) or reject only them (if keep is False)
   Standard_EXPORT void SelectType(const Handle(Standard_Type)& atype, const Standard_Boolean keep);
 
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_FloatWriter.hxx b/src/DataExchange/TKXSBase/Interface/Interface_FloatWriter.hxx
index aa838b15c9..a041a9ae4c 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_FloatWriter.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_FloatWriter.hxx
@@ -36,7 +36,7 @@ class Interface_FloatWriter
 public:
   DEFINE_STANDARD_ALLOC
 
-  //! Creates a FloatWriter ready to work, with default options  -
+  //! Creates a FloatWriter ready to work, with default options
   //! - zero suppress option is set
   //! - main format is set to "%E"
   //! - secondary format is set to "%f" for values between 0.1 and
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_GeneralModule.hxx b/src/DataExchange/TKXSBase/Interface/Interface_GeneralModule.hxx
index cda56b11a1..7bb1297eca 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_GeneralModule.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_GeneralModule.hxx
@@ -37,7 +37,7 @@ DEFINE_STANDARD_HANDLE(Interface_GeneralModule, Standard_Transient)
 //! by an Interface) : Shared List, Check, Copy, Delete, Category
 //!
 //! To optimise processing (e.g. firstly bind an Entity to a Module
-//! then calls  Module), each recognized Entity Type corresponds
+//! then calls Module), each recognized Entity Type corresponds
 //! to a Case Number, determined by the Protocol each class of
 //! GeneralModule belongs to.
 class Interface_GeneralModule : public Standard_Transient
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_Graph.hxx b/src/DataExchange/TKXSBase/Interface/Interface_Graph.hxx
index 0adbeab939..633abbf7ec 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_Graph.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_Graph.hxx
@@ -123,7 +123,7 @@ public:
 
   //! Same as above but directly on an Entity <ent> : if it is not
   //! contained in the Model, returns False. Else calls
-  //! IsPresent(num)  with <num> given by EntityNumber
+  //! IsPresent(num) with <num> given by EntityNumber
   Standard_EXPORT Standard_Boolean IsPresent(const Handle(Standard_Transient)& ent) const;
 
   //! Returns mapped Entity given its no (if it is present)
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_InterfaceModel.hxx b/src/DataExchange/TKXSBase/Interface/Interface_InterfaceModel.hxx
index e5ced837a0..eeca095f27 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_InterfaceModel.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_InterfaceModel.hxx
@@ -118,9 +118,9 @@ public:
 
   //! Returns the Number of an Entity in the Model if it contains it.
   //! Else returns 0. For a ReportEntity, looks at Concerned Entity.
-  //! Returns the Directory entry   Number of  an Entity in
-  //! the  Model if it contains it.   Else returns  0.  For a
-  //! ReportEntity, looks at Concerned Entity.
+  //! Returns the Directory entry Number of an Entity in
+  //! the Model if it contains it. Else returns 0.
+  //! For a ReportEntity, looks at Concerned Entity.
   Standard_EXPORT Standard_Integer Number(const Handle(Standard_Transient)& anentity) const;
 
   //! Returns an Entity identified by its number in the Model
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_MSG.hxx b/src/DataExchange/TKXSBase/Interface/Interface_MSG.hxx
index 8e44e7d63b..9fa16414ab 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_MSG.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_MSG.hxx
@@ -52,7 +52,7 @@ public:
   //! with operator () attached to Value
   //! Then, to have a translated message, write in C++ :
   //!
-  //! Interface_MSG("...mykey...")  which returns a CString
+  //! Interface_MSG("...mykey...") which returns a CString
   //! See also some help which follow
   Standard_EXPORT Interface_MSG(const Standard_CString key);
 
@@ -62,14 +62,14 @@ public:
   //! then  AddFail(mess);
   //! replaced by  AddFail (Interface_MSG("code",ival));
   //!
-  //! The basic message is intended to be in  C-Sprintf  format,
+  //! The basic message is intended to be in C-Sprintf format,
   //! with one %d form in it
   Standard_EXPORT Interface_MSG(const Standard_CString key, const Standard_Integer i1);
 
   //! Translates a message which contains two integer variables
   //! As for one integer, it is just a writing help
   //!
-  //! The basic message is intended to be in  C-Sprintf  format
+  //! The basic message is intended to be in C-Sprintf format
   //! with two %d forms in it
   Standard_EXPORT Interface_MSG(const Standard_CString key,
                                 const Standard_Integer i1,
@@ -80,7 +80,7 @@ public:
   //! interval (see below, method Intervals)
   //! As for one integer, it is just a writing help
   //!
-  //! The basic message is intended to be in  C-Sprintf  format
+  //! The basic message is intended to be in C-Sprintf format
   //! with one %f form (or equivalent : %e etc) in it
   Standard_EXPORT Interface_MSG(const Standard_CString key,
                                 const Standard_Real    r1,
@@ -89,7 +89,7 @@ public:
   //! Translates a message which contains one string variable
   //! As for one integer, it is just a writing help
   //!
-  //! The basic message is intended to be in  C-Sprintf  format
+  //! The basic message is intended to be in C-Sprintf format
   //! with one %s form in it
   Standard_EXPORT Interface_MSG(const Standard_CString key, const Standard_CString str);
 
@@ -98,7 +98,7 @@ public:
   //! As for one integer, it is just a writing help
   //! Used for instance to say "Param n0.<ival> i.e. <str> is not.."
   //!
-  //! The basic message is intended to be in  C-Sprintf  format
+  //! The basic message is intended to be in C-Sprintf format
   //! with one %d then one %s forms in it
   Standard_EXPORT Interface_MSG(const Standard_CString key,
                                 const Standard_Integer ival,
@@ -184,9 +184,9 @@ public:
                                                    const Standard_Boolean upper = Standard_False);
 
   //! Codes a date as a text, from its numeric value (-> seconds) :
-  //! YYYY-MM-DD:HH-MN-SS  fixed format, completed by leading zeros
+  //! YYYY-MM-DD:HH-MN-SS fixed format, completed by leading zeros
   //! Another format can be provided, as follows :
-  //! C:%d ...   C like format, preceded by  C:
+  //! C:%d ...   C like format, preceded by C:
   //! S:...      format to call system (not yet implemented)
   Standard_EXPORT static void TDate(const Standard_CString text,
                                     const Standard_Integer yy,
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_ParamList.hxx b/src/DataExchange/TKXSBase/Interface/Interface_ParamList.hxx
index 73f65d5ad4..aaae4f2f2c 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_ParamList.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_ParamList.hxx
@@ -47,7 +47,7 @@ public:
   //! Assigns the value <Value> to the <Index>-th item of this array.
   Standard_EXPORT void SetValue(const Standard_Integer Index, const Interface_FileParameter& Value);
 
-  //! Return the value of  the  <Index>th element of the
+  //! Return the value of the <Index>th element of the
   //! array.
   Standard_EXPORT const Interface_FileParameter& Value(const Standard_Integer Index) const;
 
@@ -56,7 +56,7 @@ public:
     return Value(Index);
   }
 
-  //! return the value  of the <Index>th element  of the
+  //! return the value of the <Index>th element of the
   //! array.
   Standard_EXPORT Interface_FileParameter& ChangeValue(const Standard_Integer Index);
 
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_Static.hxx b/src/DataExchange/TKXSBase/Interface/Interface_Static.hxx
index 772c0795eb..0a46696922 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_Static.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_Static.hxx
@@ -83,7 +83,7 @@ public:
   //! - Name
   //! - Family,
   //! - Wildcard (if it has one)
-  //! - Current status (empty  string if it was updated or
+  //! - Current status (empty string if it was updated or
   //! if it is the original one)
   //! - Value
   Standard_EXPORT void PrintStatic(Standard_OStream& S) const;
diff --git a/src/DataExchange/TKXSBase/MoniTool/MoniTool_CaseData.hxx b/src/DataExchange/TKXSBase/MoniTool/MoniTool_CaseData.hxx
index d1490249f6..d5ac77f5f7 100644
--- a/src/DataExchange/TKXSBase/MoniTool/MoniTool_CaseData.hxx
+++ b/src/DataExchange/TKXSBase/MoniTool/MoniTool_CaseData.hxx
@@ -143,7 +143,7 @@ public:
                                 const Standard_CString name = "");
 
   //! Adds the CPU time between lastCPU and now
-  //! if <curCPU> is given, the CPU amount is  curCPU-lastCPU
+  //! if <curCPU> is given, the CPU amount is curCPU-lastCPU
   //! else it is currently measured CPU - lastCPU
   //! lastCPU has been read by call to GetCPU
   //! See GetCPU to get amount, and LargeCPU to test large amount
diff --git a/src/DataExchange/TKXSBase/MoniTool/MoniTool_TransientElem.hxx b/src/DataExchange/TKXSBase/MoniTool/MoniTool_TransientElem.hxx
index 2d8b2b450c..81ae71a363 100644
--- a/src/DataExchange/TKXSBase/MoniTool/MoniTool_TransientElem.hxx
+++ b/src/DataExchange/TKXSBase/MoniTool/MoniTool_TransientElem.hxx
@@ -32,7 +32,7 @@ DEFINE_STANDARD_HANDLE(MoniTool_TransientElem, MoniTool_Element)
 //!
 //! Transient from Standard defines the class to be keyed
 //! MapTransientHasher from TColStd is the associated Hasher
-//! DataInfo from MoniTool   is an additional class which helps to provide
+//! DataInfo from MoniTool is an additional class which helps to provide
 //! information on the value (template : see DataInfo)
 class MoniTool_TransientElem : public MoniTool_Element
 {
diff --git a/src/DataExchange/TKXSBase/MoniTool/MoniTool_TypedValue.hxx b/src/DataExchange/TKXSBase/MoniTool/MoniTool_TypedValue.hxx
index 9e9894bcf8..6311ee3800 100644
--- a/src/DataExchange/TKXSBase/MoniTool/MoniTool_TypedValue.hxx
+++ b/src/DataExchange/TKXSBase/MoniTool/MoniTool_TypedValue.hxx
@@ -151,7 +151,7 @@ public:
   //! For an enumeration, precises the starting value (default 0)
   //! and the match condition : if True (D), the string value must
   //! match the definition, else it may take another value : in that
-  //! case, the Integer Value will be  Start - 1.
+  //! case, the Integer Value will be Start - 1.
   //! (empty value remains allowed)
   Standard_EXPORT void StartEnum(const Standard_Integer start = 0,
                                  const Standard_Boolean match = Standard_True);
diff --git a/src/DataExchange/TKXSBase/Transfer/Transfer_FindHasher.hxx b/src/DataExchange/TKXSBase/Transfer/Transfer_FindHasher.hxx
index dae6196adb..5c038619a7 100644
--- a/src/DataExchange/TKXSBase/Transfer/Transfer_FindHasher.hxx
+++ b/src/DataExchange/TKXSBase/Transfer/Transfer_FindHasher.hxx
@@ -23,7 +23,7 @@
 #include <Standard_Handle.hxx>
 
 //! FindHasher defines HashCode for Finder, which is : ask a
-//! Finder its HashCode !  Because this is the Finder itself which
+//! Finder its HashCode! Because this is the Finder itself which
 //! brings the HashCode for its Key
 //!
 //! This class complies to the template given in TCollection by
diff --git a/src/DataExchange/TKXSBase/XSControl/XSControl_Controller.hxx b/src/DataExchange/TKXSBase/XSControl/XSControl_Controller.hxx
index 6d93ba12dc..589377891e 100644
--- a/src/DataExchange/TKXSBase/XSControl/XSControl_Controller.hxx
+++ b/src/DataExchange/TKXSBase/XSControl/XSControl_Controller.hxx
@@ -98,7 +98,7 @@ public:
   // szv:{ return mySignType; }
 
   //! Returns the WorkLibrary attached to the Norm. Remark that it
-  //! has to be in phase with the Protocol  (read from field)
+  //! has to be in phase with the Protocol (read from field)
   const Handle(IFSelect_WorkLibrary)& WorkLibrary() const { return myAdaptorLibrary; }
 
   //! Creates a new empty Model ready to receive data of the Norm
@@ -220,7 +220,7 @@ public:
 
 protected:
   //! Initializing with names
-  //! <theLongName>  is for the complete, official, long  name
+  //! <theLongName>  is for the complete, official, long name
   //! <theShortName> is for the short name used for resources
   Standard_EXPORT XSControl_Controller(const Standard_CString theLongName,
                                        const Standard_CString theShortName);
diff --git a/src/DataExchange/TKXSBase/XSControl/XSControl_WorkSession.hxx b/src/DataExchange/TKXSBase/XSControl/XSControl_WorkSession.hxx
index a992d784d4..42b8a0416c 100644
--- a/src/DataExchange/TKXSBase/XSControl/XSControl_WorkSession.hxx
+++ b/src/DataExchange/TKXSBase/XSControl/XSControl_WorkSession.hxx
@@ -100,7 +100,8 @@ public:
                                                        Standard_OStream&      theS) const;
 
   //! Sets a Transfer Reader, by internal ways, according mode :
-  //! 0 recreates it clear,  1 clears it (does not recreate)
+  //! 0 recreates it clear
+  //! 1 clears it (does not recreate)
   //! 2 aligns Roots of TransientProcess from final Results
   //! 3 aligns final Results from Roots of TransientProcess
   //! 4 begins a new transfer (by BeginTransfer)
diff --git a/src/DataExchange/TKXmlXCAF/XmlXCAFDrivers/XmlXCAFDrivers.hxx b/src/DataExchange/TKXmlXCAF/XmlXCAFDrivers/XmlXCAFDrivers.hxx
index 08bea15d96..a6f13a3fa3 100644
--- a/src/DataExchange/TKXmlXCAF/XmlXCAFDrivers/XmlXCAFDrivers.hxx
+++ b/src/DataExchange/TKXmlXCAF/XmlXCAFDrivers/XmlXCAFDrivers.hxx
@@ -25,7 +25,7 @@ class TDocStd_Application;
 class XmlXCAFDrivers
 {
 public:
-  //! Depending from the  ID, returns a list of  storage
+  //! Depending from the ID, returns a list of storage
   //! or retrieval attribute drivers. Used for plugin.
   //!
   //! Standard data model drivers
diff --git a/src/DataExchange/TKXmlXCAF/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.hxx b/src/DataExchange/TKXmlXCAF/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.hxx
index 84169e99e1..8ef1bc08e6 100644
--- a/src/DataExchange/TKXmlXCAF/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.hxx
+++ b/src/DataExchange/TKXmlXCAF/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.hxx
@@ -27,7 +27,7 @@ class Message_Messenger;
 class XmlXCAFDrivers_DocumentStorageDriver;
 DEFINE_STANDARD_HANDLE(XmlXCAFDrivers_DocumentStorageDriver, XmlDrivers_DocumentStorageDriver)
 
-//! storage driver of a  XS document
+//! storage driver of a XS document
 class XmlXCAFDrivers_DocumentStorageDriver : public XmlDrivers_DocumentStorageDriver
 {
 
diff --git a/src/Draw/TKDCAF/DDF/DDF.hxx b/src/Draw/TKDCAF/DDF/DDF.hxx
index c4af0fb892..bb37aa7988 100644
--- a/src/Draw/TKDCAF/DDF/DDF.hxx
+++ b/src/Draw/TKDCAF/DDF/DDF.hxx
@@ -34,15 +34,15 @@ class DDF
 public:
   DEFINE_STANDARD_ALLOC
 
-  //! Search in draw  directory the framewok  identified
+  //! Search in draw directory the framewok identified
   //! by its name <Name>. returns True if found. In that
   //! case <DF> is set.
   Standard_EXPORT static Standard_Boolean GetDF(Standard_CString&      Name,
                                                 Handle(TDF_Data)&      DF,
                                                 const Standard_Boolean Complain = Standard_True);
 
-  //! Search in <DF>  the label identified by its  entry
-  //! <Entry>.  returns  <True> if  found. In  that case
+  //! Search in <DF> the label identified by its entry
+  //! <Entry>. returns <True> if found. In that case
   //! <Label> is set.
   Standard_EXPORT static Standard_Boolean FindLabel(
     const Handle(TDF_Data)& DF,
@@ -50,15 +50,15 @@ public:
     TDF_Label&              Label,
     const Standard_Boolean  Complain = Standard_True);
 
-  //! Search in <DF> the  label identified by its entry
-  //! <Entry>.   if label doesn't  exist, create  and add
+  //! Search in <DF> the label identified by its entry
+  //! <Entry>. if label doesn't exist, create and add
   //! the Label in <DF>. In that case return True.
   Standard_EXPORT static Standard_Boolean AddLabel(const Handle(TDF_Data)& DF,
                                                    const Standard_CString  Entry,
                                                    TDF_Label&              Label);
 
-  //! Search   in <DF> the  attribute  identified by its
-  //! <ID> and its <entry>.  returns <True> if found. In
+  //! Search in <DF> the attribute identified by its
+  //! <ID> and its <entry>. returns <True> if found. In
   //! that case A is set.
   Standard_EXPORT static Standard_Boolean Find(const Handle(TDF_Data)& DF,
                                                const Standard_CString  Entry,
diff --git a/src/Draw/TKDCAF/DDataStd/DDataStd.hxx b/src/Draw/TKDCAF/DDataStd/DDataStd.hxx
index 9464b9cbef..203192b7a8 100644
--- a/src/Draw/TKDCAF/DDataStd/DDataStd.hxx
+++ b/src/Draw/TKDCAF/DDataStd/DDataStd.hxx
@@ -41,13 +41,13 @@ public:
   //! to set and get NamedShape
   Standard_EXPORT static void NamedShapeCommands(Draw_Interpretor& I);
 
-  //! to set and get Integer, Real,  Reference, Geometry
+  //! to set and get Integer, Real, Reference, Geometry
   Standard_EXPORT static void BasicCommands(Draw_Interpretor& I);
 
   //! to set and get Datum attributes
   Standard_EXPORT static void DatumCommands(Draw_Interpretor& I);
 
-  //! to set and get Constraint and Constraint  attributes
+  //! to set and get Constraint and Constraint attributes
   Standard_EXPORT static void ConstraintCommands(Draw_Interpretor& I);
 
   //! to set and get Objects attributes
diff --git a/src/Draw/TKDCAF/DDataStd/DDataStd_TreeBrowser.hxx b/src/Draw/TKDCAF/DDataStd/DDataStd_TreeBrowser.hxx
index 1cb7a8a898..cbfe1c525c 100644
--- a/src/Draw/TKDCAF/DDataStd/DDataStd_TreeBrowser.hxx
+++ b/src/Draw/TKDCAF/DDataStd/DDataStd_TreeBrowser.hxx
@@ -51,11 +51,11 @@ public:
 
   Standard_EXPORT TDF_Label Label() const;
 
-  //! Returns   a   string composed with  the   TreeNode  of
+  //! Returns a string composed with the TreeNode of
   //! <myLabel>.
   Standard_EXPORT TCollection_AsciiString OpenRoot() const;
 
-  //! Returns a string composed   with the sub-TreeNodes of
+  //! Returns a string composed with the sub-TreeNodes of
   //! <L>
   Standard_EXPORT TCollection_AsciiString OpenNode(const TDF_Label& L) const;
 
diff --git a/src/Draw/TKDCAF/DDocStd/DDocStd.hxx b/src/Draw/TKDCAF/DDocStd/DDocStd.hxx
index 4ad8cbcd4b..5930a6fc12 100644
--- a/src/Draw/TKDCAF/DDocStd/DDocStd.hxx
+++ b/src/Draw/TKDCAF/DDocStd/DDocStd.hxx
@@ -28,7 +28,7 @@ class TDF_Label;
 class Standard_GUID;
 class TDF_Attribute;
 
-//! This package   provides Draw services to test  CAF
+//! This package provides Draw services to test CAF
 //! standard documents (see TDocStd package)
 //!
 //! It provides :
diff --git a/src/Draw/TKDCAF/DNaming/DNaming.hxx b/src/Draw/TKDCAF/DNaming/DNaming.hxx
index c3917cb75b..ededb433f9 100644
--- a/src/Draw/TKDCAF/DNaming/DNaming.hxx
+++ b/src/Draw/TKDCAF/DNaming/DNaming.hxx
@@ -150,7 +150,7 @@ public:
   //! commands relatives to Naming
   Standard_EXPORT static void SelectionCommands(Draw_Interpretor& DI);
 
-  //! commands for  testing Naming
+  //! commands for testing Naming
   Standard_EXPORT static void ModelingCommands(Draw_Interpretor& DI);
 };
 
diff --git a/src/Draw/TKDCAF/DNaming/DNaming_BooleanOperationDriver.hxx b/src/Draw/TKDCAF/DNaming/DNaming_BooleanOperationDriver.hxx
index 27810b09d3..8abb8d2ab9 100644
--- a/src/Draw/TKDCAF/DNaming/DNaming_BooleanOperationDriver.hxx
+++ b/src/Draw/TKDCAF/DNaming/DNaming_BooleanOperationDriver.hxx
@@ -29,7 +29,7 @@ class TFunction_Function;
 class DNaming_BooleanOperationDriver;
 DEFINE_STANDARD_HANDLE(DNaming_BooleanOperationDriver, TFunction_Driver)
 
-//! Driver  for Fuse,  Cut,  Common
+//! Driver for Fuse, Cut, Common
 class DNaming_BooleanOperationDriver : public TFunction_Driver
 {
 
diff --git a/src/Draw/TKDCAF/DNaming/DNaming_PointDriver.hxx b/src/Draw/TKDCAF/DNaming/DNaming_PointDriver.hxx
index d29acd4088..6a7b690860 100644
--- a/src/Draw/TKDCAF/DNaming/DNaming_PointDriver.hxx
+++ b/src/Draw/TKDCAF/DNaming/DNaming_PointDriver.hxx
@@ -26,7 +26,7 @@ class TFunction_Logbook;
 class DNaming_PointDriver;
 DEFINE_STANDARD_HANDLE(DNaming_PointDriver, TFunction_Driver)
 
-//! Driver for PointXYZ  and  RelativePoint
+//! Driver for PointXYZ and RelativePoint
 class DNaming_PointDriver : public TFunction_Driver
 {
 
diff --git a/src/Draw/TKDCAF/DPrsStd/DPrsStd.hxx b/src/Draw/TKDCAF/DPrsStd/DPrsStd.hxx
index 95f1a9b926..490c69de6e 100644
--- a/src/Draw/TKDCAF/DPrsStd/DPrsStd.hxx
+++ b/src/Draw/TKDCAF/DPrsStd/DPrsStd.hxx
@@ -43,7 +43,7 @@ public:
   //! set/get position attribute
   Standard_EXPORT static void BasicCommands(Draw_Interpretor& I);
 
-  //! Loads all Draw commands of  TKDCAF. Used for plugin.
+  //! Loads all Draw commands of TKDCAF. Used for plugin.
   Standard_EXPORT static void Factory(Draw_Interpretor& theDI);
 
 protected:
diff --git a/src/Draw/TKDCAF/DrawDim/DrawDim.hxx b/src/Draw/TKDCAF/DrawDim/DrawDim.hxx
index 280041d3b6..b59688f973 100644
--- a/src/Draw/TKDCAF/DrawDim/DrawDim.hxx
+++ b/src/Draw/TKDCAF/DrawDim/DrawDim.hxx
@@ -35,11 +35,11 @@ class gp_Pln;
 //! This package provides Drawable Dimensions.
 //!
 //! The classes PlanarDimension and subclasses provide
-//! services  to  build  drawable dimensions between
+//! services to build drawable dimensions between
 //! point line and circle in a given 3d plane.
 //!
-//! The   classes  Dimension and   subclasses provide
-//! services  to build  drawable  dimensions between
+//! The classes Dimension and subclasses provide
+//! services to build drawable dimensions between
 //! plane and cylindrical surfaces.
 class DrawDim
 {
diff --git a/src/Draw/TKDraw/DBRep/DBRep.hxx b/src/Draw/TKDraw/DBRep/DBRep.hxx
index 2d6c16402c..3965826a30 100644
--- a/src/Draw/TKDraw/DBRep/DBRep.hxx
+++ b/src/Draw/TKDraw/DBRep/DBRep.hxx
@@ -21,7 +21,7 @@
 #include <Draw_Interpretor.hxx>
 #include <TopoDS_Shape.hxx>
 
-//! Used to display BRep objects  using the DrawTrSurf
+//! Used to display BRep objects using the DrawTrSurf
 //! package.
 //! The DrawableShape is a Display object build from a
 //! Shape.
diff --git a/src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx b/src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx
index 610a538e53..d136372d13 100644
--- a/src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx
+++ b/src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx
@@ -32,7 +32,7 @@ class Draw_Display;
 class Poly_Triangulation;
 class gp_Trsf;
 
-//! Drawable structure to display a  shape. Contains a
+//! Drawable structure to display a shape. Contains a
 //! list of edges and a list of faces.
 class DBRep_DrawableShape : public Draw_Drawable3D
 {
diff --git a/src/Draw/TKDraw/DBRep/DBRep_HideData.hxx b/src/Draw/TKDraw/DBRep/DBRep_HideData.hxx
index a56d61f95e..070b02dda8 100644
--- a/src/Draw/TKDraw/DBRep/DBRep_HideData.hxx
+++ b/src/Draw/TKDraw/DBRep/DBRep_HideData.hxx
@@ -28,7 +28,7 @@
 class Draw_Display;
 class Draw_Color;
 
-//! This  class stores all the information  concerning
+//! This class stores all the information concerning
 //! hidden lines on a view.
 //!
 //! * View number
@@ -36,9 +36,9 @@ class Draw_Color;
 //! * Type of projection, focal
 //! * Arrays of 3d points
 //!
-//! A drawable shape contains a  list of such  objects
-//! to store  the  hidden lines  for  each view.   The
-//! IsSame method is  used  to check if   hidden lines
+//! A drawable shape contains a list of such objects
+//! to store the hidden lines for each view. The
+//! IsSame method is used to check if hidden lines
 //! must be recompiled.
 class DBRep_HideData
 {
diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf.hxx
index c60a78a8b7..a30b11ebb7 100644
--- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf.hxx
+++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf.hxx
@@ -35,13 +35,13 @@ struct DrawTrSurf_Params;
 
 //! This package supports the display of parametric curves and surfaces.
 //!
-//! The  Drawable deferred  classes is  inherited from
-//! the Drawable3D  class  from  the package Draw,  it
-//! adds methods to  draw 3D Curves  and  Curves on 3D
+//! The Drawable deferred classes is inherited from
+//! the Drawable3D class from the package Draw, it
+//! adds methods to draw 3D Curves and Curves on 3D
 //! Surfaces.
 //!
 //! The classes Curve Curve2d and Surface are drawable
-//! and  can be  used  to  draw a   single  curve from
+//! and can be used to draw a single curve from
 //! packages Geom or Geom2d or a surface from Geom.
 //!
 //! The Triangulation and Polygon from the package Poly are also supported.
@@ -50,15 +50,15 @@ class DrawTrSurf
 public:
   DEFINE_STANDARD_ALLOC
 
-  //! Sets <G> in the variable <Name>.  Overwrite the
+  //! Sets <G> in the variable <Name>. Overwrite the
   //! variable if already set.
   Standard_EXPORT static void Set(const Standard_CString Name, const gp_Pnt& G);
 
-  //! Sets <G> in the variable <Name>.  Overwrite the
+  //! Sets <G> in the variable <Name>. Overwrite the
   //! variable if already set.
   Standard_EXPORT static void Set(const Standard_CString Name, const gp_Pnt2d& G);
 
-  //! Sets <G> in the variable <Name>.  Overwrite the
+  //! Sets <G> in the variable <Name>. Overwrite the
   //! variable if already set.
   //! isSenseMarker indicates whether to render the
   //! sense glyph (arrow) for curves or not
@@ -75,7 +75,7 @@ public:
     Set(Name, (const Handle(Geom_Geometry)&)Arg);
   }
 
-  //! Sets <C> in the variable <Name>.  Overwrite the
+  //! Sets <C> in the variable <Name>. Overwrite the
   //! variable if already set.
   //! isSenseMarker indicates whether to render the
   //! sense glyph (arrow) for curves or not
@@ -92,20 +92,19 @@ public:
     Set(Name, (const Handle(Geom2d_Curve)&)Arg);
   }
 
-  //! Sets <T> in the variable <Name>.  Overwrite the
+  //! Sets <T> in the variable <Name>. Overwrite the
   //! variable if already set.
   Standard_EXPORT static void Set(const Standard_CString Name, const Handle(Poly_Triangulation)& T);
 
-  //! Sets <P> in the variable <Name>.  Overwrite the
+  //! Sets <P> in the variable <Name>. Overwrite the
   //! variable if already set.
   Standard_EXPORT static void Set(const Standard_CString Name, const Handle(Poly_Polygon3D)& P);
 
-  //! Sets <P> in the variable <Name>.  Overwrite the
+  //! Sets <P> in the variable <Name>. Overwrite the
   //! variable if already set.
   Standard_EXPORT static void Set(const Standard_CString Name, const Handle(Poly_Polygon2D)& P);
-
-  //! Get  the variable <S>.  Returns a  null  handle if
-  //! none, and print a warning message.
+  //! Getthe variable <S>. Returns a null handle if
+  //!  none, and print a warning message.
   Standard_EXPORT static Handle(Geom_Geometry) Get(Standard_CString& Name);
 
   //! Gets the variable. Returns False if none and print
@@ -116,51 +115,51 @@ public:
   //! a warning message.
   Standard_EXPORT static Standard_Boolean GetPoint2d(Standard_CString& Name, gp_Pnt2d& P);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom_Curve) GetCurve(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom_BezierCurve) GetBezierCurve(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom_BSplineCurve) GetBSplineCurve(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom2d_Curve) GetCurve2d(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom2d_BezierCurve) GetBezierCurve2d(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom2d_BSplineCurve) GetBSplineCurve2d(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom_Surface) GetSurface(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom_BezierSurface) GetBezierSurface(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Geom_BSplineSurface) GetBSplineSurface(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Poly_Triangulation) GetTriangulation(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Poly_Polygon3D) GetPolygon3D(Standard_CString& Name);
 
-  //! Get  the variable <S>.  Returns a  null  handle if
+  //! Get the variable <S>. Returns a null handle if
   //! none, and print a warning message.
   Standard_EXPORT static Handle(Poly_Polygon2D) GetPolygon2D(Standard_CString& Name);
 
diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx
index 5194ca2887..9c998f899b 100644
--- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx
+++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx
@@ -67,10 +67,10 @@ public:
 
   void ClearKnots() { drawKnots = Standard_False; }
 
-  //! Returns in <Index> the index of the first pole  of the
+  //! Returns in <Index> the index of the first pole of the
   //! curve projected by the Display <D> at a distance lower
-  //! than <Prec> from <X,Y>. If no pole  is found  index is
-  //! set to 0, else index is always  greater than the input
+  //! than <Prec> from <X,Y>. If no pole is found index is
+  //! set to 0, else index is always greater than the input
   //! value of index.
   Standard_EXPORT void FindPole(const Standard_Real X,
                                 const Standard_Real Y,
diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx
index 8ea41bbb52..6e2e2e98d7 100644
--- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx
+++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx
@@ -53,10 +53,10 @@ public:
 
   void ClearKnots() { drawKnots = Standard_False; }
 
-  //! Returns in <Index> the index of the first pole  of the
+  //! Returns in <Index> the index of the first pole of the
   //! curve projected by the Display <D> at a distance lower
-  //! than <Prec> from <X,Y>. If no pole  is found  index is
-  //! set to 0, else index is always  greater than the input
+  //! than <Prec> from <X,Y>. If no pole is found index is
+  //! set to 0, else index is always greater than the input
   //! value of index.
   Standard_EXPORT void FindPole(const Standard_Real X,
                                 const Standard_Real Y,
diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve.hxx
index 96af82cb4e..ed4185bf23 100644
--- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve.hxx
+++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve.hxx
@@ -46,10 +46,10 @@ public:
 
   void ClearPoles() { drawPoles = Standard_False; }
 
-  //! Returns in <Index> the index of the first pole  of the
+  //! Returns in <Index> the index of the first pole of the
   //! curve projected by the Display <D> at a distance lower
-  //! than <Prec> from <X,Y>. If no pole  is found  index is
-  //! set to 0, else index is always  greater than the input
+  //! than <Prec> from <X,Y>. If no pole is found index is
+  //! set to 0, else index is always greater than the input
   //! value of index.
   Standard_EXPORT void FindPole(const Standard_Real X,
                                 const Standard_Real Y,
diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx
index a96dcf7ea3..ebadcede99 100644
--- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx
+++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx
@@ -44,10 +44,10 @@ public:
 
   void ClearPoles() { drawPoles = Standard_False; }
 
-  //! Returns in <Index> the index of the first pole  of the
+  //! Returns in <Index> the index of the first pole of the
   //! curve projected by the Display <D> at a distance lower
-  //! than <Prec> from <X,Y>. If no pole  is found  index is
-  //! set to 0, else index is always  greater than the input
+  //! than <Prec> from <X,Y>. If no pole is found index is
+  //! set to 0, else index is always greater than the input
   //! value of index.
   Standard_EXPORT void FindPole(const Standard_Real X,
                                 const Standard_Real Y,
diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Drawable.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Drawable.hxx
index faa38f893f..42f5bb0dad 100644
--- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Drawable.hxx
+++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Drawable.hxx
@@ -26,10 +26,10 @@ class Adaptor3d_IsoCurve;
 
 DEFINE_STANDARD_HANDLE(DrawTrSurf_Drawable, Draw_Drawable3D)
 
-//! this  class adds   to   the Drawable3D methods  to
+//! this class adds to the Drawable3D methods to
 //! display Curves and Curves on Surface.
 //!
-//! The discretisation,  number  of points on a Curve,
+//! The discretisation, number of points on a Curve,
 //! is stored in this class.
 class DrawTrSurf_Drawable : public Draw_Drawable3D
 {
@@ -41,7 +41,7 @@ public:
   //! Draw a polygon of the curve on the Display
   Standard_EXPORT void DrawCurveOn(Adaptor3d_Curve& C, Draw_Display& D) const;
 
-  //! Load C  with the specified iso  and Draw a polygon
+  //! Load C with the specified iso  and Draw a polygon
   //! of the curve on the Display
   Standard_EXPORT void DrawIsoCurveOn(Adaptor3d_IsoCurve&   C,
                                       const GeomAbs_IsoType T,
diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon3D.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon3D.hxx
index f30b26b009..3f6c1d4f5b 100644
--- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon3D.hxx
+++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon3D.hxx
@@ -50,7 +50,7 @@ public:
   //! Save drawable into stream.
   Standard_EXPORT virtual void Save(Standard_OStream& theStream) const Standard_OVERRIDE;
 
-  //! For variable whatis command. Set  as a result  the
+  //! For variable whatis command. Set as a result the
   //! type of the variable.
   Standard_EXPORT virtual void Whatis(Draw_Interpretor& I) const Standard_OVERRIDE;
 
diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
index 8c4c16e273..e62719c8a0 100644
--- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
+++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
@@ -51,7 +51,7 @@ public:
   //! For variable dump.
   Standard_EXPORT virtual void Dump(Standard_OStream& S) const Standard_OVERRIDE;
 
-  //! For variable whatis command. Set  as a result  the
+  //! For variable whatis command. Set as a result the
   //! type of the variable.
   Standard_EXPORT virtual void Whatis(Draw_Interpretor& I) const Standard_OVERRIDE;
 
diff --git a/src/Draw/TKQADraw/QADNaming/QADNaming.hxx b/src/Draw/TKQADraw/QADNaming/QADNaming.hxx
index 980290cbe4..88237cf33a 100644
--- a/src/Draw/TKQADraw/QADNaming/QADNaming.hxx
+++ b/src/Draw/TKQADraw/QADNaming/QADNaming.hxx
@@ -42,8 +42,8 @@ public:
                                        const Handle(TDF_Data)& Data,
                                        TopTools_ListOfShape&   Shapes);
 
-  //! theStatus = 0  Not  found,
-  //! theStatus = 1  One  shape,
+  //! theStatus = 0  Not found,
+  //! theStatus = 1  One shape,
   //! theStatus = 2  More than one shape.
   Standard_EXPORT static TCollection_AsciiString GetEntry(const TopoDS_Shape&     Shape,
                                                           const Handle(TDF_Data)& Data,
diff --git a/src/Draw/TKTObjDRAW/TObjDRAW/TObjDRAW.hxx b/src/Draw/TKTObjDRAW/TObjDRAW/TObjDRAW.hxx
index 33a0c7f214..e30b9789fd 100644
--- a/src/Draw/TKTObjDRAW/TObjDRAW/TObjDRAW.hxx
+++ b/src/Draw/TKTObjDRAW/TObjDRAW/TObjDRAW.hxx
@@ -30,7 +30,7 @@ public:
   //! Initializes all the functions
   Standard_EXPORT static void Init(Draw_Interpretor& di);
 
-  //! Loads all Draw commands of  TKTObjDRAW. Used for plugin.
+  //! Loads all Draw commands of TKTObjDRAW. Used for plugin.
   Standard_EXPORT static void Factory(Draw_Interpretor& theDI);
 
 protected:
diff --git a/src/Draw/TKTopTest/BRepTest/BRepTest.hxx b/src/Draw/TKTopTest/BRepTest/BRepTest.hxx
index 5ee71f036a..7459b592d6 100644
--- a/src/Draw/TKTopTest/BRepTest/BRepTest.hxx
+++ b/src/Draw/TKTopTest/BRepTest/BRepTest.hxx
@@ -38,8 +38,8 @@ public:
   //! Defines the commands to build edges and wires.
   Standard_EXPORT static void CurveCommands(Draw_Interpretor& DI);
 
-  //! Defines the  commands  to perform add  fillets on
-  //! wires and  edges.
+  //! Defines the commands to perform add fillets on
+  //! wires and edges.
   Standard_EXPORT static void Fillet2DCommands(Draw_Interpretor& DI);
 
   //! Defines the commands to build faces and shells.
@@ -54,15 +54,15 @@ public:
   //! Defines the commands to sweep shapes.
   Standard_EXPORT static void SweepCommands(Draw_Interpretor& DI);
 
-  //! Defines  the    commands   to perform  topological
+  //! Defines the commands to perform topological
   //! operations.
   Standard_EXPORT static void TopologyCommands(Draw_Interpretor& DI);
 
-  //! Defines  the commands  to perform  add  fillets on
+  //! Defines the commands to perform add fillets on
   //! shells.
   Standard_EXPORT static void FilletCommands(Draw_Interpretor& DI);
 
-  //! Defines  the commands  to perform  add chamfers on
+  //! Defines the commands to perform add chamfers on
   //! shells.
   Standard_EXPORT static void ChamferCommands(Draw_Interpretor& DI);
 
@@ -89,7 +89,7 @@ public:
   //! Defines the checkshape command.
   Standard_EXPORT static void CheckCommands(Draw_Interpretor& DI);
 
-  //! Defines the placement  command.
+  //! Defines the placement command.
   Standard_EXPORT static void PlacementCommands(Draw_Interpretor& DI);
 
   //! Defines the commands to project a wire on a shape.
diff --git a/src/Draw/TKTopTest/GeometryTest/GeometryTest.hxx b/src/Draw/TKTopTest/GeometryTest/GeometryTest.hxx
index 87e30c20c7..297c8ccd38 100644
--- a/src/Draw/TKTopTest/GeometryTest/GeometryTest.hxx
+++ b/src/Draw/TKTopTest/GeometryTest/GeometryTest.hxx
@@ -23,7 +23,7 @@
 
 #include <Draw_Interpretor.hxx>
 
-//! this  package  provides  commands for  curves  and
+//! this package provides commands for curves and
 //! surface.
 class GeometryTest
 {
@@ -59,7 +59,7 @@ public:
   //! continuity between curves or surfaces
   Standard_EXPORT static void ContinuityCommands(Draw_Interpretor& I);
 
-  //! defines     command  to    test  the    polyhedral
+  //! defines command to test the polyhedral
   //! triangulations and the polygons from the Poly package.
   Standard_EXPORT static void PolyCommands(Draw_Interpretor& I);
 
diff --git a/src/Draw/TKTopTest/GeometryTest/GeometryTest_DrawableQualifiedCurve2d.hxx b/src/Draw/TKTopTest/GeometryTest/GeometryTest_DrawableQualifiedCurve2d.hxx
index 99877dc0b3..31f279352c 100644
--- a/src/Draw/TKTopTest/GeometryTest/GeometryTest_DrawableQualifiedCurve2d.hxx
+++ b/src/Draw/TKTopTest/GeometryTest/GeometryTest_DrawableQualifiedCurve2d.hxx
@@ -62,7 +62,7 @@ public:
   //! For variable dump.
   Standard_EXPORT virtual void Dump(Standard_OStream& S) const Standard_OVERRIDE;
 
-  //! For variable whatis command. Set  as a result  the
+  //! For variable whatis command. Set as a result the
   //! type of the variable.
   Standard_EXPORT virtual void Whatis(Draw_Interpretor& I) const Standard_OVERRIDE;
 
diff --git a/src/Draw/TKTopTest/GeomliteTest/GeomliteTest.hxx b/src/Draw/TKTopTest/GeomliteTest/GeomliteTest.hxx
index 463e72cbc6..7906265d76 100644
--- a/src/Draw/TKTopTest/GeomliteTest/GeomliteTest.hxx
+++ b/src/Draw/TKTopTest/GeomliteTest/GeomliteTest.hxx
@@ -23,7 +23,7 @@
 
 #include <Draw_Interpretor.hxx>
 
-//! this  package  provides  elementary commands for  curves  and
+//! this package provides elementary commands for curves and
 //! surface.
 class GeomliteTest
 {
diff --git a/src/Draw/TKTopTest/HLRTest/HLRTest.hxx b/src/Draw/TKTopTest/HLRTest/HLRTest.hxx
index 28368f0394..08f67f87db 100644
--- a/src/Draw/TKTopTest/HLRTest/HLRTest.hxx
+++ b/src/Draw/TKTopTest/HLRTest/HLRTest.hxx
@@ -27,7 +27,7 @@ class HLRAlgo_Projector;
 class TopoDS_Shape;
 class HLRTopoBRep_OutLiner;
 
-//! This package   is  a test  of  the    Hidden Lines
+//! This package is a test of the Hidden Lines
 //! algorithms instantiated on the BRep Data Structure
 //! and using the Draw package to display the results.
 class HLRTest
diff --git a/src/Draw/TKTopTest/HLRTest/HLRTest_OutLiner.hxx b/src/Draw/TKTopTest/HLRTest/HLRTest_OutLiner.hxx
index 8717e00460..7ab8ff510c 100644
--- a/src/Draw/TKTopTest/HLRTest/HLRTest_OutLiner.hxx
+++ b/src/Draw/TKTopTest/HLRTest/HLRTest_OutLiner.hxx
@@ -47,7 +47,7 @@ public:
   //! For variable dump.
   Standard_EXPORT virtual void Dump(Standard_OStream& S) const Standard_OVERRIDE;
 
-  //! For variable whatis command. Set  as a result  the
+  //! For variable whatis command. Set as a result the
   //! type of the variable.
   Standard_EXPORT virtual void Whatis(Draw_Interpretor& I) const Standard_OVERRIDE;
 
diff --git a/src/Draw/TKTopTest/HLRTest/HLRTest_Projector.hxx b/src/Draw/TKTopTest/HLRTest/HLRTest_Projector.hxx
index 75bf82673e..ce49c4cb71 100644
--- a/src/Draw/TKTopTest/HLRTest/HLRTest_Projector.hxx
+++ b/src/Draw/TKTopTest/HLRTest/HLRTest_Projector.hxx
@@ -45,7 +45,7 @@ public:
   //! Save drawable into stream.
   Standard_EXPORT virtual void Save(Standard_OStream& theStream) const Standard_OVERRIDE;
 
-  //! For variable whatis command. Set  as a result  the
+  //! For variable whatis command. Set as a result the
   //! type of the variable.
   Standard_EXPORT virtual void Whatis(Draw_Interpretor& I) const Standard_OVERRIDE;
 
diff --git a/src/Draw/TKViewerTest/ViewerTest/ViewerTest.hxx b/src/Draw/TKViewerTest/ViewerTest/ViewerTest.hxx
index 1a24b65cb3..343554c858 100644
--- a/src/Draw/TKViewerTest/ViewerTest/ViewerTest.hxx
+++ b/src/Draw/TKViewerTest/ViewerTest/ViewerTest.hxx
@@ -63,7 +63,7 @@ class ViewerTest
 public:
   DEFINE_STANDARD_ALLOC
 
-  //! Loads all Draw commands of  V2d & V3d. Used for plugin.
+  //! Loads all Draw commands of V2d & V3d. Used for plugin.
   Standard_EXPORT static void Factory(Draw_Interpretor& theDI);
 
   //! Creates view with default or custom name and adds this name in map to manage multiple views.
@@ -136,13 +136,13 @@ public:
 
   //! waits until a shape of type <aType> is picked in the AIS Viewer and returns it.
   //! if <aType> == TopAbs_Shape, any shape can be picked...
-  //! MaxPick  is the Max number before exiting, if no pick is successful
+  //! MaxPick is the Max number before exiting, if no pick is successful
   Standard_EXPORT static TopoDS_Shape PickShape(const TopAbs_ShapeEnum aType,
                                                 const Standard_Integer MaxPick = 5);
 
   //! wait until the array is filled with picked shapes.
   //! returns True if the array is filled.
-  //! exit if number of unsuccessful picks =  <MaxPick>
+  //! exit if number of unsuccessful picks = <MaxPick>
   Standard_EXPORT static Standard_Boolean PickShapes(const TopAbs_ShapeEnum           aType,
                                                      Handle(TopTools_HArray1OfShape)& thepicked,
                                                      const Standard_Integer           MaxPick = 5);
diff --git a/src/Draw/TKXDEDRAW/XDEDRAW/XDEDRAW.hxx b/src/Draw/TKXDEDRAW/XDEDRAW/XDEDRAW.hxx
index eddb7ae8c1..1dd159bed3 100644
--- a/src/Draw/TKXDEDRAW/XDEDRAW/XDEDRAW.hxx
+++ b/src/Draw/TKXDEDRAW/XDEDRAW/XDEDRAW.hxx
@@ -30,7 +30,7 @@ public:
   //! Initializes all the functions
   Standard_EXPORT static void Init(Draw_Interpretor& di);
 
-  //! Loads all Draw commands of  TKXDEDRAW. Used for plugin.
+  //! Loads all Draw commands of TKXDEDRAW. Used for plugin.
   Standard_EXPORT static void Factory(Draw_Interpretor& theDI);
 };
 
diff --git a/src/FoundationClasses/TKernel/Message/Message_Messenger.hxx b/src/FoundationClasses/TKernel/Message/Message_Messenger.hxx
index a38b1560e5..980ffb9dd5 100644
--- a/src/FoundationClasses/TKernel/Message/Message_Messenger.hxx
+++ b/src/FoundationClasses/TKernel/Message/Message_Messenger.hxx
@@ -88,7 +88,7 @@ public:
     //! In practice it should never be called because modern compilers
     //! create such instances in place.
     //! However note that if this constructor is called, the buffer
-    //! content (string) will not be copied  (move is not supported for
+    //! content (string) will not be copied (move is not supported for
     //! std::stringstream class on old compilers such as gcc 4.4, msvc 9).
     StreamBuffer(const StreamBuffer& theOther)
         : myMessenger(theOther.myMessenger),
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_AccAllocator.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_AccAllocator.hxx
index 0a371beef7..ef1aaaf7ab 100644
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_AccAllocator.hxx
+++ b/src/FoundationClasses/TKernel/NCollection/NCollection_AccAllocator.hxx
@@ -20,22 +20,22 @@
 #include <NCollection_DataMap.hxx>
 
 //!
-//! Class  NCollection_AccAllocator  -  accumulating  memory  allocator.  This
-//! class  allocates  memory on request returning the pointer to the allocated
-//! space.  The  allocation  units  are  grouped  in blocks requested from the
-//! system  as  required.  This  memory  is  returned  to  the system when all
+//! Class NCollection_AccAllocator - accumulating memory allocator. This
+//! class allocates memory on request returning the pointer to the allocated
+//! space. The allocation units are grouped in blocks requested from the
+//! system as required. This memory is returned to the system when all
 //! allocations in a block are freed.
 //!
-//! By comparison with  the standard new() and malloc()  calls, this method is
+//! By comparison with the standard new() and malloc() calls, this method is
 //! faster and consumes very small additional memory to maintain the heap.
 //!
-//! By comparison with NCollection_IncAllocator,  this class requires some more
-//! additional memory  and a little more time for allocation and deallocation.
+//! By comparison with NCollection_IncAllocator, this class requires some more
+//! additional memory and a little more time for allocation and deallocation.
 //! Memory overhead for NCollection_IncAllocator is 12 bytes per block;
 //! average memory overhead for NCollection_AccAllocator is 28 bytes per block.
 //!
-//! All pointers  returned by Allocate() are aligned to 4 byte boundaries.
-//! To  define  the size  of  memory  blocks  requested  from the OS,  use the
+//! All pointers returned by Allocate() are aligned to 4 byte boundaries.
+//! To define the sizeof memory blocks requested from the OS, use the
 //! parameter of the constructor (measured in bytes).
 
 class NCollection_AccAllocator : public NCollection_BaseAllocator
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_Array1.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_Array1.hxx
index a5fd812aca..3f141f5fdc 100644
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_Array1.hxx
+++ b/src/FoundationClasses/TKernel/NCollection/NCollection_Array1.hxx
@@ -35,7 +35,7 @@
 //!
 //! Examples:
 //! @code
-//! Item tab[100]; //  an example with a C array
+//! Item tab[100]; // an example with a C array
 //! NCollection_Array1<Item> ttab (tab[0], 1, 100);
 //!
 //! NCollection_Array1<Item> tttab (ttab(10), 10, 20); // a slice of ttab
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_DynamicArray.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_DynamicArray.hxx
index 23e0a2f761..f13373175d 100644
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_DynamicArray.hxx
+++ b/src/FoundationClasses/TKernel/NCollection/NCollection_DynamicArray.hxx
@@ -37,18 +37,18 @@
 //! The Vector is always created with 0 length. It can be enlarged by two means:
 //!  1. Calling the method Append (val) - then "val" is added to the end of the
 //!     vector (the vector length is incremented)
-//!  2. Calling the method SetValue (i, val)  - if "i" is greater than or equal
-//!     to the current length of the vector,  the vector is enlarged to accomo-
+//!  2. Calling the method SetValue (i, val) - if "i" is greater than or equal
+//!     to the current length of the vector, the vector is enlarged to accomo-
 //!     date this index
 //!
-//! The methods Append and SetValue return  a non-const reference  to the copied
-//! object  inside  the vector.  This reference  is guaranteed to be valid until
+//! The methods Append and SetValue return a non-const reference to the copied
+//! object inside the vector. This reference is guaranteed to be valid until
 //! the vector is destroyed. It can be used to access the vector member directly
 //! or to pass its address to other data structures.
 //!
-//! The vector iterator remembers the length of the vector  at the moment of the
-//! creation or initialisation of the iterator.   Therefore the iteration begins
-//! at index 0  and stops at the index equal to (remembered_length-1).  It is OK
+//! The vector iterator remembers the length of the vector at the moment of the
+//! creation or initialisation of the iterator. Therefore the iteration begins
+//! at index 0 and stops at the index equal to (remembered_length-1). It is OK
 //! to enlarge the vector during the iteration.
 template <class TheItemType>
 class NCollection_DynamicArray
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_Vector.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_Vector.hxx
index 6386b03b52..20ac59c408 100755
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_Vector.hxx
+++ b/src/FoundationClasses/TKernel/NCollection/NCollection_Vector.hxx
@@ -20,24 +20,24 @@
 
 //! Class NCollection_Vector (dynamic array of objects)
 //!
-//! This class is similar to NCollection_Vector  though the indices always start
+//! This class is similar to NCollection_Vector though the indices always start
 //! at 0 (in Array1 the first index must be specified)
 //!
 //! The Vector is always created with 0 length. It can be enlarged by two means:
 //!  1. Calling the method Append (val) - then "val" is added to the end of the
 //!     vector (the vector length is incremented)
-//!  2. Calling the method SetValue (i, val)  - if "i" is greater than or equal
-//!     to the current length of the vector,  the vector is enlarged to accomo-
+//!  2. Calling the method SetValue (i, val) - if "i" is greater than or equal
+//!     to the current length of the vector, the vector is enlarged to accomo-
 //!     date this index
 //!
-//! The methods Append and SetValue return  a non-const reference  to the copied
-//! object  inside  the vector.  This reference  is guaranteed to be valid until
+//! The methods Append and SetValue return a non-const reference to the copied
+//! object inside the vector. This reference is guaranteed to be valid until
 //! the vector is destroyed. It can be used to access the vector member directly
 //! or to pass its address to other data structures.
 //!
-//! The vector iterator remembers the length of the vector  at the moment of the
-//! creation or initialisation of the iterator.   Therefore the iteration begins
-//! at index 0  and stops at the index equal to (remembered_length-1).  It is OK
+//! The vector iterator remembers the length of the vector at the moment of the
+//! creation or initialisation of the iterator. Therefore the iteration begins
+//! at index 0 and stops at the index equal to (remembered_length-1). It is OK
 //! to enlarge the vector during the iteration.
 template <class TheItemType>
 using NCollection_Vector = NCollection_DynamicArray<TheItemType>;
diff --git a/src/FoundationClasses/TKernel/OSD/OSD_SharedLibrary.hxx b/src/FoundationClasses/TKernel/OSD/OSD_SharedLibrary.hxx
index 0551fe6536..f7d8b05f20 100644
--- a/src/FoundationClasses/TKernel/OSD/OSD_SharedLibrary.hxx
+++ b/src/FoundationClasses/TKernel/OSD/OSD_SharedLibrary.hxx
@@ -46,7 +46,7 @@ public:
 
   //! The DlOpen method provides an interface to the
   //! dynamic library loader to allow shared libraries
-  //! to be loaded and called at runtime.  The DlOpen
+  //! to be loaded and called at runtime. The DlOpen
   //! function attempts to load Filename, in the address
   //! space of the process, resolving symbols as appropriate.
   //! Any libraries that Filename depends upon are also loaded.
diff --git a/src/FoundationClasses/TKernel/OSD/OSD_Timer.hxx b/src/FoundationClasses/TKernel/OSD/OSD_Timer.hxx
index d78a4a4ce8..bfab0cfe3e 100644
--- a/src/FoundationClasses/TKernel/OSD/OSD_Timer.hxx
+++ b/src/FoundationClasses/TKernel/OSD/OSD_Timer.hxx
@@ -30,8 +30,8 @@
 //! This function is portable and it measures ELAPSED
 //! time and CPU time in seconds and microseconds.
 //! Example: OSD_Timer aTimer;
-//! aTimer.Start();   // Start  the timers (t1).
-//! .....            // Do something.
+//! aTimer.Start();   // Start the timers (t1).
+//! .....             // Do something.
 //! aTimer.Stop();    // Stop the timers (t2).
 //! aTimer.Show();    // Give the elapsed time between t1 and t2.
 //! // Give also the process CPU time between
@@ -71,12 +71,12 @@ public:
   //! stopped.
   Standard_EXPORT virtual void Show() const Standard_OVERRIDE;
 
-  //! Shows both the elapsed time and CPU  time on the
+  //! Shows both the elapsed time and CPU time on the
   //! output stream <OS>.
   Standard_EXPORT virtual void Show(Standard_OStream& os) const Standard_OVERRIDE;
 
   //! returns both the elapsed time(seconds,minutes,hours)
-  //! and CPU  time.
+  //! and CPU time.
   Standard_EXPORT void Show(Standard_Real&    theSeconds,
                             Standard_Integer& theMinutes,
                             Standard_Integer& theHours,
diff --git a/src/FoundationClasses/TKernel/Precision/Precision.hxx b/src/FoundationClasses/TKernel/Precision/Precision.hxx
index bc0d0c1041..d08f7c0148 100644
--- a/src/FoundationClasses/TKernel/Precision/Precision.hxx
+++ b/src/FoundationClasses/TKernel/Precision/Precision.hxx
@@ -207,8 +207,8 @@ public:
   //! algorithm, but this option might be costly.
   static constexpr Standard_Real Approximation() { return Confusion() * 10.0; }
 
-  //! Convert a real  space precision  to  a  parametric
-  //! space precision.   <T>  is the mean  value  of the
+  //! Convert a real space precision to a parametric
+  //! space precision. <T> is the mean value of the
   //! length of the tangent of the curve or the surface.
   //!
   //! Value is P / T
@@ -246,7 +246,7 @@ public:
   //! parameter u of this curve is ten times greater than the
   //! previous one. This shows that for two different curves,
   //! the distance between two points on the curve, resulting
-  //! from the same variation of parameter du, may vary   considerably.
+  //! from the same variation of parameter du, may vary considerably.
   //! -   Moreover, the variation of the parameter along the
   //! curve is generally not proportional to the curvilinear
   //! abscissa along the curve. So the distance between two
@@ -306,25 +306,25 @@ public:
     return Parametric(Approximation(), T);
   }
 
-  //! Convert a real  space precision  to  a  parametric
+  //! Convert a real space precision to a parametric
   //! space precision on a default curve.
   //!
   //! Value is Parametric(P,1.e+2)
   static constexpr Standard_Real Parametric(const Standard_Real P) { return P * 0.01; }
 
-  //! Used  to test distances  in parametric  space on a
+  //! Used to test distances in parametric space on a
   //! default curve.
   //!
   //! This is Precision::Parametric(Precision::Confusion())
   static constexpr Standard_Real PConfusion() { return Confusion() * 0.01; }
 
-  //! Used for Intersections  in parametric  space  on a
+  //! Used for Intersections in parametric space on a
   //! default curve.
   //!
   //! This is Precision::Parametric(Precision::Intersection())
   static constexpr Standard_Real PIntersection() { return Intersection() * 0.01; }
 
-  //! Used for  Approximations  in parametric space on a
+  //! Used for Approximations in parametric space on a
   //! default curve.
   //!
   //! This is Precision::Parametric(Precision::Approximation())
@@ -337,21 +337,21 @@ public:
     return Abs(R) >= (0.5 * Precision::Infinite());
   }
 
-  //! Returns True if R may be considered as  a positive
+  //! Returns True if R may be considered as a positive
   //! infinite number. Currently R > 1e100
   static constexpr Standard_Boolean IsPositiveInfinite(const Standard_Real R)
   {
     return R >= (0.5 * Precision::Infinite());
   }
 
-  //! Returns True if R may  be considered as a negative
+  //! Returns True if R may be considered as a negative
   //! infinite number. Currently R < -1e100
   static constexpr Standard_Boolean IsNegativeInfinite(const Standard_Real R)
   {
     return R <= -(0.5 * Precision::Infinite());
   }
 
-  //! Returns a  big number that  can  be  considered as
+  //! Returns a big number that can be considered as
   //! infinite. Use -Infinite() for a negative big number.
   static constexpr Standard_Real Infinite() { return 2.e+100; }
 };
diff --git a/src/FoundationClasses/TKernel/Resource/Resource_Manager.hxx b/src/FoundationClasses/TKernel/Resource/Resource_Manager.hxx
index 97aace6572..269ed4fae3 100644
--- a/src/FoundationClasses/TKernel/Resource/Resource_Manager.hxx
+++ b/src/FoundationClasses/TKernel/Resource/Resource_Manager.hxx
@@ -47,7 +47,7 @@ public:
   //!
   //! FILE SYNTAX
   //! The syntax of a resource file is a sequence of resource
-  //! lines terminated by newline characters or end of file.  The
+  //! lines terminated by newline characters or end of file. The
   //! syntax of an individual resource line is:
   Standard_EXPORT Resource_Manager(const Standard_CString aName,
                                    const Standard_Boolean Verbose = Standard_False);
diff --git a/src/FoundationClasses/TKernel/Resource/Resource_Unicode.hxx b/src/FoundationClasses/TKernel/Resource/Resource_Unicode.hxx
index 3817071f4b..c772202aab 100644
--- a/src/FoundationClasses/TKernel/Resource/Resource_Unicode.hxx
+++ b/src/FoundationClasses/TKernel/Resource/Resource_Unicode.hxx
@@ -94,7 +94,7 @@ public:
   //! Converts Unicode ExtendedString <fromstr> to non-ASCII
   //! CString <tostr> in ANSI format, limited to <maxsize>
   //! characters. To translate the whole <fromstr>, use more
-  //! than twice the length of <fromstr>.  Returns true if
+  //! than twice the length of <fromstr>. Returns true if
   //! <maxsize> has not been reached before end of conversion.
   Standard_EXPORT static Standard_Boolean ConvertUnicodeToANSI(
     const TCollection_ExtendedString& fromstr,