*api: clean up multi-line and mal-formed XML tags

It is amazing what some people believe autodoc supports.

Also, com::sun::star::uno::Any does not exist in IDL, that is part of
the C++ language binding.

Change-Id: I1f1f5cf5d27663ace6ff618ecbecb41fd2dfa1fc

170 files changed, 1403 insertions, 1807 deletions

diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 4bf58b902d6b..b7a80b4568d7 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -257,8 +257,8 @@ constants AccessibleEventId
         that is exposed through the XAccessibleText and
         XAccessibleEditableText interfaces.
 
-        <p>The affected text ranges are represented by <type
-        scope="com::sun::star::accessibility">TextSegment</type> structures.<p>
+        <p>The affected text ranges are represented by
+        com::sun::star::accessibility::TextSegment structures.<p>
 
         <p>The content of the AccessibleEventObject::OldValue and
         AccessibleEventObject::NewValue expresses the type
diff --git a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
index 1c41c0952e09..09cf4de411cd 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
@@ -69,8 +69,8 @@ module com { module sun { module star { module accessibility {
     This distinction becomes important when there are more than one action.
     To get access to the key bindings you have to get the
     XAccessibleAction interface of a component, provided that
-    it is supported, and use the <method
-    scope="XAccessibleAction">getAccessibleKeyBinding()</method>.</p>
+    it is supported, and use the XAccessibleAction::getAccessibleKeyBinding().
+    </p>
 
     @see XAccessibleExtendedComponent
 
@@ -126,7 +126,7 @@ interface XAccessibleComponent : ::com::sun::star::uno::XInterface
 
         <p>The returned bounding box has the form of a rectangle.  Its
         coordinates are relative to the object's parent coordinate system.
-        Note that the two methods <method>getLocation</methodmber> and
+        Note that the two methods getLocation() and
         getSize() return the same information.  With method
         getLocationOnScreen() you can get the bound box
         position in screen coordinates.</p>
diff --git a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
index caf5b52fb6a9..6b81009ab0e4 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
@@ -91,7 +91,7 @@ interface XAccessibleMultiLineText
         <p>The substring returned will most of the time be identical to
         calling XAccessibleText::getTextAtIndex() with
         the index returned by XAccessibleText::getCaretPosition()
-        and type  <const scope="AccessibleTextType">LINE</type> beside the
+        and type AccessibleTextType::LINE beside the
         following special case:</p>
 
         <p>Some text implementations place the caret at the end of the current
diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl
index 9b5297571e08..6ad8355fca86 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl
@@ -353,7 +353,7 @@ interface XAccessibleText : ::com::sun::star::uno::XInterface
 
         <p>Returns the substring of the specified text type that contains
         the character at the given index, if any.  For example, given the
-        text type <const scope="AccessibleTextType">WORD</type>, the word
+        text type AccessibleTextType::WORD, the word
         which contains the character at position nIndex is returned, or an
         empty string if no word is found at the that position.</p>
 
@@ -388,8 +388,8 @@ interface XAccessibleText : ::com::sun::star::uno::XInterface
         XAccessibleText::getTextAtIndex() with a
         suitably decreased index value.</p>
 
-        <p>For example, if text type is <const
-        scope="AccessibleTextType">WORD</type>, then the complete word
+        <p>For example, if text type is
+        AccessibleTextType::WORD, then the complete word
         that is closest to and located before nIndex is returned.</p>
 
         <p>If the index is valid, but no suitable word (or other text
@@ -427,8 +427,8 @@ interface XAccessibleText : ::com::sun::star::uno::XInterface
         XAccessibleText::getTextAtIndex() with a
         suitably increased index value.</p>
 
-        <p>For example, if text type is <const
-        scope="AccessibleTextType">WORD</type>, then the complete word
+        <p>For example, if text type is
+        AccessibleTextType::WORD, then the complete word
         that is closest to and located behind nIndex is returned.</p>
 
         <p>If the index is valid, but no suitable word (or other text
diff --git a/offapi/com/sun/star/animations/AnimationFill.idl b/offapi/com/sun/star/animations/AnimationFill.idl
index 3fa3cd274421..73c72264deb6 100644
--- a/offapi/com/sun/star/animations/AnimationFill.idl
+++ b/offapi/com/sun/star/animations/AnimationFill.idl
@@ -77,7 +77,7 @@ constants AnimationFill
         the element, then the element will have a fill behavior identical to that if it were specified
         as AnimationFill::FREEZE.</li>
         <li>Otherwise, the element will have a fill behavior identical to that if it were specified as
-        <const>AnimationFill::REMOVE</const.</li>
+        AnimationFill::REMOVE.</li>
         </ul>
     */
     const short AUTO = 5;
diff --git a/offapi/com/sun/star/awt/AccessibleButton.idl b/offapi/com/sun/star/awt/AccessibleButton.idl
index fbd16902aa75..d4022e85b2e1 100644
--- a/offapi/com/sun/star/awt/AccessibleButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleButton.idl
@@ -39,9 +39,8 @@ service AccessibleButton
     /** This interface gives access to the structural information of a button:
 
         <ul>
-        <li>Role: The role of a button is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PUSH_BUTTON</const>.</li>
+        <li>Role: The role of a button is
+            com::sun::star::accessibility::AccessibleRole::PUSH_BUTTON.</li>
         <li>Name: The name of a button is its localized label.</li>
         <li>Description: The description of a button is its localized
             help text.</li>
@@ -50,31 +49,25 @@ service AccessibleButton
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::PRESSED</const> is set
-                if the object is currently pressed.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::PRESSED
+                is set if the object is currently pressed.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
@@ -102,8 +95,7 @@ service AccessibleButton
 
     /** This interface gives access to the numerical value of a button,
         which is related to the button's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::PRESSED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::PRESSED state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
 
diff --git a/offapi/com/sun/star/awt/AccessibleCheckBox.idl b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
index 0fa11ca02243..9ef4d9e9fff3 100644
--- a/offapi/com/sun/star/awt/AccessibleCheckBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
@@ -40,9 +40,8 @@ service AccessibleCheckBox
         check box:
 
         <ul>
-        <li>Role: The role of a check box is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::CHECK_BOX</const>.</li>
+        <li>Role: The role of a check box is
+            com::sun::star::accessibility::AccessibleRole::CHECK_BOX.</li>
         <li>Name: The name of a check box is its localized label.</li>
         <li>Description: The description of a check box is its localized
             help text.</li>
@@ -51,28 +50,23 @@ service AccessibleCheckBox
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleComboBox.idl b/offapi/com/sun/star/awt/AccessibleComboBox.idl
index 196aefde2c78..aa350b59cc17 100644
--- a/offapi/com/sun/star/awt/AccessibleComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleComboBox.idl
@@ -44,9 +44,8 @@ service AccessibleComboBox
     /** This interface gives access to the structural information of a combo box:
 
        <ul>
-       <li>Role: The role of a combo box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::COMBO_BOX</const>.</li>
+       <li>Role: The role of a combo box is
+           com::sun::star::accessibility::AccessibleRole::COMBO_BOX.</li>
        <li>Name: The name of a combo box is its localized label.</li>
        <li>Description: The description of a combo box is its localized
            help text.</li>
@@ -57,31 +56,25 @@ service AccessibleComboBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
index 259ebcbe35bf..5e3aea6df310 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
@@ -48,9 +48,8 @@ service AccessibleDropDownComboBox
     /** This interface gives access to the structural information of a dropdown combo box:
 
        <ul>
-       <li>Role: The role of a dropdown combo box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::COMBO_BOX</const>.</li>
+       <li>Role: The role of a dropdown combo box is
+           com::sun::star::accessibility::AccessibleRole::COMBO_BOX.</li>
        <li>Name: The name of a dropdown combo box is its localized label.</li>
        <li>Description: The description of a dropdown combo box is its localized
            help text.</li>
@@ -61,31 +60,25 @@ service AccessibleDropDownComboBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
index 49a1d97b94db..62a649186da3 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
@@ -49,9 +49,8 @@ service AccessibleDropDownListBox
     /** This interface gives access to the structural information of a dropdown list box:
 
        <ul>
-       <li>Role: The role of a dropdown list box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::COMBO_BOX</const>.</li>
+       <li>Role: The role of a dropdown list box is
+           com::sun::star::accessibility::AccessibleRole::COMBO_BOX.</li>
        <li>Name: The name of a dropdown list box is its localized label.</li>
        <li>Description: The description of a dropdown list box is its localized
            help text.</li>
@@ -61,31 +60,25 @@ service AccessibleDropDownListBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleEdit.idl b/offapi/com/sun/star/awt/AccessibleEdit.idl
index 73ff968e7026..3c4cce690467 100644
--- a/offapi/com/sun/star/awt/AccessibleEdit.idl
+++ b/offapi/com/sun/star/awt/AccessibleEdit.idl
@@ -38,16 +38,14 @@ service AccessibleEdit
     /** This interface gives access to the structural information of an edit:
 
         <ul>
-        <li>Role: The role of an edit is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::TEXT</const>.
+        <li>Role: The role of an edit is
+            com::sun::star::accessibility::AccessibleRole::TEXT.
             If the text content of the edit is password protected
-            the role is <const scope="com::sun::star::accessibility"
-            >AccessibleRole::PASSWORD_TEXT</const>.</li>
-        <li>Name: If the relation of type <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRelationType::LABELED_BY</const> is set,
-            the name of the edit is the localized label of the target
+            the role is
+            com::sun::star::accessibility::AccessibleRole::PASSWORD_TEXT.</li>
+        <li>Name: If the relation of type
+            com::sun::star::accessibility::AccessibleRelationType::LABELED_BY
+            is set, the name of the edit is the localized label of the target
             object, otherwise there is no name.</li>
         <li>Description: The description of an edit is its localized
             help text.</li>
@@ -55,36 +53,31 @@ service AccessibleEdit
         <li>Parent: The parent is the window that contains the edit.</li>
         <li>Relations: The relations supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRelationType::LABELED_BY</const> is set
-                if the object is labeled by one or more target
+            <li>com::sun::star::accessibility::AccessibleRelationType::LABELED_BY
+                is set if the object is labeled by one or more target
                 objects.</li>
             </ul>
             </li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::EDITABLE</const> is set
+            <li>com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                is set
                 if the content of the object can be changed by the user.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index 70975422af61..bf50561bcac9 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -38,9 +38,8 @@ service AccessibleFixedText
         fixed text:
 
         <ul>
-        <li>Role: The role of a fixed text is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::LABEL</const>.</li>
+        <li>Role: The role of a fixed text is
+        com::sun::star::accessibility::AccessibleRole::LABEL.</li>
         <li>Name: The name of a fixed text is its localized label.</li>
         <li>Description: The description of a fixed text is its localized
             help text.</li>
@@ -48,31 +47,26 @@ service AccessibleFixedText
         <li>Parent: The parent is the window that contains the fixed text.</li>
         <li>Relations: The relations supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRelationType::LABEL_FOR</const> is set
-                if the object is a label for one or more target
+            <li>com::sun::star::accessibility::AccessibleRelationType::LABEL_FOR
+                is set if the object is a label for one or more target
                 objects.</li>
             </ul>
             </li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::MULTI_LINE</const> is set
-                if the object contains multiple lines of text.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::MULTI_LINE
+                is set if the object contains multiple lines of text.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
index 3998188856b2..9d9325753290 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
@@ -44,9 +44,8 @@ service AccessibleIconChoiceControl
     /** This interface gives access to the structural information of an icon choice control:
 
        <ul>
-       <li>Role: The role of an icon choice control is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::TREE</const>.</li>
+       <li>Role: The role of an icon choice control is
+       com::sun::star::accessibility::AccessibleRole::TREE.</li>
        <li>Name: The name of an icon choice control is IconChoiceControl.</li>
        <li>Description: The description of an icon choice control is its localized
            help text.</li>
@@ -56,35 +55,29 @@ service AccessibleIconChoiceControl
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MANAGES_DESCENDANTS</const> is always set. Children are transient.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set when multi selection is enabled.</li>
+           <li><com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MANAGES_DESCENDANTS
+               is always set. Children are transient.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+               is set when multi selection is enabled.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
index 73d776ebefd7..aa20ed1704b7 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
@@ -46,9 +46,8 @@ service AccessibleIconChoiceControlEntry
     /** This interface gives access to the structural information of an icon choice control entry:
 
        <ul>
-       <li>Role: The role of an icon choice control entry is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::LABEL</const>.</li>
+       <li>Role: The role of an icon choice control entry is
+       com::sun::star::accessibility::AccessibleRole::LABEL.</li>
        <li>Name: The name of an icon choice control entry is it's text.</li>
        <li>Description: The description of an icon choice control entry is empty.</li>
        <li>Children: There exist no children.
@@ -57,26 +56,23 @@ service AccessibleIconChoiceControlEntry
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::TRANSIENT</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTED</const> is set when it is selected.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::TRANSIENT
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+               is set when it is selected.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleList.idl b/offapi/com/sun/star/awt/AccessibleList.idl
index 039410446295..6e896a07d888 100644
--- a/offapi/com/sun/star/awt/AccessibleList.idl
+++ b/offapi/com/sun/star/awt/AccessibleList.idl
@@ -51,9 +51,8 @@ service AccessibleList
     /** This interface gives access to the structural information of a list:
 
        <ul>
-       <li>Role: The role of a list is <const
-           scope="::com::sun::star::accessibility"
-           >AccessibleRole::LIST</const>.</li>
+       <li>Role: The role of a list is
+           ::com::sun::star::accessibility::AccessibleRole::LIST.</li>
        <li>Name: The name of a list is its localized label.</li>
        <li>Description: The description of a list is its localized
            help text.</li>
@@ -72,36 +71,29 @@ service AccessibleList
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set
-               if the list supports multi selection.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MANAGES_DESCENDANTS</const> is always set.
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+               is set if the list supports multi selection.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MANAGES_DESCENDANTS
+               is always set.
                The children are transient.</li>
            </ul>
            </li>
diff --git a/offapi/com/sun/star/awt/AccessibleListBox.idl b/offapi/com/sun/star/awt/AccessibleListBox.idl
index 5d2b866481c7..388af78b8bac 100644
--- a/offapi/com/sun/star/awt/AccessibleListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBox.idl
@@ -45,9 +45,8 @@ service AccessibleListBox
     /** This interface gives access to the structural information of a list box:
 
        <ul>
-       <li>Role: The role of a list box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::PANEL</const>.</li>
+       <li>Role: The role of a list box is
+       com::sun::star::accessibility::AccessibleRole::PANEL.</li>
        <li>Name: The name of a list box is its localized label.</li>
        <li>Description: The description of a list box is its localized
            help text.</li>
@@ -57,31 +56,25 @@ service AccessibleListBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleListItem.idl b/offapi/com/sun/star/awt/AccessibleListItem.idl
index f2ebd145f487..f4aa65a5c6ea 100644
--- a/offapi/com/sun/star/awt/AccessibleListItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleListItem.idl
@@ -45,9 +45,8 @@ service AccessibleListItem
     /** This interface gives access to the structural information of a list item:
 
        <ul>
-       <li>Role: The role of a list item is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::LIST_ITEM</const>.</li>
+       <li>Role: The role of a list item is
+       com::sun::star::accessibility::AccessibleRole::LIST_ITEM.</li>
        <li>Name: The name of a list item is the text of the item.</li>
        <li>Description: The description of a list item is empty.</li>
        <li>Children: There exists no children.</li>
@@ -55,26 +54,23 @@ service AccessibleListItem
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::TRANSIENT</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTED</const> is set
-               when the item is selected.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::TRANSIENT
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+               is set when the item is selected.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleMenu.idl b/offapi/com/sun/star/awt/AccessibleMenu.idl
index 6cf3b184ca82..d0bcd5197fc5 100644
--- a/offapi/com/sun/star/awt/AccessibleMenu.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenu.idl
@@ -40,9 +40,8 @@ service AccessibleMenu
     /** This interface gives access to the structural information of a menu:
 
         <ul>
-        <li>Role: The role of a menu is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::MENU</const>.</li>
+        <li>Role: The role of a menu is
+            com::sun::star::accessibility::AccessibleRole::MENU.</li>
         <li>Name: The name of a menu is the localized item text.</li>
         <li>Description: The description of a menu is its localized
             help text.</li>
@@ -57,33 +56,27 @@ service AccessibleMenu
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ARMED</const> is set
-                if the object is highlighted.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::ARMED
+                is set if the object is highlighted.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
@@ -111,8 +104,7 @@ service AccessibleMenu
 
     /** This interface gives access to the numerical value of a
         menu, which is related to the menu's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::SELECTED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::SELECTED state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
 
diff --git a/offapi/com/sun/star/awt/AccessibleMenuBar.idl b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
index a61d9128e3a6..5ed8059e3e56 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
@@ -38,9 +38,8 @@ service AccessibleMenuBar
         menu bar:
 
         <ul>
-        <li>Role: The role of a menu bar is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::MENU_BAR</const>.</li>
+        <li>Role: The role of a menu bar is
+        com::sun::star::accessibility::AccessibleRole::MENU_BAR.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a menu bar is its localized
             help text.</li>
@@ -52,27 +51,23 @@ service AccessibleMenuBar
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleMenuItem.idl b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
index d3628d8100c9..efbe09efe67b 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
@@ -40,9 +40,8 @@ service AccessibleMenuItem
         menu item:
 
         <ul>
-        <li>Role: The role of a menu item is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::MENU_ITEM</const>.</li>
+        <li>Role: The role of a menu item is
+        com::sun::star::accessibility::AccessibleRole::MENU_ITEM.</li>
         <li>Name: The name of a menu item is the localized item text.</li>
         <li>Description: The description of a menu item is its localized
             help text.</li>
@@ -54,33 +53,27 @@ service AccessibleMenuItem
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ARMED</const> is set
-                if the object is highlighted.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::ARMED
+                is set if the object is highlighted.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
@@ -108,8 +101,7 @@ service AccessibleMenuItem
 
     /** This interface gives access to the numerical value of a
         menu item, which is related to the menu item's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::SELECTED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::SELECTED state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
 };
diff --git a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
index 767d79402200..ff2a282f51eb 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
@@ -37,9 +37,8 @@ service AccessibleMenuSeparator
         menu separator:
 
         <ul>
-        <li>Role: The role of a menu separator is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::SEPARATOR</const>.</li>
+        <li>Role: The role of a menu separator is
+        com::sun::star::accessibility::AccessibleRole::SEPARATOR.</li>
         <li>Name: There is no name.</li>
         <li>Description: There is no description.</li>
         <li>Children: There are no children.</li>
@@ -51,27 +50,23 @@ service AccessibleMenuSeparator
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li><com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li><com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
index 63a6e19c3c31..b70db67a2b41 100644
--- a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
+++ b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
@@ -38,9 +38,8 @@ service AccessiblePopupMenu
         pop-up menu:
 
         <ul>
-        <li>Role: The role of a pop-up menu is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::POPUP_MENU</const>.</li>
+        <li>Role: The role of a pop-up menu is
+        com::sun::star::accessibility::AccessibleRole::POPUP_MENU.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a pop-up menu is its localized
             help text.</li>
@@ -52,27 +51,23 @@ service AccessiblePopupMenu
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleRadioButton.idl b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
index 7954881a46c6..e065cb536efb 100644
--- a/offapi/com/sun/star/awt/AccessibleRadioButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
@@ -40,9 +40,8 @@ service AccessibleRadioButton
         radio button:
 
         <ul>
-        <li>Role: The role of a radio button is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::RADIO_BUTTON</const>.</li>
+        <li>Role: The role of a radio button is
+        com::sun::star::accessibility::AccessibleRole::RADIO_BUTTON.</li>
         <li>Name: The name of a radio button is its localized label.</li>
         <li>Description: The description of a radio button is its localized
             help text.</li>
@@ -50,36 +49,30 @@ service AccessibleRadioButton
         <li>Parent: The parent is the window that contains the radio button.</li>
         <li>Relations: The relations supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRelationType::MEMBER_OF</const> is set
-                if the object is a member of a group of one or more
+            <li>com::sun::star::accessibility::AccessibleRelationType::MEMBER_OF
+                is set if the object is a member of a group of one or more
                 target objects.</li>
             </ul>
             </li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
@@ -107,8 +100,7 @@ service AccessibleRadioButton
 
     /** This interface gives access to the numerical value of a
         radio button, which is related to the radio button's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::CHECKED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::CHECKED state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
 
diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
index 0bb66da59f33..3ad246c9fa85 100644
--- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
@@ -39,9 +39,8 @@ service AccessibleScrollBar
         scroll bar:
 
         <ul>
-        <li>Role: The role of a scroll bar is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::SCROLL_BAR</const>.</li>
+        <li>Role: The role of a scroll bar is
+        com::sun::star::accessibility::AccessibleRole::SCROLL_BAR.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a scroll bar is its localized
             help text.</li>
@@ -50,31 +49,25 @@ service AccessibleScrollBar
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::HORIZONTAL</const> is set
-                if the orientation of the object is horizontal.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VERTICAL</const> is set
-                if the orientation of the object is vertical.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::HORIZONTAL
+                is set if the orientation of the object is horizontal.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VERTICAL
+                is set if the orientation of the object is vertical.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBar.idl b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
index dbc0bf80ad17..9cca466910cb 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
@@ -37,9 +37,8 @@ service AccessibleStatusBar
         status bar:
 
         <ul>
-        <li>Role: The role of a status bar is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::STATUS_BAR</const>.</li>
+        <li>Role: The role of a status bar is
+        com::sun::star::accessibility::AccessibleRole::STATUS_BAR.</li>
         <li>Name: There is no name.</li>
         <li>Description: There is no description.</li>
         <li>Children: The children of a status bar are status bar items,
@@ -49,20 +48,17 @@ service AccessibleStatusBar
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
index b631e28ad40d..7b2cc61b92f5 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
@@ -38,9 +38,8 @@ service AccessibleStatusBarItem
         status bar item:
 
         <ul>
-        <li>Role: The role of a status bar item is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::LABEL</const>.</li>
+        <li>Role: The role of a status bar item is
+        com::sun::star::accessibility::AccessibleRole::LABEL.</li>
         <li>Name: The name of a status bar item is its localized
             configuration name.</li>
         <li>Description: The description of a status bar item is
@@ -52,19 +51,17 @@ service AccessibleStatusBarItem
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabBar.idl b/offapi/com/sun/star/awt/AccessibleTabBar.idl
index 853cce48f2f3..f8c3b316eb05 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBar.idl
@@ -37,9 +37,8 @@ service AccessibleTabBar
         tabbar:
 
         <ul>
-        <li>Role: The role of a tabbar is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PANEL</const>.</li>
+        <li>Role: The role of a tabbar is
+        com::sun::star::accessibility::AccessibleRole::PANEL.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a tabbar is its localized
             help text.</li>
@@ -52,28 +51,23 @@ service AccessibleTabBar
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::RESIZABLE</const> is set
-                if the size of the object is not fixed.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+                is set if the size of the object is not fixed.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
index b9c690c9b477..0d47e13cb43d 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
@@ -37,9 +37,8 @@ service AccessibleTabBarPage
         tabbar page:
 
         <ul>
-        <li>Role: The role of a tabbar page is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PAGE_TAB</const>.</li>
+        <li>Role: The role of a tabbar page is
+        com::sun::star::accessibility::AccessibleRole::PAGE_TAB.</li>
         <li>Name: The name of a tabbar page is the localized
             tabbar page text.</li>
         <li>Description: The description of a tabbar page is its localized
@@ -51,25 +50,21 @@ service AccessibleTabBarPage
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
index 40236510e886..849088455788 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
@@ -38,9 +38,8 @@ service AccessibleTabBarPageList
         tabbar page list:
 
         <ul>
-        <li>Role: The role of a tabbar page list is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PAGE_TAB_LIST</const>.</li>
+        <li>Role: The role of a tabbar page list is
+        com::sun::star::accessibility::AccessibleRole::PAGE_TAB_LIST.</li>
         <li>Name: There is no name.</li>
         <li>Description: There is no description.</li>
         <li>Children: The children of a tabbar page list are tabbar pages,
@@ -52,20 +51,17 @@ service AccessibleTabBarPageList
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabControl.idl b/offapi/com/sun/star/awt/AccessibleTabControl.idl
index 17b6001415b0..36c99fa4dbc3 100644
--- a/offapi/com/sun/star/awt/AccessibleTabControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabControl.idl
@@ -38,9 +38,8 @@ service AccessibleTabControl
         tab control:
 
         <ul>
-        <li>Role: The role of a tab control is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PAGE_TAB_LIST</const>.</li>
+        <li>Role: The role of a tab control is
+        com::sun::star::accessibility::AccessibleRole::PAGE_TAB_LIST.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a tab control is its localized
             help text.</li>
@@ -52,25 +51,21 @@ service AccessibleTabControl
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabPage.idl b/offapi/com/sun/star/awt/AccessibleTabPage.idl
index 7e1c982a13a8..76de39818828 100644
--- a/offapi/com/sun/star/awt/AccessibleTabPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabPage.idl
@@ -38,9 +38,8 @@ service AccessibleTabPage
         tab page:
 
         <ul>
-        <li>Role: The role of a tab page is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PAGE_TAB</const>.</li>
+        <li>Role: The role of a tab page is
+        com::sun::star::accessibility::AccessibleRole::PAGE_TAB.</li>
         <li>Name: The name of a tab page is the localized tab page text.</li>
         <li>Description: The description of a tab page is its localized
             help text.</li>
@@ -51,30 +50,25 @@ service AccessibleTabPage
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index 34e260f2c26b..2377077d9f70 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -49,9 +49,8 @@ service AccessibleTextField
     /** This interface gives access to the structural information of a text filed:
 
        <ul>
-       <li>Role: The role of a text filed is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::TEXT</const>.</li>
+       <li>Role: The role of a text filed is
+       com::sun::star::accessibility::AccessibleRole::TEXT.</li>
        <li>Name: The name of a text filed is its localized label.</li>
        <li>Description: The description of a text filed is its localized
            help text.</li>
@@ -60,31 +59,25 @@ service AccessibleTextField
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index f8ebda52bec5..2d47013296ce 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -47,9 +47,8 @@ service AccessibleToolBox
     /** This interface gives access to the structural information of a tool box:
 
        <ul>
-       <li>Role: The role of a tool box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::TOOL_BAR</const>.</li>
+       <li>Role: The role of a tool box is
+       com::sun::star::accessibility::AccessibleRole::TOOL_BAR.</li>
        <li>Name: The name of a tool box is its localized label.</li>
        <li>Description: The description of a tool box is its localized
            help text.</li>
@@ -59,37 +58,29 @@ service AccessibleToolBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VERTICAL</const> is set
-               if the tool box is vertical.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::HORIZONTAL</const> is set
-               if the tool box is horizontal.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VERTICAL
+               is set if the tool box is vertical.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::HORIZONTAL
+               is set if the tool box is horizontal.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
index 3e81f990d061..d35325338d84 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
@@ -68,28 +68,23 @@ service AccessibleToolBoxItem
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::CHECKED</const> is set
-               if the tool box item is checked.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+               is set if the tool box item is checked.</li>
            </ul>
            </li>
        </ul>
@@ -113,8 +108,7 @@ service AccessibleToolBoxItem
     interface com::sun::star::accessibility::XAccessibleText;
     /** This interface gives access to the numerical value of a
         tool box item, which is related to the tool box item's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::CHECKED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::CHECKED state.
      */
     interface com::sun::star::accessibility::XAccessibleValue;
 };
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
index 7090f2669e8f..5119965f851b 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
@@ -46,9 +46,8 @@ service AccessibleTreeListBox
     /** This interface gives access to the structural information of a tree list box:
 
        <ul>
-       <li>Role: The role of a tree list box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::TREE</const>.</li>
+       <li>Role: The role of a tree list box is
+       com::sun::star::accessibility::AccessibleRole::TREE.</li>
        <li>Name: The name of a tree list box is its localized label.</li>
        <li>Description: The description of a tree list box is its localized
            help text.</li>
@@ -58,33 +57,27 @@ service AccessibleTreeListBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set when multi selection is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+               is set when multi selection is enabled.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
index 154a6905e6fc..7984cb97da8e 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
@@ -50,9 +50,8 @@ service AccessibleTreeListBoxEntry
     /** This interface gives access to the structural information of a tree list box entry:
 
        <ul>
-       <li>Role: The role of a tree list box entry is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::LABEL</const>.</li>
+       <li>Role: The role of a tree list box entry is
+       com::sun::star::accessibility::AccessibleRole::LABEL.</li>
        <li>Name: The name of a tree list box entry is it's text.</li>
        <li>Description: The description of a tree list box entry is empty.</li>
        <li>Children: There can exist children of type com::sun::star::awt::AccessibleTreeListBoxEntry.
@@ -62,34 +61,31 @@ service AccessibleTreeListBoxEntry
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::EDITABLE</const> is set when a tree list box entry can be edited.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::EXPANDABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::EXPANDED</const> is set when it is expanded.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::COLLAPSED</const> is set when it is collapsed.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::CHECKED</const> is set when it is checked.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTED</const> is set when it is selected.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::EDITABLE
+               is set when a tree list box entry can be edited.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::EXPANDABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::EXPANDED
+               is set when it is expanded.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::COLLAPSED
+               is set when it is collapsed.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+               is set when it is checked.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+               is set when it is selected.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleWindow.idl b/offapi/com/sun/star/awt/AccessibleWindow.idl
index 4c9821e784f3..f5883c9e33f4 100644
--- a/offapi/com/sun/star/awt/AccessibleWindow.idl
+++ b/offapi/com/sun/star/awt/AccessibleWindow.idl
@@ -39,22 +39,14 @@ service AccessibleWindow
         <li>Role: The role of a window is not fixed. A window may have
             one of the following roles:
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::DIALOG</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::FRAME</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::LAYERED_PANE</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::PANEL</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::ROOT_PANE</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::SCROLL_PANE</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::SPLIT_PANE</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::WINDOW</const></li>
+            <li>com::sun::star::accessibility::AccessibleRole::DIALOG</li>
+            <li>com::sun::star::accessibility::AccessibleRole::FRAME</li>
+            <li>com::sun::star::accessibility::AccessibleRole::LAYERED_PANE</li>
+            <li>com::sun::star::accessibility::AccessibleRole::PANEL</li>
+            <li>com::sun::star::accessibility::AccessibleRole::ROOT_PANE</li>
+            <li>com::sun::star::accessibility::AccessibleRole::SCROLL_PANE</li>
+            <li>com::sun::star::accessibility::AccessibleRole::SPLIT_PANE</li>
+            <li>com::sun::star::accessibility::AccessibleRole::WINDOW</li>
             <li>...</li>
             </ul>
             </li>
@@ -66,34 +58,27 @@ service AccessibleWindow
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ACTIVE</const> is set
-                if the object is currently the active object.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+                is set if the object is currently the active object.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::MODAL</const> is set
-                if the object is modal.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::RESIZABLE</const> is set
-                if the size of the object is not fixed.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::MODAL
+                is set if the object is modal.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+                is set if the size of the object is not fixed.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/XExtendedToolkit.idl b/offapi/com/sun/star/awt/XExtendedToolkit.idl
index 96b238e9027f..56662975acbd 100644
--- a/offapi/com/sun/star/awt/XExtendedToolkit.idl
+++ b/offapi/com/sun/star/awt/XExtendedToolkit.idl
@@ -32,8 +32,8 @@
 module com {  module sun {  module star {  module awt {
 
 
-/** The XExtendedToolkit is an extension of the <type
-    scope="::com::sun::star::awt">XToolkit</type> interface.  It basically
+/** The XExtendedToolkit is an extension of the
+    ::com::sun::star::awt::XToolkit interface.  It basically
     provides access to three event broadcasters which are used for instance
     in the context of accessibility.  It is, however, not restricted to
     accessibility.
@@ -95,8 +95,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     */
     ::com::sun::star::awt::XTopWindow getActiveTopWindow ();
 
-    /** Add a new listener that is called for events that involve <type
-        scope="::com::sun::star::awt">XTopWindow</type>s.  After having
+    /** Add a new listener that is called for events that involve
+        ::com::sun::star::awt::XTopWindow.  After having
         obtained the current list of existing top-level windows you can
         keep this list up-to-date by listening to opened or closed top-level
         windows.  Wait for activations or deactivations of top-level windows
@@ -121,8 +121,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
         [in] ::com::sun::star::awt::XTopWindowListener xListener);
 
 
-    /** Add a new listener that is called on <type
-        scope="::com::sun::star::awt">KeyEvent</type>s.  Every listener is
+    /** Add a new listener that is called on
+        ::com::sun::star::awt::KeyEvent.  Every listener is
         given the opportunity to consume the event, i.e. prevent the not yet
         called listeners from being called.
         @param xHandler
@@ -145,8 +145,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
         [in] ::com::sun::star::awt::XKeyHandler xHandler);
 
 
-    /** Add a new listener that is called on <type
-        scope="::com::sun::star::awt">FocusEvent</type>s.  Use this focus
+    /** Add a new listener that is called on
+        ::com::sun::star::awt::FocusEvent.  Use this focus
         broadcaster to keep track of the object that currently has the input
         focus.
         @param xListener
diff --git a/offapi/com/sun/star/awt/XKeyHandler.idl b/offapi/com/sun/star/awt/XKeyHandler.idl
index 2231e43a1455..a913694c38da 100644
--- a/offapi/com/sun/star/awt/XKeyHandler.idl
+++ b/offapi/com/sun/star/awt/XKeyHandler.idl
@@ -27,8 +27,8 @@
 
 module com {  module sun {  module star {  module awt {
 
-/** This key handler is similar to <type
-    scope="::com::sun::star::awt">XKeyListener</type> but allows the
+/** This key handler is similar to
+    ::com::sun::star::awt::XKeyListener but allows the
     consumption of key events.  If a key event is consumed by one
     handler both the following handlers, with respect to the list of key
     handlers of the broadcaster, and a following handling by the
@@ -38,8 +38,8 @@ module com {  module sun {  module star {  module awt {
 */
 published interface XKeyHandler : ::com::sun::star::lang::XEventListener
 {
-    /** This function is called by the broadcaster, an <type
-        scope="::com::sun::star::awt">XExtendedToolkit</type> for
+    /** This function is called by the broadcaster, an
+        ::com::sun::star::awt::XExtendedToolkit for
         instance, after a key has been pressed but before it is released.
         The return value decides about whether other handlers will be
         called and a handling by the broadcaster will take place.
@@ -62,8 +62,8 @@ published interface XKeyHandler : ::com::sun::star::lang::XEventListener
     */
     boolean keyPressed ([in] com::sun::star::awt::KeyEvent aEvent);
 
-    /** This function is called by the broadcaster, an <type
-        scope="::com::sun::star::awt">XExtendedToolkit</type> for
+    /** This function is called by the broadcaster, an
+        ::com::sun::star::awt::XExtendedToolkit for
         instance, after a key has been pressed and released.  The return
         value decides about whether other handlers will be called and a
         handling by the broadcaster will take place.
diff --git a/offapi/com/sun/star/awt/XUserInputInterception.idl b/offapi/com/sun/star/awt/XUserInputInterception.idl
index b386233bb074..a5ad737127c5 100644
--- a/offapi/com/sun/star/awt/XUserInputInterception.idl
+++ b/offapi/com/sun/star/awt/XUserInputInterception.idl
@@ -33,8 +33,8 @@ module com {  module sun {  module star {  module awt {
  */
 published interface XUserInputInterception : ::com::sun::star::uno::XInterface
 {
-    /** Add a new listener that is called on <type
-        scope="::com::sun::star::awt">KeyEvent</type>s.  Every listener is
+    /** Add a new listener that is called on ::com::sun::star::awt::KeyEvent.
+        Every listener is
         given the opportunity to consume the event, i.e. prevent the not yet
         called listeners from being called.
         @param xHandler
@@ -56,8 +56,8 @@ published interface XUserInputInterception : ::com::sun::star::uno::XInterface
     void removeKeyHandler (
         [in] ::com::sun::star::awt::XKeyHandler xHandler);
 
-    /** Add a new listener that is called on <type
-        scope="::com::sun::star::awt">MouseEvent</type>s.  Every listener is
+    /** Add a new listener that is called on ::com::sun::star::awt::MouseEvent.
+        Every listener is
         given the opportunity to consume the event, i.e. prevent the not yet
         called listeners from being called.
         @param xHandler
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index 778664420f43..69150290deaf 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -29,7 +29,8 @@
 module com {  module sun {  module star {  module awt {  module grid {
 
 
-/** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
+/** The XGridColumn defines the properties and behavior of a column
+    in a grid control.
     @since OOo 3.3
  */
 published interface XGridColumn
diff --git a/offapi/com/sun/star/chart2/ChartDocument.idl b/offapi/com/sun/star/chart2/ChartDocument.idl
index 76e0942f2ba5..8d98c205ce59 100644
--- a/offapi/com/sun/star/chart2/ChartDocument.idl
+++ b/offapi/com/sun/star/chart2/ChartDocument.idl
@@ -38,7 +38,7 @@ module chart2
 service ChartDocument
 {
     /** this interface is derived from
-        <type-scope="com::sun::star::frame">XModel</type>.  Thus model
+        com::sun::star::frame::XModel.  Thus model
         functionality is available via this interface.
      */
     interface  XChartDocument;
diff --git a/offapi/com/sun/star/configuration/ConfigurationAccess.idl b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
index 9ad0f34ca537..9e34f9adff69 100644
--- a/offapi/com/sun/star/configuration/ConfigurationAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
@@ -91,34 +91,34 @@ module com { module sun { module star { module configuration {
  <ul>
     <li><strong>string</strong> can hold a human-readable text.
         <p>Values are represented as `string`.</p>
-        <p>Sequences are represented as <atom dim="[]">string</atom>.</p>
+        <p>Sequences are represented as `string[]`.</p>
         <p>"<em>human-readable</em>" here excludes non-printing characters
         except for CR, LF and TAB [Unicode code points 9,10,13].
         For binary data, use type <strong>binary</strong> instead.</p>
     </li>
     <li><strong>boolean</strong> can hold the values `TRUE` or `FALSE`.
         <p>Values are represented as `boolean`.
-        <p>Sequences are represented as <atom dim="[]">boolean</atom>.</p>
+        <p>Sequences are represented as `boolean[]`.</p>
     </li>
     <li><strong>short</strong> can hold a 16-bit signed integer.
         <p>Values are represented as `short`.</p>
-        <p>Sequences are represented as <atom dim="[]">short</atom>.</p>
+        <p>Sequences are represented as `short[]`.</p>
     </li>
     <li><strong>int</strong> can hold a 32-bit signed integer.
         <p>Values are represented as `long`.</p>
-        <p>Sequences are represented as <atom dim="[]">long</atom>.</p>
+        <p>Sequences are represented as `long[]`.</p>
     </li>
     <li><strong>long</strong> can hold a 64-bit signed integer.
         <p>Values are represented as `hyper`.</p>
-        <p>Sequences are represented as <atom dim="[]">hyper</atom>.</p>
+        <p>Sequences are represented as `hyper[]`.</p>
     </li>
     <li><strong>double</strong> can hold a floating point number.
         <p>Values are represented as `double`.</p>
-        <p>Sequences are represented as <atom dim="[]">double</atom>.</p>
+        <p>Sequences are represented as `double[]`.</p>
     </li>
     <li><strong>binary</strong> can hold a sequence of octets.
-        <p>Values are represented as <atom dim="[]">byte</atom>.</p>
-        <p>Sequences are represented as <atom dim="[][]">byte</atom>.</p>
+        <p>Values are represented as `byte[]`.</p>
+        <p>Sequences are represented as `byte[][]`.</p>
     </li>
  </ul>
 
diff --git a/offapi/com/sun/star/configuration/backend/DataImporter.idl b/offapi/com/sun/star/configuration/backend/DataImporter.idl
index 8f3bba9cd47c..8798f7879e03 100644
--- a/offapi/com/sun/star/configuration/backend/DataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/DataImporter.idl
@@ -58,20 +58,20 @@ published service DataImporter
             should be supported by implementations. Implementations must document
             a failure to support any of these arguments:
         <dl>
-            <dt><code>ImporterService</code> : <atom >string</atom></dt>
+            <dt><code>ImporterService</code> : `string`</dt>
             <dd>A service or implementation name used to instantiate the
                 Importer to use for importing. If this parameter
                 is missing, the implementation selects an appropriate importer.
                 By default, a MergeImporter should be used.
             </dd>
-            <dt><code>OverwriteExisting</code> : <atom >boolean</atom></dt>
+            <dt><code>OverwriteExisting</code> : `boolean`</dt>
             <dd>If `TRUE`, specifies that no existing data should be
                 overwritten by the import. If the Importer used
                 does not support such protection, an error may be raised.
                 If some data is not imported, because there is existing
                 data, this is indicated by returning an appropriate exception.
             </dd>
-            <dt><code>TruncateExisting</code> : <atom >boolean</atom></dt>
+            <dt><code>TruncateExisting</code> : `boolean`</dt>
             <dd>If `TRUE`, specifies that existing data should be
                 discarded and replaced by the imported data.
                 If the Importer used does not support this
@@ -79,19 +79,19 @@ published service DataImporter
                 By default, a CopyImporter is used to perform
                 truncating import.
             </dd>
-            <dt><code>Entity</code> : <atom >string</atom></dt>
+            <dt><code>Entity</code> : `string`</dt>
             <dd>An identifier for the entity in the destination backend for
                 which the imported data should apply. The value will be passed
                 to XLayerImporter::importLayerForEntity().
                 If this parameter is missing, the implementation uses
                 XLayerImporter::importLayer() instead.
             </dd>
-            <dt><code>Component</code> : <atom >string</atom></dt>
+            <dt><code>Component</code> : `string`</dt>
             <dd>Names the component for which to import data. If this
                 parameter is missing, the selection of data to import depends
                 on implementation-specific parameters.
             </dd>
-            <dt><code>LayerFilter</code> : <type >LayerFilter</type></dt>
+            <dt><code>LayerFilter</code> : LayerFilter</dt>
             <dd>A filter to transform data during import. This parameter is
                 optional. If this parameter is missing, data will be imported
                 unaltered. <em>Support for this parameter is optional.</em>
diff --git a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
index 9b953638c03f..2bd96640df91 100644
--- a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
@@ -45,7 +45,7 @@ published service HierarchyBrowser
             com::sun::star::task::XJob::execute()
             must be supported by all implementations:
         <dl>
-            <dt><code>ExcludeComponents</code> : <atom dim="[]">string</atom> or <atom >string</atom></dt>
+            <dt><code>ExcludeComponents</code> : `string[]` or `string`</dt>
             <dd>A component or list of components that should be skipped
                 and excluded from the result. If this argument appears multiple
                 times it is handled cumulatively.
diff --git a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
index 6df0c05d50e3..a3b2bdd3e75c 100644
--- a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
@@ -66,7 +66,7 @@ published service LocalDataImporter
             are all supported by implementations. Additionally the following
             argument is required to select the data source:
         <dl>
-            <dt><code>LayerDataUrl</code> : <atom >string</atom></dt>
+            <dt><code>LayerDataUrl</code> : `string`</dt>
             <dd>A file URL that specifies the location of the source data.
                 <p> If no <code>Component</code> is provided, this must be the
                     location of an OOR Update XML file, which will be imported
diff --git a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
index 709f52c3ceb4..569c4a33861b 100644
--- a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
@@ -25,7 +25,7 @@
 module com { module sun { module star { module configuration { module backend {
 
 
-/** is passed to an <type>InteractionHandler<type> when merging fails due to
+/** is passed to an InteractionHandler when merging fails due to
     invalid layer data or access problems.
 
     @since OOo 2.0
diff --git a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
index 354ff568c093..ce5a627142c9 100644
--- a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
+++ b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
@@ -25,7 +25,7 @@
 module com { module sun { module star { module configuration { module backend {
 
 
-/** is passed to an <type>InteractionHandler<type> when creating a stratum backend fails.
+/** is passed to an InteractionHandler when creating a stratum backend fails.
 
     @since OOo 2.0
  */
diff --git a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
index e9e4e95f58fb..d8387a969509 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
@@ -300,7 +300,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
                 in this layer.
                 In this case any subsequent value may be of a generic type
                 (e.g. `string` or - for list values -
-                <atom dim="[]">string</atom>.) Such values may be
+                `string[]`.) Such values may be
                 converted to the type defined in the schema by
                 the implementation.
             </p>
diff --git a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
index 77002a6d869b..91515e0284a1 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
@@ -42,7 +42,7 @@ published interface XLayerImporter : ::com::sun::star::uno::XInterface
 
         @returns
             the Backend into which layers are
-            imported by <member>XLayerImporter::importLayer()<member/>.
+            imported by XLayerImporter::importLayer().
 
     */
     XBackend getTargetBackend();
@@ -52,7 +52,7 @@ published interface XLayerImporter : ::com::sun::star::uno::XInterface
 
         @param aBackend
             a Backend into which layers should be
-            imported by <method>XLayerImporter::importLayer()<method/>.
+            imported by XLayerImporter::importLayer().
 
         @throws com::sun::star::lang::NullPointerException
             if the backend passed is `NULL`.
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 2c9286605ceb..cddbd772ca7e 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -336,13 +336,13 @@ interface XPackage
 
         This data may be created when calling
         XPackage::registerPackage().  If this is the case is
-        indicated by <member
-        scope="com::sun::star::beans">Optional::IsPresent</member> of the return
+        indicated by
+        com::sun::star::beans::Optional::IsPresent of the return
         value.
         If registration data are created during registration, but the package is
         currently not registered, for example after calling
-        XPackage::revokePackage(), then <member
-        scope="com::sun::star::beans">Optional::IsPresent</member> is `TRUE` and
+        XPackage::revokePackage(), then
+        com::sun::star::beans::Optional::IsPresent is `TRUE` and
         the com::sun::star::beans::Optional::Value may
         be an empty string.
     */
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index 365034cf0a4f..075ac5ba2bc3 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -61,16 +61,14 @@ interface XPackageRegistry
         <code>url</code> but different <code>mediaType<code> (the exception is,
         if previously an empty string was provided to cause the determination
         of the media type) or <code>removed</code> parameters will cause an
-        exception. An <type
-        scope="com::sun::star::lang">IllegalArgumentException</type> will be
+        exception. An com::sun::star::lang::IllegalArgumentException will be
         thrown in case of a different <code>mediaType</code> parameter and a
         InvalidRemovedParameterException is thrown if the
         <code>removed</code> parameter is different.
 
         The <code>identifier</code> parameter must be provided when
-        <code>removed</code> = true. If not, then an <type
-        scope="com::sun::star::lang">IllegalArgumentException</type> will be
-        thrown.
+        <code>removed</code> = true. If not, then an
+        com::sun::star::lang::IllegalArgumentException will be thrown.
 
         @param url
                package URL, must be UCB conform
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index 3ba1a444caaa..23c44b3a8074 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -36,8 +36,7 @@ module com { module sun { module star { module document {
     loaded from / stored to.
 
     <p>
-    This service may be represented by a
-    <type scope="com::sun::star::beans" dim="[]">PropertyValue</type>.
+    This service may be represented by a com::sun::star::beans::PropertyValue[].
     Such descriptors will be passed to different functions, included into possible
     load/save processes. Every member of such process can use this descriptor
     and may change it if to actualize the information about the document.
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index 22f84c3e4df5..1c3c3fa289fd 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -69,9 +69,8 @@ service AccessibleDrawDocumentView
 
         <p>You can access the following information:
         <ul>
-        <li>Role: The object's role is <const
-            scope="com::sun::star::accessibility"
-                >AccessibleRole::DOCUMENT</const>.</li>
+        <li>Role: The object's role is
+            com::sun::star::accessibility::AccessibleRole::DOCUMENT.</li>
         <li>Name: Its name is "AccessibleDrawDocumentView",
         "AccessibleOutlineView", or "slide window".</li>
         <li>Description: The description is "Draw Document", "Accessible
@@ -89,20 +88,16 @@ service AccessibleDrawDocumentView
             draw document view.  It has to be set via implementation dependent
             ways.</li>
         <li>Relations: Relations are set and modified from the outside.</li>
-        <li>States: <const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const> is set if a document view
+        <li>States: com::sun::star::accessibility::AccessibleStateType::DEFUNC
+            is set if a document view
                 becomes obsolete like when the window, which displays the view,
                 is closed.  Otherwise the states
-                <const scope="com::sun::star::accessibility"
-                    >AccessibleStateType::ENABLED</const>,
-                <const scope="com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>,
-                <const scope="com::sun::star::accessibility"
-                    >AccessibleStateType::VISIBLE</const>,
-                <const scope="com::sun::star::accessibility"
-                    >AccessibleStateType::FOCUSABLE</const>, and
-                <const scope="com::sun::star::accessibility"
-                   >AccessibleStateType::SELECTABLE</const>
+                com::sun::star::accessibility::AccessibleStateType::ENABLED,
+                com::sun::star::accessibility::AccessibleStateType::SHOWING,
+                com::sun::star::accessibility::AccessibleStateType::VISIBLE,
+                com::sun::star::accessibility::AccessibleStateType::FOCUSABLE,
+                and
+                com::sun::star::accessibility::AccessibleStateType::SELECTABLE
             are always set.</li>
         <li>Locale: Is obtained from the parent and returned unchanged.</li>
         </ul></p>
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
index 00c6e80db337..e2484c0d9472 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
@@ -31,8 +31,7 @@ module com {  module sun {  module star {  module drawing {
 
     <p>It differs from the included AccessibleShape "base"
     service by the additional support of the
-    <type
-    scope="::com::sun::star::accessibility">XAccessibleImage</type>
+    ::com::sun::star::accessibility::XAccessibleImage
     interface.</p>
 
      @since OOo 1.1.2
@@ -54,27 +53,22 @@ service AccessibleGraphicShape
 
     /**  Give access to image specific information.
 
-        <p>The support of the <type
-        scope="::com::sun::star::accessibility"
-        >XAccessibleImage</type> interface
+        <p>The support of the
+        ::com::sun::star::accessibility::AccessibleImage interface
         requires the shape to provide a description of the displayed image
         and the image's size in the screen coordinate system (pixel).  At
         the time being this interface does not provide information that is
         not available through the AccessibleShape service:
         the size returned by the
-        <member scope="::com::sun::star::accessibility"
-        >XAccessibleImage::getWidth</member> and <member
-        scope="::com::sun::star::accessibility"
-        >XAccessibleImage::getHeight</member> functions is the same as that
-        returned by the <member
-        scope="::com::sun::star::accessibility"
-        >XAccessibleComponent::getSize</member> function; the description
-        returned by <member
-        scope="::com::sun::star::accessibility"
-        >XAccessibleImage::getAccessibleImageDescription</member> function
-        is the same as the one returned by the <member
-        scope="::com::sun::star::accessibility"
-        >XAccessibleContext::getAccessibleDescription</member> function.
+        ::com::sun::star::accessibility::XAccessibleImage::getWidth() and
+        ::com::sun::star::accessibility::XAccessibleImage::getHeight()
+        functions is the same as that returned by the
+        ::com::sun::star::accessibility::XAccessibleComponent::getSize()
+        function; the description returned by
+        ::com::sun::star::accessibility::XAccessibleImage::getAccessibleImageDescription()
+        function is the same as the one returned by the
+        ::com::sun::star::accessibility::XAccessibleContext::getAccessibleDescription()
+        function.
         This makes the additional interface for
         the time being basically an indicator of graphic shapes.  This may
         change in the future.</p>
diff --git a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
index 1cdcb72bef85..f7faf43b9cca 100644
--- a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
+++ b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
@@ -40,14 +40,12 @@ service AccessibleImageBullet
 
         <ul>
             <li>The parent returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</method>
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
                 is the accessible object of a text paragraph.
             <li>There are no children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method>.
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::GRAPHIC</const>.
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild().
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::GRAPHIC.
             <li>The name is "image bullet" (or the equivalent term
                 in application's language).
             <li>The description contains the term "image bullet" (or the equivalent
@@ -55,24 +53,18 @@ service AccessibleImageBullet
                 within this bullet appears.
             <li>There are no relations.
             <li>The following states are supported by the
-                <type scope="::com::sun::star::accessibility"
-                >XAccessibleStateSet</type> returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleStateSet</method>.
+                ::com::sun::star::accessibility::XAccessibleStateSet returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet().
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed or the image bullet
                         is not existing any longer).
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::INVALID</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::INVALID
                 </ul>
         </ul>
 
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index 5a202670b383..66f626cac04b 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -30,8 +30,8 @@ module com {  module sun {  module star {  module drawing {
 
     <p>This includes generic OLE shapes, frames, plug-ins, and applets.</p>
 
-    <p>This service supports the additional <type
-    scope="::com::sun::star::accessibility">XAccessibleAction</type>
+    <p>This service supports the additional
+    ::com::sun::star::accessibility::XAccessibleAction
     interface.</p>
 
     <p>OLE objects are handled as place holders.  While not activated the
@@ -51,11 +51,8 @@ service AccessibleOLEShape
     /** Give access to information of generic shapes.
 
         <p>See AccessibleShape for basic documentation and
-        support of the <type
-        scope="::com::sun::star::accessibility"
-        >XAccessibleContext</type>, and
-        <type scope="::com::sun::star::accessibility"
-        >XAccessibleComponent</type> interfaces.
+        support of the ::com::sun::star::accessibility::XAccessibleContext, and
+        ::com::sun::star::accessibility::XAccessibleComponent interfaces.
 
         @see AccessibleShape
     */
diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl
index e3bd35acecaf..7e90e160437e 100644
--- a/offapi/com/sun/star/drawing/AccessibleShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleShape.idl
@@ -28,8 +28,8 @@ module com {  module sun {  module star {  module drawing {
 
 /** The AccessibleShape service is implemented by UNO shapes to
     provide accessibility information that describe the shape's features.
-    A UNO shape is any object that implements the <type
-    scope="::com::sun::star::drawing">XShape</type> interface.
+    A UNO shape is any object that implements the
+    ::com::sun::star::drawing::XShape interface.
 
     <p>The content of a draw page is modeled as tree of accessible shapes
     and accessible text paragraphs.  The root of this (sub-)tree is the
@@ -37,8 +37,8 @@ module com {  module sun {  module star {  module drawing {
     this service or one of the "derived" services
     AccessibleGraphicShape or AccessibleOLEShape.
     See the section Children in the description of the
-    <type scope="::com::sun::star::accessibility"
-    >XAccessibleContext</type> interface support for more details.</p>
+    ::com::sun::star::accessibility::XAccessibleContext
+    interface support for more details.</p>
 
     <p>There are two services that extend this one:  the
     AccessibleGraphicShape and the
@@ -46,8 +46,8 @@ module com {  module sun {  module star {  module drawing {
     See there for details.</p>
 
     <p>A shape object is either fully or partially visible on the screen or
-    has set the <const scope="::com::sun::star::accessibility"
-    >AccessibleStateType::DEFUNC</const> state to indicate that it is no longer
+    has set the ::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+    state to indicate that it is no longer
     actively supported by its parent.</p>
 
     <p>Each shape object that has not set the DEFUNC state has a valid
@@ -69,9 +69,8 @@ service AccessibleShape
         <p>You can access the following information for the shape being made
         accessible:
         <ul>
-        <li>Role: The role of all shapes is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::SHAPE</const>.</li>
+        <li>Role: The role of all shapes is
+        com::sun::star::accessibility::AccessibleRole::SHAPE.</li>
         <li>Name: The name of a shape is its localized type name.</li>
         <li>Description: Descriptions are localized and start with the
             shape's type and style.  After that follow some properties that
@@ -80,9 +79,8 @@ service AccessibleShape
             shapes or accessible text paragraphs.  Only group shapes, 3D scene
             shapes, and OLE shapes may contain other shapes as children.
             Some of the shapes may have text paragraphs as (additional)
-            children.  See <type scope="::com::sun::star::text"
-            >AccessibleParagraphView</type> for details of
-            how this text is represented.</li>
+            children.  See ::com::sun::star::text::AccessibleParagraphView for
+            details of how this text is represented.</li>
         <li>Parent: The parent is either the document view as represented by
             AccessibleDrawDocumentView or a group shape, 3D
             scene shape, or OLE shape.</li>
@@ -91,8 +89,8 @@ service AccessibleShape
         children for details.</li>
         <li>States: The states supported by this service are:
             <ul>
-            <li><p><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const> is set if an accessible
+            <li><p>com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                is set if an accessible
                 shape is not visible but still existent for some reason.
                 This should not really happen and is a sign that someone,
                 e.g. an AT-Tool holds references to such a shape.  The
@@ -100,9 +98,9 @@ service AccessibleShape
                 shape did not remove it from its list of children or that
                 the AT-Tool does not care for the events indicating
                 this.</p>
-                <p>Usually an object that has the <const
-                scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const> state set has already
+                <p>Usually an object that has the
+                com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                state set has already
                 been disposed and subsequent calls to this object result in
                 ::com::sun::star::lang::DisposedException
                 exceptions.</p>
@@ -110,35 +108,35 @@ service AccessibleShape
                 set.  This  is also true for the states that are otherwise
                 always set (which  makes "always" more of a sort of
                 "normally").</p></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::EDITABLE</const></li> is always set.
+            <li>com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                is always set.
                 This state is interpreted to mean that not only text but
                 also other, graphical, properties of a shape can be modified.
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set according to
+                </li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set according to
                 whether the shape currently has the focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::MULTI_LINE</const> is set if a shape
-                supports the <type scope="::com::sun::star::accessibility"
-                >XAccessibleText</type> interface.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is set for certain shapes
+            <li>com::sun::star::accessibility::AccessibleStateType::MULTI_LINE
+                is set if a shape supports the
+                ::com::sun::star::accessibility::XAccessibleText interface.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is set for certain shapes
                 with certain attributes like for a filled rectangle.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::RESIZABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set according to
+            <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set according to
                 whether the shape is currently selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
         <li>Locale: The shape returns the locale of its parent.</li>
         <li>Property change listeners: Property change listeners that are
@@ -149,17 +147,17 @@ service AccessibleShape
 
     /** Give access to the graphical representation of a shape.
 
-        <p>The bounding box returned by the <method
-        scope="::com::sun::star::accessibility"
-        >XAccessibleComponent::getBounds</method> function returns the
+        <p>The bounding box returned by the
+        ::com::sun::star::accessibility::XAccessibleComponent::getBounds()
+        function returns the
         shape's bounding box clipped at its parent's bounding box</p>
 
         <p>An accessible shape tries as best as it can to return proper
         values for calls to the
-        <method scope="::com::sun::star::accessibility"
-        >XAccessibleExtendedComponent::getForeground</method> and
-        <method scope="::com::sun::star::accessibility"
-        >XAccessibleExtendedComponent::getBackground</method> functions.
+        ::com::sun::star::accessibility::XAccessibleExtendedComponent::getForeground()
+        and
+        ::com::sun::star::accessibility::XAccessibleExtendedComponent::getBackground()
+        functions.
         If the shape is painted with a uniform and non-transparent color
         then the returned colors may differ from the ones visible on the
         screen.</p>
@@ -170,14 +168,11 @@ service AccessibleShape
 
     /** Give extended access to the graphical representation of a shape.
 
-        <p>The functions <method
-        scope="::com::sun::star::accessibility"
-        >XAccessibleExtendedComponent::getFont</method>,
-        <method scope="::com::sun::star::accessibility"
-        >XAccessibleExtendedComponent::getTitledBorderText</method>, and
-        <method scope="::com::sun::star::accessibility"
-        >XAccessibleExtendedComponent::getToolTipText</method> are not
-        supported and return empty references respectively empty
+        <p>The functions
+        ::com::sun::star::accessibility::XAccessibleExtendedComponent::getFont(),
+        ::com::sun::star::accessibility::XAccessibleExtendedComponent::getTitledBorderText(), and
+        ::com::sun::star::accessibility::XAccessibleExtendedComponent::getToolTipText()
+        are not supported and return empty references respectively empty
         strings.</p>
 
         <p>The support of this interface is optional to reduce overhead in
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
index 97aee03aca1d..eee9592e1339 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -40,15 +40,15 @@ published service FillProperties
     */
     [property] FillStyle FillStyle;
 
-    /** If the property #FillStyle is set to <const>
-        FillStyle::SOLID</const>, this is the color used.
+    /** If the property #FillStyle is set to
+        FillStyle::SOLID, this is the color used.
     */
     [property] com::sun::star::util::Color FillColor;
 
     /** This is the transparence of the filled area.
 
-        <p>This property is only valid if the property <member>FillStyle
-        </member> is set to FillStyle::SOLID.
+        <p>This property is only valid if the property #FillStyle
+        is set to FillStyle::SOLID.
     */
     [property] short FillTransparence;
 
@@ -64,25 +64,25 @@ published service FillProperties
     */
     [optional, property] com::sun::star::awt::Gradient FillTransparenceGradient;
 
-    /** If the property #FillStyle is set to <const>
-        FillStyle::GRADIENT</const>, this is the name of the used fill
+    /** If the property #FillStyle is set to
+        FillStyle::GRADIENT, this is the name of the used fill
         gradient style.
     */
     [property] string FillGradientName;
 
-    /** If the property #FillStyle is set to <const>
-        FillStyle::GRADIENT</const>, this describes the gradient used.
+    /** If the property #FillStyle is set to
+        FillStyle::GRADIENT, this describes the gradient used.
     */
     [optional, property] com::sun::star::awt::Gradient FillGradient;
 
-    /** If the property #FillStyle is set to <const>
-        FillStyle::HATCH</const>, this is the name of the used fill hatch
+    /** If the property #FillStyle is set to
+        FillStyle::HATCH, this is the name of the used fill hatch
         style.
     */
     [property] string FillHatchName;
 
-    /** If the property #FillStyle is set to <const>
-        FillStyle::HATCH</const>, this describes the hatch used.
+    /** If the property #FillStyle is set to
+        FillStyle::HATCH, this describes the hatch used.
     */
     [optional, property] Hatch FillHatch;
 
@@ -91,19 +91,19 @@ published service FillProperties
     */
     [property] boolean FillBackground;
 
-    /** If the property #FillStyle is set to <const>
-        FillStyle::BITMAP</const>, this is the name of the used fill bitmap
+    /** If the property #FillStyle is set to
+        FillStyle::BITMAP, this is the name of the used fill bitmap
         style.
     */
     [property] string FillBitmapName;
 
-    /** If the property #FillStyle is set to <const>
-        FillStyle::BITMAP</const>, this is the bitmap used.
+    /** If the property #FillStyle is set to
+        FillStyle::BITMAP, this is the bitmap used.
     */
     [optional, property] com::sun::star::awt::XBitmap FillBitmap;
 
-    /** If the property #FillStyle is set to <const>
-        FillStyle::BITMAP</const>, this is a URL to the bitmap used.
+    /** If the property #FillStyle is set to
+        FillStyle::BITMAP, this is a URL to the bitmap used.
     */
     [optional, property] string FillBitmapURL;
 
@@ -159,8 +159,8 @@ published service FillProperties
 
     /** this enum selects how a area is filled with a single bitmap.
 
-        <p>This property corresponds to the properties <member>
-        FillBitmapStretch</member> and #FillBitmapTile.</p>
+        <p>This property corresponds to the properties
+        #FillBitmapStretch and #FillBitmapTile.</p>
 
         <p>If set to BitmapMode::REPEAT, the property
         FillBitmapStretch is set to `FALSE`, and the property FillBitmapTile
@@ -186,8 +186,8 @@ published service FillProperties
         the property #FillBitmapTile is `TRUE` too.</p>
 
         <p>If set to `FALSE`, the value of the FillBitmapMode property
-        changes to BitmapMode::REPEAT or <const>
-        BitmapMode::NO_REPEAT</const>, depending on the current value of the
+        changes to BitmapMode::REPEAT or BitmapMode::NO_REPEAT,
+        depending on the current value of the
         #FillBitmapTile property.</p>
      */
     [optional, property] boolean FillBitmapStretch;
@@ -203,8 +203,8 @@ published service FillProperties
         the property #FillBitmapStretch is `TRUE` too.</p>
 
         <p>If set to `FALSE`, the value of the FillBitmapMode property
-        changes to BitmapMode::STRETCH or <const>
-        BitmapMode::NO_REPEAT</const>, depending on the current value of the
+        changes to BitmapMode::STRETCH or BitmapMode::NO_REPEAT,
+        depending on the current value of the
         #FillBitmapStretch property.</p>
      */
     [optional, property] boolean FillBitmapTile;
diff --git a/offapi/com/sun/star/drawing/Text.idl b/offapi/com/sun/star/drawing/Text.idl
index 0749c4610a10..c7a4659e1dc8 100644
--- a/offapi/com/sun/star/drawing/Text.idl
+++ b/offapi/com/sun/star/drawing/Text.idl
@@ -32,8 +32,7 @@
  */
 published service Text
 {
-    /** With this interface you can modify the text of this
-                <type>Shape<type>.
+    /** With this interface you can modify the text of this Shape.
      */
     interface com::sun::star::text::XText;
 
diff --git a/offapi/com/sun/star/drawing/XShapeBinder.idl b/offapi/com/sun/star/drawing/XShapeBinder.idl
index 92f4acce80e4..6eae56986ebd 100644
--- a/offapi/com/sun/star/drawing/XShapeBinder.idl
+++ b/offapi/com/sun/star/drawing/XShapeBinder.idl
@@ -40,7 +40,7 @@ published interface XShapeBinder: com::sun::star::uno::XInterface
         @param xShapes
             a container with Shapes that will be bind together.
             All Shapes will be converted to a PolyPolygonBezierShape
-            and the lines will be connected. The <type>Shape</types>s in xShape will be
+            and the lines will be connected. The Shapes in xShape will be
             removed from the GenericDrawPage and disposed.
 
         @returns
diff --git a/offapi/com/sun/star/drawing/XShapeCombiner.idl b/offapi/com/sun/star/drawing/XShapeCombiner.idl
index 9940fc3c6421..6610210d998c 100644
--- a/offapi/com/sun/star/drawing/XShapeCombiner.idl
+++ b/offapi/com/sun/star/drawing/XShapeCombiner.idl
@@ -41,7 +41,7 @@ published interface XShapeCombiner: com::sun::star::uno::XInterface
             the Shapes inside this container are converted
             to PolyPolygonBezierShapes and are than combined
             into one PolyPolygonBezierShape.
-            The <type>Shape</types>s in xShape will be removed from the
+            The Shapes in xShape will be removed from the
             GenericDrawPage and disposed.
 
         @returns
@@ -59,7 +59,7 @@ published interface XShapeCombiner: com::sun::star::uno::XInterface
             the Shape is converted to a
             PolyPolygonBezierShapes and then split into
             several PolyPolygonBezierShapes
-            The <type>Shape</types>s in xShape will be removed from the
+            The Shapes in xShape will be removed from the
             GenericDrawPage and disposed.
      */
     void split( [in] com::sun::star::drawing::XShape xGroup );
diff --git a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
index 97ff237c8cca..96346e96c5d6 100644
--- a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
@@ -25,7 +25,7 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-/** The <type>BasicPaneFactory</pane> is a resource factory that provides the
+/** The BasicPaneFactory is a resource factory that provides the
     panes used by the Draw and Impress applications.
     <p>This factory provides the center, left, and right pane.  For the left
     pane there are two URLS, <code>private:resource/floater/LeftImpressPane</code>
diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl
index 2381db5415a0..572bce00ac43 100644
--- a/offapi/com/sun/star/drawing/framework/Configuration.idl
+++ b/offapi/com/sun/star/drawing/framework/Configuration.idl
@@ -26,8 +26,7 @@ module com { module sun { module star { module drawing { module framework {
 
 /** This service provides the means for constructing new configurations.
 
-    <p>Most likely use is the <member
-    scope="XConfigurationController">restoreConfiguration()</member>
+    <p>Most likely use is the XConfigurationController::restoreConfiguration()
     method.</p>
 
     @see XConfiguration
diff --git a/offapi/com/sun/star/drawing/framework/ModuleController.idl b/offapi/com/sun/star/drawing/framework/ModuleController.idl
index 493b284e2422..8236a4ab156a 100644
--- a/offapi/com/sun/star/drawing/framework/ModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/ModuleController.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module drawing { module framework {
     service may be removed in the future.</p>
 
     <p>The ModuleController object for an application can be
-    obtained via the XControllerManager interface.</type>
+    obtained via the XControllerManager interface.
 */
 service ModuleController : XModuleController
 {
diff --git a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
index 4677a3d1509c..2239ba7f3c17 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
@@ -22,9 +22,8 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-/** The ResourceActivationMode specifies, for example for the <member
-    scope="com::sun::star::drawing::framework"
-    >XConfigurationController::requestResourceActivation()</member>,
+/** The ResourceActivationMode specifies, for example for the
+    com::sun::star::drawing::framework::XConfigurationController::requestResourceActivation(),
     whether a requested resource is to replace an existing resource of the
     same class or is to be activated additionally.
 */
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index 6f84d2dbd7fc..f08f42db76eb 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -115,16 +115,15 @@ interface XResource;
     set.</p></li>
     <li>ConfigurationUpdateStart is sent before the update of
     the current configuration starts.</p>
-    <p>The requested configuration is available in the <member
-    scope="ConfigurationChangeEvent">Configuration</member> member.  The
+    <p>The requested configuration is available in the
+    ConfigurationChangeEvent::Configuration member.  The
     #ResourceId and #ResourceObject members
     are not set.</p></li>
     <li>ConfigurationUpdateEnd is sent after the update of
     the current configuration ends.</p>
     <p>The requested configuration is
-    available in the <member scope="ConfigurationChangeEvent"
-    >Configuration</member> member.  The #ResourceId and
-    #ResourceObject members are not set.</p></li>
+    available in the ConfigurationChangeEvent::Configuration member.
+    The #ResourceId and #ResourceObject members are not set.</p></li>
     <li>ResourceActivation is sent when a resource is
     activated, i.e. when a new object of a resource is created (or taken
     from a cash).</p>
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
index 1c30602fe80f..3313af621f40 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
@@ -53,9 +53,7 @@ interface XConfigurationControllerRequestQueue
         @param xRequest
             The configuration change represented by this request object must only
             be commited to the configuration when the
-            <member
-            scope="com::sun::star::drawing::framework::XConfigurationChangeRequest"
-            >execute()</member>
+            com::sun::star::drawing::framework::XConfigurationChangeRequest::execute()
             method of the xRequest object is called.
     */
     void postChangeRequest (
diff --git a/offapi/com/sun/star/drawing/framework/XControllerManager.idl b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
index d6530788df3c..4c615b66b064 100644
--- a/offapi/com/sun/star/drawing/framework/XControllerManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
@@ -30,8 +30,8 @@ interface XModuleController;
 /** The XControllerManager gives access to the controllers of the drawing
     framework.
     <p>The XControllerManager interface is typically
-    implemented by the same object that implements <type
-    scope="com::sun::star::frame">XController</type>.</p>
+    implemented by the same object that implements
+    com::sun::star::frame::XController.</p>
 */
 interface XControllerManager
 {
diff --git a/offapi/com/sun/star/drawing/framework/XPane.idl b/offapi/com/sun/star/drawing/framework/XPane.idl
index 4c29e3b9bc8d..04b7cd137d5a 100644
--- a/offapi/com/sun/star/drawing/framework/XPane.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane.idl
@@ -44,8 +44,7 @@ interface XPane
 
     /** Return the com::sun::star::awt::XCanvas of the pane.  The
         com::sun::star::rendering::XCanvas object is expected to
-        be associated with the <type
-        scope="com::sun::star::awt">XWindow</type> object returned by
+        be associated with the com::sun::star::awt::XWindow object returned by
         getWindow().
         @return
             When the com::sun::star::rendering::XCanvas
diff --git a/offapi/com/sun/star/drawing/framework/XPane2.idl b/offapi/com/sun/star/drawing/framework/XPane2.idl
index 06f31f7a41f5..a15c99c641d2 100644
--- a/offapi/com/sun/star/drawing/framework/XPane2.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane2.idl
@@ -33,7 +33,7 @@ interface XPane2
 {
     /** Return whether all windows that are used to implement the pane are
         visible.
-        @Returns <TRUE> when all windows of the pane are visible.
+        @Returns `TRUE` when all windows of the pane are visible.
     */
     boolean isVisible ();
 
@@ -42,7 +42,7 @@ interface XPane2
         some, or all windows are hidden or shown as long as the pane becomes
         hidden or visible.
         @param bIsVisible
-            When <TRUE> then show the pane.  Hide it otherwise.
+            When `TRUE` then show the pane.  Hide it otherwise.
     */
     void setVisible ([in] boolean bIsVisible);
 
diff --git a/offapi/com/sun/star/drawing/modules.idl b/offapi/com/sun/star/drawing/modules.idl
index dc1ef4a61409..c9c209f4de39 100644
--- a/offapi/com/sun/star/drawing/modules.idl
+++ b/offapi/com/sun/star/drawing/modules.idl
@@ -24,16 +24,15 @@ module com { module sun { module star { module drawing {
 
 /** The drawing framework is responsible for managing the resources used by
     the UI of the drawing applications.
-    The set of active resources is represented by the <type
-    scope="com::sun::star::drawing::framework">XConfiguration</type>.</p>
-    <p>The <type
-    scope="com::sun::star::drawing::framework">XControllerManager</type>
+    The set of active resources is represented by the
+    com::sun::star::drawing::framework::XConfiguration.</p>
+    <p>The com::sun::star::drawing::framework::XControllerManager
     interface provides access to the sub controllers.  It typically is
-    implemented by the same class that implements the <type
-    scope="com::sun::star::frame">XController</type> interface.</p>
+    implemented by the same class that implements the
+    com::sun::star::frame::XController interface.</p>
     <p>The
-    configuration is managed by the <type
-    scope="com::sun::star::drawing::framework">XConfigurationController</type>.
+    configuration is managed by the
+    com::sun::star::drawing::framework::XConfigurationController.
     It coordinates changes to the configuration made by the other sub
     controllers so that
     <ul><li>unnecessary ui updates (flickering) is avoided and</li>
diff --git a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
index 889477019ce3..30752068dffd 100644
--- a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
+++ b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module embed {
 
     <p>
     This service may be represented by a
-    <type scope="com::sun::star::beans" dim="[]">PropertyValue</type>.
+    com::sun::star::beansPropertyValue[].
     Such descriptors will be passed to different functions, included into
     possible load/save processes. Every member of such process can use
     this descriptor and may change it to actualize the information about
diff --git a/offapi/com/sun/star/embed/StorageFactory.idl b/offapi/com/sun/star/embed/StorageFactory.idl
index a395ea2e7c85..71446713ab90 100644
--- a/offapi/com/sun/star/embed/StorageFactory.idl
+++ b/offapi/com/sun/star/embed/StorageFactory.idl
@@ -65,9 +65,7 @@
 
         <dt>parameter 3</dt>
         <dd>
-                  this parameter represents
-                  com::sun::star::uno::Any
-                  containing a sequence of
+                  this parameter represents `any` containing a sequence of
                   com::sun::star::beans::PropertyValue.<br>
                   The parameter can contain entries from
                   com::sun::star::document::MediaDescryptor
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index bbe67f21d6d9..934ba6330eda 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -70,8 +70,8 @@ published service GridControl
         this is what are the container elements for a GridControl.</p>
 
         <p>As the com::sun::star::form::FormComponents service also specifies
-        the <type scope"com::sun::star::script">XEventAttacherManager</type> service, grid control models
-        also provide a scripting environment for their columns.</p>
+        the com::sun::star::script::XEventAttacherManager service, grid control
+        models also provide a scripting environment for their columns.</p>
     */
     service com::sun::star::form::FormComponents;
 
diff --git a/offapi/com/sun/star/formula/SymbolDescriptor.idl b/offapi/com/sun/star/formula/SymbolDescriptor.idl
index a979ca2a4098..0b1ce8e27fd6 100644
--- a/offapi/com/sun/star/formula/SymbolDescriptor.idl
+++ b/offapi/com/sun/star/formula/SymbolDescriptor.idl
@@ -93,7 +93,7 @@ published struct SymbolDescriptor
         @see   com::sun::star::awt::FontSlant
 
         The values
-        <member cope"com::sun::star::awt">FontSlant::REVERSE_OBLIQUE</member> and
+        com::sun::star::awt::FontSlant::REVERSE_OBLIQUE and
         com::sun::star::awt::FontSlant::REVERSE_ITALIC
         may not be used.
     */
diff --git a/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl b/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
index d7e1a46e1018..60568c8620cd 100644
--- a/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
@@ -74,8 +74,7 @@ published interface XExtendedIndexEntrySupplier : ::com::sun::star::i18n::XIndex
             Index algorithm to be loaded.
 
         @param nCollatorOptions
-            Sorting option of <type
-            scope="::com::sun::star::i18n">CollatorOptions</type> for
+            Sorting option of ::com::sun::star::i18n::CollatorOptions for
             comparing index entries
 
         @return
diff --git a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
index 72195f86a1d7..10c315043574 100644
--- a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
@@ -34,9 +34,8 @@ published interface XIndexEntrySupplier : com::sun::star::uno::XInterface
 {
     /**
         returns the capital index key for sorting a table of indexes, to
-        a given index entry, to a given <type
-        scope="com::sun::star::lang">Locale</type> and to a given sort
-        algorithm.
+        a given index entry, to a given com::sun::star::lang::Locale and to a
+        given sort algorithm.
 
         <p> For example, in English locale it returns <b>"K"</b> for
         "keyboard"
diff --git a/offapi/com/sun/star/i18n/XLocaleData3.idl b/offapi/com/sun/star/i18n/XLocaleData3.idl
index b1bfa69b2bd2..e8ab2f0df473 100644
--- a/offapi/com/sun/star/i18n/XLocaleData3.idl
+++ b/offapi/com/sun/star/i18n/XLocaleData3.idl
@@ -20,11 +20,9 @@ module com { module sun { module star { module i18n {
 /**
     Access locale specific data.
 
-    <p> Derived from <type
-    scope="::com::sun::star::i18n">XLocaleData2</type> this provides an
-    additional method to return a sequence of all <type
-    scope="::com::sun::star::i18n">Calendar2</type> elements available
-    for that locale.
+    <p> Derived from ::com::sun::star::i18n::XLocaleData2 this provides an
+    additional method to return a sequence of all
+    ::com::sun::star::i18n::Calendar2 elements available for that locale.
 
     @since LibreOffice 3.5
  */
diff --git a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
index 3c412688e211..028a1697ff51 100644
--- a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
+++ b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
@@ -45,7 +45,7 @@ enum InteractiveSelectionResult
         component.
 
         <p>In this case, the obtained value is passed to the caller of
-        <member>XPropertyHandler::onInteractivePropertySelection<member>, which is
+        XPropertyHandler::onInteractivePropertySelection(), which is
         responsible for forwarding this value to the inspected component.</p>
     */
     ObtainedValue,
diff --git a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
index 4ff7200b2a3a..ab8c9f614e03 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
@@ -53,8 +53,6 @@ published struct DictionaryListEvent : com::sun::star::lang::EventObject
 
     @see    com::sun::star::linguistic2::DictionaryListEventFlags
 
-    <!-- Dennis: Does the <type> tag change the display of its contents -->
-    <!-- Thomas: AFAIK it should translate into a hyperlink or so. -->
     */
     short nCondensedEvent;
 
diff --git a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
index b100dfe205b5..165060fb2d41 100644
--- a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
@@ -32,7 +32,7 @@ published interface XAvailableLocales : com::sun::star::uno::XInterface
 {
     /** retrieve the list of supported languages (Locales).
 
-        @see    <type scope"com::sun::star::linguistic2">XSupportedLocales</type>
+        @see    com::sun::star::linguistic2::XSupportedLocales
 
         @param aServiceName
             the name of the service to get the list of available Locales for.
diff --git a/offapi/com/sun/star/logging/ConsoleHandler.idl b/offapi/com/sun/star/logging/ConsoleHandler.idl
index d811809bc33b..981cac56f2ff 100644
--- a/offapi/com/sun/star/logging/ConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/ConsoleHandler.idl
@@ -52,7 +52,7 @@ service ConsoleHandler : XConsoleHandler
             </ul></p>
 
         @throws ::com::sun::star::lang::IllegalArgumentException
-            if <arg>Settings</args> contains arguments with names other than in the list above, or
+            if `Settings` contains arguments with names other than in the list above, or
             settings whose value is of the wrong type.
     */
     createWithSettings( [in] sequence< ::com::sun::star::beans::NamedValue > Settings )
diff --git a/offapi/com/sun/star/logging/FileHandler.idl b/offapi/com/sun/star/logging/FileHandler.idl
index 611a7d0e883a..3327df30456b 100644
--- a/offapi/com/sun/star/logging/FileHandler.idl
+++ b/offapi/com/sun/star/logging/FileHandler.idl
@@ -68,7 +68,7 @@ service FileHandler : XLogHandler
             <p>At least the URL argument must be present in the settings.</p>
 
         @throws ::com::sun::star::lang::IllegalArgumentException
-            if <arg>Settings</args> contains settings whose value is of the wrong type.
+            if `Settings` contains settings whose value is of the wrong type.
     */
     createWithSettings( [in] sequence< ::com::sun::star::beans::NamedValue > Settings )
         raises ( ::com::sun::star::lang::IllegalArgumentException );
diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index 69b63f80ace5..a379e80150a3 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -34,23 +34,22 @@ module awt {};
     implemented can be found in other modules.  The services in this module
     describe only what every accessible object has to support.</p>
 
-    <p>Making a class accessible starts by supporting the <type
-    scope="::com::sun::star::accessibility">XAccessible</type> interface.
+    <p>Making a class accessible starts by supporting the
+    ::com::sun::star::accessibility::XAccessible interface.
     This interface's only method returns the actual accessibility object, an
-    instance of <type
-    scope="::com::sun::star::accessibility">XAccessibleContext</type>.
+    instance of ::com::sun::star::accessibility::XAccessibleContext.
     These two interfaces may be implemented by the same class in which case
-    a call to <method scope="::com::sun::star::accessibility"
-    >XAccessible::getAccessible</method> returns the same object that is
-    called.  Alternatively the implementation of the <type
-    scope="::com::sun::star::accessibility">XAccessibleContext</type>
+    a call to ::com::sun::star::accessibility::XAccessible::getAccessible()
+    returns the same object that is
+    called.  Alternatively the implementation of the
+    ::com::sun::star::accessibility::XAccessibleContext
     interface can be done by another class.  This makes it possible to put
     all accessibility implementations into their own library which has only
     to be loaded when necessary.</p>
 
     <p>Note that all other interfaces have to be implemented by the same
-    class that implements the <type
-    scope="::com::sun::star::accessibility">XAccessibleContext</type>
+    class that implements the
+    ::com::sun::star::accessibility::XAccessibleContext
     interface.  Note also that there is no way back from an accessibility
     object to the object from which it has been obtained by means of the
     UAA.  If you need such a back-link you have to provide one on your
diff --git a/offapi/com/sun/star/presentation/TextAnimationType.idl b/offapi/com/sun/star/presentation/TextAnimationType.idl
index b7c64209d951..907534cc13a2 100644
--- a/offapi/com/sun/star/presentation/TextAnimationType.idl
+++ b/offapi/com/sun/star/presentation/TextAnimationType.idl
@@ -23,11 +23,11 @@
  module com {  module sun {  module star {  module presentation {
 
 
-/** Defines how a target <type scope=::com::sun::star::text>XTextRange</type>
-    is animated inside an <type scope=::com::sun::star::animations>IterateContainer</type>.
+/** Defines how a target ::com::sun::star::text::XTextRange
+    is animated inside an ::com::sun::star::animations::IterateContainer.
     <br>
     This is stored inside the attribute
-    <member scope=::com::sun::star::animations>IterateContainer::IterateType</member>.
+    ::com::sun::star::animations::IterateContainer::IterateType.
     <br>
     @see ::com::sun::star::animations::IterateContainer
 */
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index e17bbbdcb287..41013ac2e02f 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -55,8 +55,8 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         current slide, a possible slide transition effect is issued
         and the next slide is displayed.<p>
 
-        @return <TRUE>, if the next effect was successfully
-        triggered. This method returns <FALSE>, if there is no show
+        @return `TRUE`, if the next effect was successfully
+        triggered. This method returns `FALSE`, if there is no show
         running, the last effect on the last slide was already
         triggered, or the implementation failed to trigger the next
         effect.
@@ -169,10 +169,10 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         show again (all paused effects start again).<p>
 
         @param bPauseShow
-        When <TRUE>, the show is paused. When <FALSE>, and the show
+        When `TRUE`, the show is paused. When `FALSE`, and the show
         was paused, it starts running at the paused position again.
 
-        @return <TRUE>, if the requested action was successfully
+        @return `TRUE`, if the requested action was successfully
         performed.
      */
     boolean pause( [in] boolean bPauseShow );
@@ -224,8 +224,8 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         @param xView
         The view to add
 
-        @return <TRUE>, if the view has been successfully
-        added. Otherwise, <FALSE> is returned (e.g. if the view is
+        @return `TRUE`, if the view has been successfully
+        added. Otherwise, `FALSE` is returned (e.g. if the view is
         already added).
      */
     boolean addView( [in] XSlideShowView xView );
@@ -239,7 +239,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         @param xView
         View to remove
 
-        @return <TRUE>, if the view was successfully removed, <FALSE>
+        @return `TRUE`, if the view was successfully removed, `FALSE`
         otherwise (e.g. if the view was not added in the first place).
      */
     boolean removeView( [in] XSlideShowView xView );
@@ -260,8 +260,8 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         the return of this method to the next update call. Otherwise,
         the animations might show visible jerks.
 
-        @return <TRUE>, if further update calls are required. If
-        <FALSE> is returned, no further update calls are necessary,
+        @return `TRUE`, if further update calls are required. If
+        `FALSE` is returned, no further update calls are necessary,
         until anyone of the other interface methods is called (most
         notably, the next/previousSlide(), nextEffect() and show()
         methods will nearly always make further update() calls
diff --git a/offapi/com/sun/star/rdf/XQuerySelectResult.idl b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
index 26ebc2d517b1..52df495be2a2 100644
--- a/offapi/com/sun/star/rdf/XQuerySelectResult.idl
+++ b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
@@ -37,7 +37,7 @@ module com {   module sun {   module star {   module rdf {
     </ol>
     Note that each query result retrieved via
     com::sun::star::container::XEnumeration::nextElement()
-    has the type <type dim="[]">XNode</type>,
+    has the type XNode[],
     the length of the sequence being the same as the number of query variables.
     </p>
 
diff --git a/offapi/com/sun/star/rdf/XRepository.idl b/offapi/com/sun/star/rdf/XRepository.idl
index aacf57ded31c..a8cf4652cc18 100644
--- a/offapi/com/sun/star/rdf/XRepository.idl
+++ b/offapi/com/sun/star/rdf/XRepository.idl
@@ -85,8 +85,7 @@ interface XRepository
         Implementations must support RDF/XML format.
         Support for other RDF formats is optional.
         If the format is not supported by the implementation, an
-        <type scope="com::sun::star::datatransfer">UnsupportedFlavorException
-        </type> is raised.
+        com::sun::star::datatransfer::UnsupportedFlavorException is raised.
         If the format requires use of a BaseURI, but none is given, an
         com::sun::star::lang::IllegalArgumentException
         is raised.
@@ -145,8 +144,7 @@ interface XRepository
         Implementations must support RDF/XML format.
         Support for other RDF formats is optional.
         If the format is not supported by the implementation, an
-        <type scope="com::sun::star::datatransfer">UnsupportedFlavorException
-        </type> is raised.
+        com::sun::star::datatransfer::UnsupportedFlavorException is raised.
         </p>
 
         @param Format
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl
index 8206b2ba590d..52b64324c012 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -88,8 +88,7 @@ interface XTextLayout;
     that such caching is a lot more complicated, should the actual
     rendering a method yields depend on internal state (which is the
     case e.g. for the
-    <type
-    scope="::com::sun::star::drawing">::com::sun::star::drawing::XGraphics</type>
+    ::com::sun::star::drawing::::com::sun::star::drawing::XGraphics
     interface).  Please note, though, that deciding whether to return
     an XCachedPrimitive is completely up to the
     implementation - don't rely on the methods returning something
@@ -482,8 +481,8 @@ interface XCanvas : ::com::sun::star::uno::XInterface
             this property is zero. Use negative values for condensed output,
             and positive values for expanded output.</il>
 
-            <il>OptionalLayoutFeatures: a sequence of <type
-            scope=::com::sun::star::beans>PropertyValue</type> listing
+            <il>OptionalLayoutFeatures: a sequence of
+            ::com::sun::star::beans::PropertyValue listing
             font-specific optional layout features, like glyph
             variants.</il>
 
diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl
index af6e1033f8dd..bd7363bbe6a6 100644
--- a/offapi/com/sun/star/rendering/XColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XColorSpace.idl
@@ -99,8 +99,8 @@ interface XColorSpace
         possible.
 
         @return the corresponding sequence of device colors in the
-        target color space (e.g. <type>sequence<double></type> or
-        <type>sequence<byte></type>).
+        target color space (e.g. `sequence<double>` or
+        `sequence<byte>`).
 
         @throws a
         com::sun::star::lang::IllegalArgumentException,
diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index b3ae86908176..b2752c078220 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -190,8 +190,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         getAvailableServiceNames() on the returned interface):
 
         - Gradients - all gradients need to support two construction
-          parameters, "Colors" being a <type>sequence<Color></type>
-          and "Stops" being a <type>sequence<double></type>. Both must
+          parameters, "Colors" being a `sequence<Color>`
+          and "Stops" being a `sequence<double>`. Both must
           have the same length, and at least two elements. See
           http://www.w3.org/TR/SVG11/pservers.html#GradientStops for
           the semantics of gradient stops and colors.
diff --git a/offapi/com/sun/star/resource/XStringResourcePersistence.idl b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
index eff8f275866c..6aa3a39630f7 100644
--- a/offapi/com/sun/star/resource/XStringResourcePersistence.idl
+++ b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
@@ -60,7 +60,7 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
 
         This method can throw all exceptions thrown by the methods of
         com::sun::star::embed::XStorage respectively
-        a <type scope="com::sun::star::ucb">CommandAbortedException in
+        a com::sun::star::ucb::CommandAbortedException in
         case of a StringResourceWithLocation for all exceptions that are
         not handled by a previously specified
         com::sun::star::task::XInteractionHandler.
diff --git a/offapi/com/sun/star/script/vba/VBAScriptEvent.idl b/offapi/com/sun/star/script/vba/VBAScriptEvent.idl
index 8c755b0128ad..4576ec2fe132 100644
--- a/offapi/com/sun/star/script/vba/VBAScriptEvent.idl
+++ b/offapi/com/sun/star/script/vba/VBAScriptEvent.idl
@@ -26,9 +26,9 @@
 module com {  module sun {  module star { module script { module vba {
 
 
-/** Describes a VBA script event fired via <member>XVBACompatibility::
-    broadcastVBAScriptEvent</member>, and received by <member>
-    XVBAScriptListener::notifyVBAScriptEvent</member>.
+/** Describes a VBA script event fired via
+    XVBACompatibility::broadcastVBAScriptEvent(), and received by
+    XVBAScriptListener::notifyVBAScriptEvent().
 
     @see XVBACompatibility
     @see XVBAScriptListener
diff --git a/offapi/com/sun/star/script/vba/VBAScriptEventId.idl b/offapi/com/sun/star/script/vba/VBAScriptEventId.idl
index a3a3bcebe7f3..e2c89c84ad93 100644
--- a/offapi/com/sun/star/script/vba/VBAScriptEventId.idl
+++ b/offapi/com/sun/star/script/vba/VBAScriptEventId.idl
@@ -24,9 +24,9 @@
 module com {  module sun {  module star { module script { module vba {
 
 
-/** Identifies a VBA script event fired via <member>XVBACompatibility::
-    broadcastVBAScriptEvent</member>, and received by <member>
-    XVBAScriptListener::notifyVBAScriptEvent</member>.
+/** Identifies a VBA script event fired via
+    XVBACompatibility::broadcastVBAScriptEvent(), and received by
+    XVBAScriptListener::notifyVBAScriptEvent().
 
     @see VBAScriptEvent
     @see XVBACompatibility
@@ -40,8 +40,8 @@ constants VBAScriptEventId
         <p>Several scripts may run simultaneously, e.g. when a running script
         triggers a document event that starts another script.</p>
 
-        <p>The number of running scripts can be obtained via <member>
-        XVBACompatibility::RunningVBAScripts</member>. The number returned
+        <p>The number of running scripts can be obtained via
+        XVBACompatibility::RunningVBAScripts. The number returned
         there will already contain the new script notified with this event.</p>
 
         <p>The member VBAScriptEvent::ModuleName of the event
@@ -56,8 +56,8 @@ constants VBAScriptEventId
         <p>Several scripts may run simultaneously, e.g. when a running script
         triggers a document event that starts another script.</p>
 
-        <p>The number of scripts still running can be obtained via <member>
-        XVBACompatibility::RunningVBAScripts</member>. The number returned
+        <p>The number of scripts still running can be obtained via
+        XVBACompatibility::RunningVBAScripts. The number returned
         there will not contain the stopped script notified with this event
         anymore.</p>
 
diff --git a/offapi/com/sun/star/sdb/DataSource.idl b/offapi/com/sun/star/sdb/DataSource.idl
index cfca81e7f788..690968053fae 100644
--- a/offapi/com/sun/star/sdb/DataSource.idl
+++ b/offapi/com/sun/star/sdb/DataSource.idl
@@ -125,9 +125,9 @@ published service DataSource
         <ul><li>Upon creating a connection, for every value in this sequence it's checked
                 whether the com::sun::star::sdbc::XDriver which is to provide
                 the connection supports a setting with the respective name, using its
-                <member scope="com::sun::star::sdbc">XDriver::getPropertyInfo<member> method.br/>
+                com::sun::star::sdbc::XDriver::getPropertyInfo() method.br/>
                 If so, the settings is passed to the driver's
-                <member scope="com::sun::star::sdbc">XDriver::connect<member> method. If not,
+                com::sun::star::sdbc::XDriver::connect() method. If not,
                 the setting is ignored.</li>
             <li>External components may use the settings to carry arbitrary information with
                 the data source. Usually, this is used to control the behavior of components
diff --git a/offapi/com/sun/star/sdb/DataSourceBrowser.idl b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
index 452d90827334..bef25142202a 100644
--- a/offapi/com/sun/star/sdb/DataSourceBrowser.idl
+++ b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
@@ -33,9 +33,7 @@ module com {  module sun {  module star {  module sdb {
 
     <p>
     This service implements a user interface for browsing data sources registered on the
-    <type scope="com::sun::star::sdb">
-    DatabaseContext
-    </type>
+    com::sun::star::sdb::DatabaseContext
     instance of the system.
     </p>
 
@@ -49,9 +47,7 @@ module com {  module sun {  module star {  module sdb {
     Usually, you won't instantiate this service directly, instead you use the dispatch mechanisms
     of the application framework to load the URL <b>.component:DB/DataSourceBrowser</b> into an arbitrary
     frame. This should involve a
-    <type scope="com::sun::star::sdb">
-    ContentLoader
-    </type>
+    com::sun::star::sdb::ContentLoader
     service, which creates and initializes
     the browser.
     </p>
diff --git a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
index 50f9a51cc713..58481e7ac7c0 100644
--- a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
+++ b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
@@ -33,9 +33,7 @@ module com {  module sun {  module star {  module sdb {
     <p>
     Here, <em>system wide registered</em> means registered on the (one and only) instance
     of the
-    <type scope="com::sun::star::sdb">
-    DatabaseContext
-    </type>
+    com::sun::star::sdb::DatabaseContext
     service.
     </p>
 */
@@ -91,9 +89,7 @@ published service DatasourceAdministrationDialog
             <li><b>InitialSelection</b><br/>
                 String or XDataSource describing which data source should be selected initially.
                 This String name must be known to the
-                <type scope="com::sun::star::sdb">
-                DatabaseContext
-                </type>
+                com::sun::star::sdb::DatabaseContext
                 .
             </li>
         </ul>
diff --git a/offapi/com/sun/star/sdb/Document.idl b/offapi/com/sun/star/sdb/Document.idl
index f343f99a163e..6e57208604bf 100644
--- a/offapi/com/sun/star/sdb/Document.idl
+++ b/offapi/com/sun/star/sdb/Document.idl
@@ -27,11 +27,7 @@ module com { module sun { module star { module sdb {
 
     <p>
     These documents typically process information from a connected
-    data source. A
-    <type>
-    Document
-    </type>
-    could be a form or a report.
+    data source. A Document could be a form or a report.
 
 @deprecated
 */
diff --git a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
index 80c1a9caeb11..4ca3ca574646 100644
--- a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
+++ b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
@@ -73,8 +73,7 @@ published service ErrorMessageDialog : com::sun::star::ui::dialogs::XExecutableD
         you want to affect, and the <em>Value</em> field containing a value.
         <br/>
         Imagine the initialization values, as if you use
-        <method scope="com::sun::star::beans">XPropertySet::setPropertyValue()
-        </method>
+        com::sun::star::beans">XPropertySet::setPropertyValue()
          of the
         com::sun::star::beans::XPropertySet
         interface ...
diff --git a/offapi/com/sun/star/sdb/XDatabaseContext.idl b/offapi/com/sun/star/sdb/XDatabaseContext.idl
index fece3081ab4f..b163342752ec 100644
--- a/offapi/com/sun/star/sdb/XDatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseContext.idl
@@ -40,8 +40,9 @@ published interface XDatabaseContext
     interface com::sun::star::container::XEnumerationAccess;
 
     /** NameAccess on all registered data sources.
-        <p>One exception is the <method "com.sun.star.container.XNameAccess">getByName</method>, this method also allows to ask
-        for a <member "DataAccessDescriptor">DatabaseLocation</member>.
+        <p>One exception is the com.sun.star.container.XNameAccess::getByName().
+        This method also allows to ask
+        for a DataAccessDescriptor::DatabaseLocation.
         </p>
      */
     interface com::sun::star::container::XNameAccess;
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index 1ed998867845..3750698cfc6a 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -80,7 +80,7 @@ interface XConnectionTools
         <ul><li>a SDB-level connection (com.sun.star.sdb::Connection</li>
             <li>a string specifying the name of an object relative to the connection</li>
             <li>a com.sun.star.sdb::CommandType value specifying the type
-                of the object</type></li>
+                of the object</li>
         </ul>
         </p>
 
diff --git a/offapi/com/sun/star/sdbc/ColumnSearch.idl b/offapi/com/sun/star/sdbc/ColumnSearch.idl
index 513c184b0b4f..27fd9772d559 100644
--- a/offapi/com/sun/star/sdbc/ColumnSearch.idl
+++ b/offapi/com/sun/star/sdbc/ColumnSearch.idl
@@ -30,7 +30,7 @@ published constants ColumnSearch
     /** A possible value for column <code>SEARCHABLE</code> in the
              com::sun::star::sdbc::XResultSet
              object returned by the method
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getTypeInfo()
              .
              <p>
              Indicates that
@@ -43,7 +43,7 @@ published constants ColumnSearch
     /** A possible value for column <code>SEARCHABLE</code> in the
              com::sun::star::sdbc::XResultSet
              object returned by the method
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getTypeInfo()
              .
              <p>
              Indicates that the only
@@ -58,7 +58,7 @@ published constants ColumnSearch
     /** A possible value for column <code>SEARCHABLE</code> in the
              com::sun::star::sdbc::XResultSet
              object returned by the method
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member>
+             com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()
              .
              <p>
              Indicates that one can base all
@@ -75,7 +75,7 @@ published constants ColumnSearch
             in the
             com::sun::star::sdbc::XResultSet
             object returned by the method
-            <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member>
+            com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()
             .
             <p>
             Indicates that all
diff --git a/offapi/com/sun/star/sdbc/ColumnType.idl b/offapi/com/sun/star/sdbc/ColumnType.idl
index 03228ac173e2..7dfd8dc6b419 100644
--- a/offapi/com/sun/star/sdbc/ColumnType.idl
+++ b/offapi/com/sun/star/sdbc/ColumnType.idl
@@ -34,7 +34,7 @@ published constants ColumnType
              com::sun::star::sdbc::XResultSet
              object
              returned by the method
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getVersionColumns()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getVersionColumns()
              .
      */
     const long UNKNOWN  = 0;
@@ -58,7 +58,7 @@ published constants ColumnType
              com::sun::star::sdbc::XResultSet
              object
              returned by the method
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getVersionColumns()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getVersionColumns()
              .
      */
     const long PSEUDO   = 2;
diff --git a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
index 0bf18a2524ef..2b94cb5e1356 100644
--- a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
@@ -48,9 +48,8 @@ service JDBCConnectionProperties
     */
     [optional, property] string JavaDriverClass;
 
-    /** an optional class path to locate the <member
-        scope="com::sun::star::sdbc">JDBCConnectionProperties::JavaDriverClass
-        </member>.
+    /** an optional class path to locate the
+        com::sun::star::sdbc::JDBCConnectionProperties::JavaDriverClass
 
         <p>The class path is a list of zero or more internal (see the
         com::sun::star::uri::ExternalUriReferenceTranslator
diff --git a/offapi/com/sun/star/sdbc/KeyRule.idl b/offapi/com/sun/star/sdbc/KeyRule.idl
index 1c6529f13281..3e886bb5a6eb 100644
--- a/offapi/com/sun/star/sdbc/KeyRule.idl
+++ b/offapi/com/sun/star/sdbc/KeyRule.idl
@@ -34,12 +34,12 @@ published constants KeyRule
             in the
             com::sun::star::sdbc::XResultSet
              objects returned by the methods
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getImportedKeys()
              ,
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getExportedKeys()
              ,
              and
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getCrossReference()
              .
              <P>
              For the column
@@ -67,12 +67,12 @@ published constants KeyRule
             in the
              com::sun::star::sdbc::XResultSet
              objects returned by the methods
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getImportedKeys()
              ,
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getExportedKeys()
              ,
              and
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getCrossReference()
              .
              <P>
              For the column
@@ -98,12 +98,12 @@ published constants KeyRule
             in the
              com::sun::star::sdbc::XResultSet
               objects returned by the methods
-            <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
+            com::sun::star::sdbc::XDatabaseMetaData::getImportedKeys()
              ,
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getExportedKeys()
              ,
              and
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getCrossReference()
              .
              <P>
              For the columns
@@ -125,12 +125,12 @@ published constants KeyRule
              in the
              com::sun::star::sdbc::XResultSet
              objects returned by the methods
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getImportedKeys()
              ,
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getExportedKeys()
              ,
              and
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getCrossReference()
              .
              <P>
              For the columns
@@ -150,12 +150,12 @@ published constants KeyRule
             in the
              com::sun::star::sdbc::XResultSet
              objects returned by the methods
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getImportedKeys()
              ,
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getExportedKeys()
              ,
              and
-             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::getCrossReference()
              .
              <P>
              For the columns
diff --git a/offapi/com/sun/star/sdbc/PreparedStatement.idl b/offapi/com/sun/star/sdbc/PreparedStatement.idl
index 57bcc5f204e3..d35d0bbfedd0 100644
--- a/offapi/com/sun/star/sdbc/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/PreparedStatement.idl
@@ -128,7 +128,7 @@ published service PreparedStatement
              A driver implementing batch execution must return
              `TRUE`
              for
-             <member scope= "com::sun::star::sdbc">XDatabaseMetaData::supportsBatchUpdates()</member>
+             com::sun::star::sdbc::XDatabaseMetaData::supportsBatchUpdates()
              </p>
      */
     [optional] interface XPreparedBatchExecution;
@@ -157,18 +157,18 @@ published service PreparedStatement
               <p>
               This limit is the maximum number of bytes that can be returned
               for any column value. The limit applies only to
-              <member scope= "com::sun::star::sdbc">DataType::BINARY</member>
+              com::sun::star::sdbc::DataType::BINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::VARBINARY</member>
+              com::sun::star::sdbc::DataType::VARBINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::LONGVARBINARY</member>
+              com::sun::star::sdbc::DataType::LONGVARBINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::CHAR</member>
+              com::sun::star::sdbc::DataType::CHAR
               ,
-              <member scope= "com::sun::star::sdbc">DataType::VARCHAR</member>
+              com::sun::star::sdbc::DataType::VARCHAR
               ,
               and
-              <member scope= "com::sun::star::sdbc">DataType::LONGVARCHAR</member>
+              com::sun::star::sdbc::DataType::LONGVARCHAR
               columns.
               If the limit is exceeded, the excess data is silently discarded.
               </p>
diff --git a/offapi/com/sun/star/sdbc/RowSet.idl b/offapi/com/sun/star/sdbc/RowSet.idl
index 309c1bda42c7..f8b9183688e9 100644
--- a/offapi/com/sun/star/sdbc/RowSet.idl
+++ b/offapi/com/sun/star/sdbc/RowSet.idl
@@ -121,18 +121,18 @@ published service RowSet
         <p>
         This limit is the maximum number of bytes that can be returned
         for any column value. The limit applies only to
-        <member scope= "com::sun::star::sdbc">DataType::BINARY</member>
+        com::sun::star::sdbc::DataType::BINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::VARBINARY</member>
+              com::sun::star::sdbc::DataType::VARBINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::LONGVARBINARY</member>
+              com::sun::star::sdbc::DataType::LONGVARBINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::CHAR</member>
+              com::sun::star::sdbc::DataType::CHAR
               ,
-              <member scope= "com::sun::star::sdbc">DataType::VARCHAR</member>
+              com::sun::star::sdbc::DataType::VARCHAR
               ,
               and
-              <member scope= "com::sun::star::sdbc">DataType::LONGVARCHAR</member>
+              com::sun::star::sdbc::DataType::LONGVARCHAR
               columns.
         If the limit is exceeded, the excess data is silently discarded.
         <br/>
diff --git a/offapi/com/sun/star/sdbc/Statement.idl b/offapi/com/sun/star/sdbc/Statement.idl
index e49728cae380..77e598dfb7df 100644
--- a/offapi/com/sun/star/sdbc/Statement.idl
+++ b/offapi/com/sun/star/sdbc/Statement.idl
@@ -79,7 +79,7 @@ published service Statement
              A driver implementing batch execution must return
              `TRUE`
              for
-             <member scope= "com::sun::star::sdbc"> XDatabaseMetaData::supportsBatchUpdates()</member>
+             com::sun::star::sdbc:: XDatabaseMetaData::supportsBatchUpdates()
              </p>
      */
     [optional] interface XBatchExecution;
@@ -110,18 +110,18 @@ published service Statement
         <p>
         This limit is the maximum number of bytes that can be returned
         for any column value. The limit applies only to
-        <member scope= "com::sun::star::sdbc">DataType::BINARY</member>
+        com::sun::star::sdbc::DataType::BINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::VARBINARY</member>
+              com::sun::star::sdbc::DataType::VARBINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::LONGVARBINARY</member>
+              com::sun::star::sdbc::DataType::LONGVARBINARY
               ,
-              <member scope= "com::sun::star::sdbc">DataType::CHAR</member>
+              com::sun::star::sdbc::DataType::CHAR
               ,
-              <member scope= "com::sun::star::sdbc">DataType::VARCHAR</member>
+              com::sun::star::sdbc::DataType::VARCHAR
               ,
               and
-              <member scope= "com::sun::star::sdbc">DataType::LONGVARCHAR</member>
+              com::sun::star::sdbc::DataType::LONGVARCHAR
               columns.
         If the limit is exceeded, the excess data is silently discarded.
         <br/>
diff --git a/offapi/com/sun/star/sdbc/XArray.idl b/offapi/com/sun/star/sdbc/XArray.idl
index e6694dc3c5f3..f55faae9c13b 100644
--- a/offapi/com/sun/star/sdbc/XArray.idl
+++ b/offapi/com/sun/star/sdbc/XArray.idl
@@ -33,7 +33,7 @@
 
 
 /** is used for mapping the SQL type
-    <member scope= "com::sun::star::sdbc">DataType::ARRAY</member>
+    com::sun::star::sdbc::DataType::ARRAY
     .
     By default, an
     <code>Array</code>
diff --git a/offapi/com/sun/star/sdbcx/XAuthorizable.idl b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
index decadbcfe011..031d59adcaae 100644
--- a/offapi/com/sun/star/sdbcx/XAuthorizable.idl
+++ b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
@@ -36,8 +36,7 @@ published interface XAuthorizable: com::sun::star::uno::XInterface
         @param objName
             the name of the object
         @param objType
-            a value of
-            <type scope="com::sun::star::sdbcx">PrivilegeObject</Type>
+            a value of com::sun::star::sdbcx::PrivilegeObject
         @returns
             the privileges
         @throws com::sun::star::sdbc::SQLException
@@ -51,8 +50,7 @@ published interface XAuthorizable: com::sun::star::uno::XInterface
         @param objName
             the name of the object
         @param objType
-            a value of
-            <type scope="com::sun::star::sdbcx">PrivilegeObject</Type>
+            a value of com::sun::star::sdbcx::PrivilegeObject
         @returns
             the grant privileges
         @throws com::sun::star::sdbc::SQLException
diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl
index a830e588f46a..fd5c4fe193f0 100644
--- a/offapi/com/sun/star/sheet/AccessibleCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCell.idl
@@ -40,52 +40,48 @@ service AccessibleCell
 
     <ul>
         <li>The parent returned by
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleParent</method>
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
             is the accessible spreadsheet.</li>
         <li>This object has no children.</li>
         <li>The description is ???.</li>
         <li>The name is something like A10 or B23 or so on.</li>
-        <li>The role is <const scope="::com::sun::star::accessibility"
-            >AccessibleRole::TABLE_CELL</const></li>
+        <li>The role is
+            ::com::sun::star::accessibility::AccessibleRole::TABLE_CELL</li>
         <li>There are relations between the cell and the shapes with an anchor
             on this cell.</li>
         <li>The following states are supported:
             <ul>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::DEFUNC</const> is always false if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                    is always false if the
                     parent table is showed, otherwise it is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is false if the cell
+                <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    is false if the cell
                     or the table is protected, otherwise it is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::ENABLED</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTILINE</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTISELECTABLE</const> is always
-                    true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::OPAQUE</const> is false if the cell
+                <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTILINE
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTISELECTABLE
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    is false if the cell
                     has no background color or graphic, otherwise it is
                     true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::RESIZEABLE</const> is false if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::RESIZEABLE
+                    is false if the
                     table is protected, otherwise is it true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTABLE</const> is always
-                    true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTED</const> is true, if the
-                    cell is selected.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::TRANSIENT</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED
+                    is true, if the cell is selected.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::TRANSIENT
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    is true if the
                     Bounding Box lies in Bounding Box of the parent. Otherwise
                     it is false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::VISIBLE</const>Is false if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                    is false if the
                     column/row with this cell is filtered or hidden.
                     Otherwise is true.</li>
             </ul>
diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
index 0ac6227c1d2b..4a3ccdf0428c 100644
--- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
+++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
@@ -38,22 +38,21 @@ service AccessiblePageHeaderFooterAreasView
         page preview.
 
     <ul>
-        <li>The parent returned by <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleParent</method>
+        <li>The parent returned by
+        ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
             is the accessible spreadsheet page preview.</li>
         <li>The children returned by
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleChild</method> all
-            support the interface
-            <type scope="::com::sun::star::accessibility">XAccessible</type.
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+            all support the interface
+            ::com::sun::star::accessibility::XAccessible.
             Calling
-            <method scope="::com::sun::star::accessibility"
-            >XAccessible::getAccessibleContext</method> for these children
+            ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+            for these children
             returns an object that supports one of the following services.</li>
         <ul>
             <li>::com::sun::star::text::AccessibleHeaderFooterView:
-                A child where calling <method scope="::com::sun::star::text"
-                >XAccessibleContext::getAccessibleChild</method>
+                A child where calling
+                ::com::sun::star::text::XAccessibleContext::getAccessibleChild()
                 an object that supports this service is returned for
                 every header and footer that is at least partially visible.</li>
         </ul>
@@ -64,50 +63,47 @@ service AccessiblePageHeaderFooterAreasView
         </ul>
         <li>The description is ???.</li>
         <li>The name is Header or Footer respectively.</li>
-        <li>The role is <const scope="::com::sun::star::accessibility"
-            >AccessibleRole::HEADER</const> or
-            <const scope="::com::sun::star::accessibility"
-            >AccessibleRole::FOOTER</const>.</li>
+        <li>The role is ::com::sun::star::accessibility::AccessibleRole::HEADER
+            or ::com::sun::star::accessibility::AccessibleRole::FOOTER.</li>
         <li>There are no relations.</li>
         <li>The following states are supported:
             <ul>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::DEFUNC</const> is always false until
-                    the preview is closed.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is always false,
+                <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                    is always false until the preview is closed.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    is always false,
                     because the document is not editable in the page preview.
                     So it is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::ENABLED</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTILINE</const> makes no sense on
+                <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTILINE
+                    makes no sense on
                     a document and so it is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTISELECTABLE</const> is always
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTISELECTABLE
+                    is always
                     false, because in a page preview a selection is not
                     possible. So it is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::OPAQUE</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::RESIZEABLE</const> is always false,
+                <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::RESIZEABLE
+                    is always false,
                     because you can resize the window of the page preview, but
                     not the page preview itself. So it is left out of the
                     list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTABLE</const> is always false,
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                    is always false,
                     because in the page preview is no selection possible. So it
                     is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTED</const> is always false,
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED
+                    is always false,
                     because in the page preview is no selection possible. So it
                     is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    is true if the
                     Bounding Box lies in the Bounding Box of the parent.
                     Otherwise it is false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::VISIBLE</const>Is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                    is always true.</li>
             </ul>
         </li>
     </ul>
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index a9623635f448..bf23bd1f4368 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -39,20 +39,19 @@ service AccessibleSpreadsheet
         on the desktop.
 
     <ul>
-        <li>The parent returned by <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleParent</method>
+        <li>The parent returned by
+        ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
             is the accessible spreadsheet document view.</li>
-        <li>The children returned by <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleChild</method> all
-            support the interface XAccessible. Calling
-            <method scope="::com::sun::star::accessibility"
-            >XAccessible::getAccessibleContext</method> for these children
+        <li>The children returned by
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+            all support the interface XAccessible. Calling
+            ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+            for these children
             returns an object that supports the following service.</li>
         <ul>
             <li>::com::sun::star::sheet::AccessibleCell:
                 A child where calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method>
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
                 an object that supports this service is returned for
                 every cell in this table.</li>
         </ul>
@@ -66,41 +65,37 @@ service AccessibleSpreadsheet
         </ul>
         <li>The description is ???.</li>
         <li>The name is the given table name.</li>
-        <li>The role is <const scope="::com::sun::star::accessibility"
-            >AccessibleRole::TABLE</const></li>
+        <li>The role is ::com::sun::star::accessibility::AccessibleRole::TABLE
+            </li>
         <li>There are relations between the table and the shapes with an anchor
             on this table (not with an anchor on a cell in this table).</li>
         <li>The following states are supported:
             <ul>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::DEFUNC</const> is always false if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                    is always false if the
                     table is not deleted and the document is open, otherwise it
                     is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is false if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    is false if the
                     table is protected, otherwise it is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::ENABLED</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTI_SELECTABLE</const> is always
-                    true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::OPAQUE</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::RESIZEABLE</const>is always
-                    false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTABLE</const> is always
-                    true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTED</const> is true if the
-                    complete table (all cells) is selected.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::RESIZEABLE
+                    is always false.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED
+                    is true if the complete table (all cells) is selected.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    is true if the
                     Bounding Box lies in the Bounding Box of the parent.
                     Otherwise it is false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::VISIBLE</const>Is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                    is always true.</li>
             </ul>
         </li>
     </ul>
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index e58cfaa32d95..74c33bc30b37 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -39,35 +39,30 @@ service AccessibleSpreadsheetPageView
 
     <ul>
         <li>The parent returned by
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleParent</method>
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
             is the window which contains the view of these page preview.</li>
         <li>The children returned by
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleChild</method> all
-            support the interface XAccessible. Calling
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleContext</method> for these children returns
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+            all support the interface XAccessible. Calling
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleContext()
+            for these children returns
             an object that supports one of the following services.</li>
         <ul>
-            <li><type scope="::com::sun::star::sheet"
-                >AccessiblePageHeaderFooterAreasView</type>: A child where calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method>
+            <li>::com::sun::star::sheet::AccessiblePageHeaderFooterAreasView:
+                A child where calling
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
                 an object that supports this service is returned for
                 every header and footer that is at least partially visible.</li>
             <li>::com::sun::star::table::AccessibleTableView:
                 A child where calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleChild::getAccessibleChild</method>
+                ::com::sun::star::accessibility::XAccessibleChild::getAccessibleChild()
                 an object that supports this service is returned for
                 every table fragment that is contained in the document body
                 and is at least partially visible. A table fragment is the
                 part of a table that is displayed on a certain page.</li>
             <li>::com::sun::star::drawing::AccessibleShape:
                 A child where calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method>
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
                 an object that supports this service is returned
                 for every shape that is at least partially visible. These
                 objects are children of the
@@ -75,8 +70,7 @@ service AccessibleSpreadsheetPageView
                 whether they are bound to a table or a cell.</li>
             <li>::com::sun::star::text::AccessibleParagraphView:
                 A child where calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method>
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
                 an object that supports this service is returned for
                 every note (its paragraphs) and its location (which is
                 represented as a paragraph with the cell name as content).</li>
@@ -101,48 +95,46 @@ service AccessibleSpreadsheetPageView
         </ul>
         <li>The description is ???.</li>
         <li>The name is Spreadsheet Document Page Preview.</li>
-        <li>The role is <const scope="::com::sun::star::accessibility"
-            >AccessibleRole::DOCUMENT</const></li>
+        <li>The role is
+            ::com::sun::star::accessibility::AccessibleRole::DOCUMENT</li>
         <li>There are no relations.</li>
         <li>The following states are supported:
             <ul>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::DEFUNC</const> is always false until
-                    the preview is closed.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is always false,
+                <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                    is always false until the preview is closed.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    is always false,
                     because the document is not editable in the page preview.
                     So it is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::ENABLED</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTILINE</const> makes no sense on a
+                <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTILINE
+                    makes no sense on a
                     document and so it is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTI_SELECTABLE</const> is always
-                    false, because in a page preview a selection is not
-                    possible. So it is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::OPAQUE</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::RESIZEABLE</const> is always false,
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+                    is always false, because in a page preview a selection is
+                    not possible. So it is left out of the list.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::RESIZEABLE
+                    is always false,
                     because you can resize the window of the page preview, but
                     not the page preview itself. So it is left out of the
                     list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTABLE</const> is always false,
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                    is always false,
                     because in the page preview is no selection possible. So
                     it is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTED</const> is always false,
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED
+                    is always false,
                     because in the page preview is no selection possible. So
                     it is left out of the list.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    is true if the
                     Bounding Box lies in the Bounding Box of the parent.
                     Otherwise it is false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::VISIBLE</const>Is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                    is always true.</li>
             </ul>
         </li>
     </ul>
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
index d6a8dc66c4f9..a80d252f5f79 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
@@ -76,27 +76,26 @@ published service DataPilotFieldGroup
         interfaces can be used to manage the members that this group contains.
         It is possible to insert, remove, and replace members.</p>
 
-        <p>The method <member scope="com::sun::star::container">
-        XNameReplace::replaceByName</member> can be used to rename the
+        <p>The method com::sun::star::container::XNameReplace::replaceByName
+        can be used to rename the
         specified member. To do so, the new name has to be passed as second
         argument. An implementation should support the following data types:
 
         <ul>
         <li>a non-empty `string` specifying the new name of the
         group member.</li>
-        <li>an object supporting the <type scope="com::sun::star::container">
-        XNamed</type> interface, for example an instance of
+        <li>an object supporting the com::sun::star::container::XNamed
+        interface, for example an instance of
         DataPilotFieldGroupItem received from another group.</li>
         </ul></p>
 
-        <p>The method <member scope="com::sun::star::container">
-        XNameContainer::insertByName</member> can be used to insert a new
+        <p>The method com::sun::star::container::XNameContainer::insertByName()
+        can be used to insert a new
         member into this field group. An implementation should ignore the
         second argument and insert the specified member name.</p>
 
-        <p>The method <member scope="com::sun::star::container">
-        XNameContainer::removeByName</member> can be used to remove an
-        existing member name.</p>
+        <p>The method com::sun::star::container::XNameContainer::removeByName()
+        can be used to remove an existing member name.</p>
      */
     [optional] interface com::sun::star::container::XNameContainer;
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
index f1376ba83aab..0c0bf251eef0 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
@@ -76,8 +76,8 @@ published constants DataPilotFieldGroupBy
         2002-Jan-03 00:00:00 through 2002-Jan-09 23:59:59.</li>
         </ul></p>
 
-        <p>See descriptions for <member>XDataPilotFieldGrouping::createDateGroup
-        </member> for more details about day grouping.</p>
+        <p>See descriptions for XDataPilotFieldGrouping::createDateGroup()
+        for more details about day grouping.</p>
      */
     const long DAYS = 8;
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
index 6ed967dd3527..1ec91ac4ef1d 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
@@ -69,24 +69,24 @@ published struct DataPilotFieldGroupInfo
         more flags from DataPilotFieldGroupBy, grouping is
         performed on date or time.</li>
         <li>If `TRUE` is set, #Step contains a value greater
-        than or equal to 1, and #GroupBy set to <const>
-        DataPilotFieldGroupBy::DAYS</const>, grouping is performed on ranges
-        of days (see descriptions for <member>
-        XDataPilotFieldGrouping::createDateGroup</member> for more details
+        than or equal to 1, and #GroupBy set to
+        DataPilotFieldGroupBy::DAYS, grouping is performed on ranges
+        of days (see descriptions for
+        XDataPilotFieldGrouping::createDateGroup() for more details
         about day grouping).</li>
         </ul></p>
      */
     boolean HasDateValues;
 
 
-    /** specifies the start value for the grouping if <member>HasAutoStart
-        </member> is set to `FALSE`.
+    /** specifies the start value for the grouping if #HasAutoStart
+        is set to `FALSE`.
      */
     double Start;
 
 
-    /** specifies the end value for the grouping if <member>HasAutoEnd
-        </member> is set to `FALSE`.
+    /** specifies the end value for the grouping if #HasAutoEnd
+        is set to `FALSE`.
      */
     double End;
 
@@ -119,8 +119,8 @@ published struct DataPilotFieldGroupInfo
 
     /** specifies the named groups in this field if there are some.
 
-        <p>The returned object is an instance of <type>DataPilotFieldGroups
-        </type>. The collection of groups can be modified by inserting,
+        <p>The returned object is an instance of DataPilotFieldGroups
+        . The collection of groups can be modified by inserting,
         removing, replacing, or renaming single groups or item names in the
         groups. When writing back this struct containing such a changed
         collection of groups to the DataPilotField::GroupInfo
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
index 1b1ca66e13fe..5065d353d2ed 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
@@ -67,33 +67,31 @@ published service DataPilotFieldGroups
         interfaces can be used to manage the item groups. It is possible to
         insert, remove, and replace item groups.</p>
 
-        <p>The method <member scope="com::sun::star::container">
-        XNameReplace::replaceByName</member> can be used to replace the item
+        <p>The method com::sun::star::container::XNameReplace::replaceByName()
+        can be used to replace the item
         names in an existing group with a new collection of item names. An
         implementation should support the following data types:
 
         <ul>
         <li>an empty `any` to remove all items and leave the
         group empty. The group can be filled later with new item names.</li>
-        <li>a <atom dim="[]">string</atom> containing all item names that will
+        <li>a `string[]` containing all item names that will
         be part of the group.</li>
-        <li>an object supporting <type scope="com::sun::star::container">
-        XIndexAccess</type> containing elements that provide an item name per
-        element via the interface <type scope="com::sun::star::container">
-        XNamed</type>, for example an instance of <type>DataPilotFieldGroup
-        </type>.</li>
+        <li>an object supporting com::sun::star::container::XIndexAccess
+        containing elements that provide an item name per element via the
+        interface com::sun::star::container::XNamed,
+        for example an instance of DataPilotFieldGroup.</li>
         </ul></p>
 
-        <p>The method <member scope="com::sun::star::container">
-        XNameContainer::insertByName</member> can be used to insert a new
+        <p>The method com::sun::star::container::XNameContainer::insertByName()
+        can be used to insert a new
         field group with the passed collection of item names. An
         implementation should support the same data types as described above
-        for the method <member scope="com::sun::star::container">
-        XNameReplace::replaceByName</member>.</p>
+        for the method
+        com::sun::star::container::XNameReplace::replaceByName().</p>
 
-        <p>The method <member scope="com::sun::star::container">
-        XNameContainer::removeByName</member> can be used to remove an
-        existing field group.</p>
+        <p>The method com::sun::star::container::XNameContainer::removeByName()
+        can be used to remove an existing field group.</p>
      */
     [optional] interface com::sun::star::container::XNameContainer;
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldReferenceType.idl b/offapi/com/sun/star/sheet/DataPilotFieldReferenceType.idl
index 9fe394f35888..c312f42f55af 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldReferenceType.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldReferenceType.idl
@@ -62,8 +62,10 @@ constants DataPilotFieldReferenceType
 
     <p>Empty results are handled as for named items (see above).<p>
 
-    <p>The difference for the first (for <TYPE>com::sun::star::sheet::DataPilotFieldReferenceItemType::PREVIOUS</TYPE>)
-       or last (for <TYPE>com::sun::star::sheet::DataPilotFieldReferenceItemType::NEXT</TYPE>) item of the base field is
+    <p>The difference for the first (for
+       com::sun::star::sheet::DataPilotFieldReferenceItemType::PREVIOUS)
+       or last (for com::sun::star::sheet::DataPilotFieldReferenceItemType::NEXT
+       ) item of the base field is
        shown as empty result.</p>
     */
 
@@ -75,8 +77,11 @@ constants DataPilotFieldReferenceType
         Totals outside of the base field are shown as empty results.
 
         <p>Division by zero results in an error. Otherwise, empty results are shown as 0. Results for
-           the base item, first (for <TYPE>com::sun::star::sheet::DataPilotFieldReferenceItemType::PREVIOUS</TYPE>)
-           or last (for <TYPE>com::sun::star::sheet::DataPilotFieldReferenceItemType::NEXT</TYPE>) item of the base field are shown
+           the base item, first (for
+           com::sun::star::sheet::DataPilotFieldReferenceItemType::PREVIOUS)
+           or last (for
+           com::sun::star::sheet::DataPilotFieldReferenceItemType::NEXT)
+           item of the base field are shown
            as 1 if not empty.</p>
     */
 
diff --git a/offapi/com/sun/star/sheet/DataPilotTablePositionData.idl b/offapi/com/sun/star/sheet/DataPilotTablePositionData.idl
index f860a9447e0b..0cbcdecc2be1 100644
--- a/offapi/com/sun/star/sheet/DataPilotTablePositionData.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTablePositionData.idl
@@ -61,8 +61,8 @@ struct DataPilotTablePositionData
         whereas when the value of DataPilotTablePositionData::PositionType
         is either DataPilotTablePositionType::ROW_HEADER
         or DataPilotTablePositionType::COLUMN_HEADER, then the
-        #PositionData member contains an instance of type <type>
-        DataPilotTableHeaderData</type>.</p>
+        #PositionData member contains an instance of type
+        DataPilotTableHeaderData.</p>
 
         @see com::sun::star::sheet::DataPiotTableResultData
         @see com::sun::star::sheet::DataPiotTableHeaderData
diff --git a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
index 6254f3875cb7..667c42d15c3a 100644
--- a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
+++ b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
@@ -39,8 +39,8 @@ struct ExternalLinkInfo
         <p>Modes used:
 
         <ol>
-        <li>If #Type is <const>ExternalLinkType::EXTERNAL
-        </const>, this member shall contain a `string` with the
+        <li>If #Type is ExternalLinkType::EXTERNAL,
+        this member shall contain a `string` with the
         <em>URI</em> of a document. The formula that would need this
         information for example would contain <code>=[1]Sheet1!A1</code> or
         <code>='[1]Sheet name'!A1</code> where <em>[1]</em> does resolve to
diff --git a/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl b/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
index 856cfe376aac..89c21dca4328 100644
--- a/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
+++ b/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
@@ -44,7 +44,7 @@ constants FormulaMapGroupSpecialOffset
         <li>A value of type `double` for literal floating-point
         constants.</li>
         <li>A `string` for literal text.</li>
-        <li>A <atom dim="[][]">any</atom> for a literal array. The contained
+        <li>A `any[][]` for a literal array. The contained
         values shall be of type `double` or `string`.
         Floating-point values and strings may occur together in an array.</li>
         <li>A struct of type SingleReference for a reference to a
diff --git a/offapi/com/sun/star/sheet/FormulaParser.idl b/offapi/com/sun/star/sheet/FormulaParser.idl
index 6a78986e57d6..2c1145ec1369 100644
--- a/offapi/com/sun/star/sheet/FormulaParser.idl
+++ b/offapi/com/sun/star/sheet/FormulaParser.idl
@@ -40,8 +40,8 @@ service FormulaParser
 
     /** specifies whether to use English parser and formatter.
 
-        <p>Note: When changing this, an already existing <member>OpCodeMap
-        </member> needs to be recreated internally, so for performance reasons
+        <p>Note: When changing this, an already existing #OpCodeMap
+        needs to be recreated internally, so for performance reasons
         set this <em>before</em> setting the #OpCodeMap.
      */
     [property] boolean CompileEnglish;
@@ -70,9 +70,9 @@ service FormulaParser
 
     /** contains a list of external links referenced in formulas.
 
-        <p>Use of this property depends on the <member>FormulaConvention
-        </member> in use. It is relevant only for <const>
-        AddressConvention::XL_OOX</const> to map indices to external
+        <p>Use of this property depends on the FormulaConvention
+        in use. It is relevant only for
+        AddressConvention::XL_OOX to map indices to external
         documents. The sequence must be in the order of indices used. Note
         that indices are 1-based, the sequence must start with an empty
         element.</p>
diff --git a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
index b8d03f90e4b3..3b935013b794 100644
--- a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
@@ -79,26 +79,26 @@ published interface XDataPilotFieldGrouping: com::sun::star::uno::XInterface
             members of this struct have to fulfill the following requirements:
 
             <ul>
-            <li>If the member <member>DataPilotFieldGroupInfo::HasAutoStart
-            </member> is set to `FALSE`, then the value of <member>
-            DataPilotFieldGroupInfo::Start</member> must be a floating-point
-            value representing a valid date/time value (if <member>
-            DataPilotFieldGroupInfo::HasAutoStart</member> is set to `TRUE`,
+            <li>If the member DataPilotFieldGroupInfo::HasAutoStart
+            is set to `FALSE`, then the value of
+            DataPilotFieldGroupInfo::Start must be a floating-point
+            value representing a valid date/time value (if
+            DataPilotFieldGroupInfo::HasAutoStart is set to `TRUE`,
             the value of DataPilotFieldGroupInfo::Start will
             be ignored).</li>
 
-            <li>If the member <member>DataPilotFieldGroupInfo::HasAutoEnd
-            </member> is set to `FALSE`, then the value of <member>
-            DataPilotFieldGroupInfo::End</member> must be a floating-point
-            value representing a valid date/time value( if <member>
-            DataPilotFieldGroupInfo::HasAutoEnd</member> is set to `TRUE`,
+            <li>If the member DataPilotFieldGroupInfo::HasAutoEnd
+            is set to `FALSE`, then the value of
+            DataPilotFieldGroupInfo::End must be a floating-point
+            value representing a valid date/time value( if
+            DataPilotFieldGroupInfo::HasAutoEnd is set to `TRUE`,
             the value of DataPilotFieldGroupInfo::End will be
             ignored).</li>
 
-            <li>If the members <member>DataPilotFieldGroupInfo::HasAutoStart
-            </member> and DataPilotFieldGroupInfo::HasAutoEnd
-            are set to `FALSE` both, then the value of <member>
-            DataPilotFieldGroupInfo::Start</member> must be less than or equal
+            <li>If the members DataPilotFieldGroupInfo::HasAutoStart
+            and DataPilotFieldGroupInfo::HasAutoEnd
+            are set to `FALSE` both, then the value of
+            DataPilotFieldGroupInfo::Start must be less than or equal
             to the value of DataPilotFieldGroupInfo::End.</li>
 
             <li>The member DataPilotFieldGroupInfo::HasDateValues
@@ -123,11 +123,11 @@ published interface XDataPilotFieldGrouping: com::sun::star::uno::XInterface
             into one range (e.g. a value of 7 groups the members of a week
             into a range).</li>
 
-            <li>The contents of the member <member>
-            DataPilotFieldGroupInfo::SourceField</member> will be ignored.</li>
+            <li>The contents of the member
+            DataPilotFieldGroupInfo::SourceField will be ignored.</li>
 
-            <li>The contents of the member <member>
-            DataPilotFieldGroupInfo::Groups</member> will be ignored.</li>
+            <li>The contents of the member
+            DataPilotFieldGroupInfo::Groups will be ignored.</li>
             </ul>
 
         @returns
diff --git a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
index bb211ec43873..681967c15a86 100644
--- a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
@@ -49,8 +49,7 @@ interface XDrillDownDataSupplier: com::sun::star::uno::XInterface
         @param aFilters filtering criteria
 
         @returns a filtered subset of the original source data as 2-dimensional
-        sequences of <type scope="com::sun::star::uno">Any</any>.  The first row
-        must be the header row.  Each com::sun::star::uno::Any
+        sequences of `any`.  The first row must be the header row.  Each `any`
         instance must contain either double value for a numeric cell, or
         a string value for a string cell.
 
diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
index 4d46ed1beee1..90fe048dd1ea 100644
--- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
+++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
@@ -69,17 +69,17 @@ interface XFormulaOpCodeMapper
             sequence in order.
 
             <p>Each string element in parameter Names according to the formula
-            language in parameter Language is mapped to a <type>FormulaToken
-            </type> containing the internal OpCode used by the spreadsheet
+            language in parameter Language is mapped to a FormulaToken
+            containing the internal OpCode used by the spreadsheet
             application in FormulaToken::OpCode and by
-            contract maybe additional information in <member>
-            FormulaToken::Data</member>.</p>
+            contract maybe additional information in
+            FormulaToken::Data.</p>
 
             <p>The order of the FormulaToken sequence returned matches the
             input order of the string sequence.</p>
 
-            <p>An unknown Name string gets the OpCode value of <member>
-            OpCodeUnknown</member> assigned.</p>
+            <p>An unknown Name string gets the OpCode value of
+            #OpCodeUnknown assigned.</p>
 
             <p>Additional information in FormulaToken::Data
             is returned for:
@@ -105,18 +105,18 @@ interface XFormulaOpCodeMapper
             is thrown.
 
         @param Groups
-            Group of mappings to be returned, a bit mask of <type>
-            FormulaMapGroup</type> constants.
+            Group of mappings to be returned, a bit mask of
+            FormulaMapGroup constants.
 
         @returns
             Sequence of FormulaOpCodeMapEntry.
 
             <p>Each element of the formula language in parameter Language is
             mapped to a FormulaToken containing the internal
-            OpCode used by the spreadsheet application in <member>
-            FormulaToken::OpCode</member> and by contract maybe additional
-            information in FormulaToken::Data. See <member>
-            getMappings</member> for more details.</p>
+            OpCode used by the spreadsheet application in
+            FormulaToken::OpCode and by contract maybe additional
+            information in FormulaToken::Data. See
+            getMappings() for more details.</p>
      */
     sequence< FormulaOpCodeMapEntry > getAvailableMappings(
             [in] long Language, [in] long Groups )
diff --git a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
index ea2af811986b..580a6ee84b37 100644
--- a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module sheet {
     com::sun::star::sheet::XMultiFormulaTokens::getCount()
     method. When the client code tries to access formula tokens at index that
     is outside the allowed index range, the implementation shall return an
-    <type scope="com::sun::star::lang">IndexOutOfBoundsException</member>.
+    com::sun::star::lang::IndexOutOfBoundsException.
  */
 interface XMultiFormulaTokens
 {
diff --git a/offapi/com/sun/star/style/PageProperties.idl b/offapi/com/sun/star/style/PageProperties.idl
index 8d79407f73e8..2573d6fe733b 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -330,8 +330,8 @@ of the current page is used as limit.
      the text and the footnote area.
  */
 [optional,property] long FootnoteLineDistance;
-/** contains the writing direction, as represented by the <type
- scope="com::sun::star::text">WritingMode2</type> constants */
+/** contains the writing direction, as represented by the
+    com::sun::star::text::WritingMode2 constants */
 [optional,property] short WritingMode;
 /** contains the mode of the text grid (none, lines, ...), as
     represented by com::sun::star::text::TextGridMode
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl b/offapi/com/sun/star/table/AccessibleCellView.idl
index ab8948f62323..13d5495c64a8 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -42,18 +42,15 @@ service AccessibleCellView
     /** This interface gives access to the visible content of a cell in a
         accessible spreadsheet page preview or accessible text document view.
     <ul>
-        <li>The parent returned by <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleParent</method>
+        <li>The parent returned by
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
             is the accessible table view.</li>
         <li>The children returned by
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleChild</method> all
-            support the interface XAccessible. Calling
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleContext</method> for these
-            children returns an object that supports the service
-            <type scope="::com::sun::star::text"
-            >AccessibleParagraphView</type>:
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+            all support the interface XAccessible. Calling
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleContext()
+            for these children returns an object that supports the service
+            ::com::sun::star::text::AccessibleParagraphView:
             A child of this kind is returned for every paragraph
             fragment that is contained in the cell and
             is at least partially visible. A paragraph fragment is
@@ -61,44 +58,43 @@ service AccessibleCellView
             certain page.
         <li>The name is something like A10 or B23 or so on.</li>
         <li>The description is the name or the content of the given note.</li>
-        <li>The role is <const scope="::com::sun::star::accessibility"
-            >AccessibleRole::TABLE_CELL</const></li>
+        <li>The role is
+            ::com::sun::star::accessibility::AccessibleRole::TABLE_CELL</li>
         <li>For spreadsheets, there are relations between the cell and the
             shapes with an anchor on this cell.</li>
         <li>The following states are supported:
             <ul>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::DEFUNC</const> is always false if the
-                    cell is showed, otherwise it is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is false if the cell
+                <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                    is always false if the
+                    cell is shown, otherwise it is true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    is false if the cell
                     is showed in a page preview or the cell or the table is
                     protected, otherwise it is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::ENABLED</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTI_LINE</const> is always true in
-                    spreadsheets and false otherwise.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::OPAQUE</const> is false if the cell
+                <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTI_LINE
+                    is always true in spreadsheets and false otherwise.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    is false if the cell
                     has no background color or graphic, otherwise it is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTABLE</const> is true if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                    is true if the
                     cell is not showed in a page preview, otherwise is it
                     false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTED</const> is true, if the cell
+                <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED
+                    is true, if the cell
                     is selected. This is not possible in the page preview.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    is true if the
                     Bounding Box lies in the Bounding Box of the parent.
                     Otherwise it is false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::TRANSIENT</const>Is true if the cell
+                <li>::com::sun::star::accessibility::AccessibleStateType::TRANSIENT
+                    is true if the cell
                     is showed in a spreadsheet page preview. Otherwise it is
                     false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::VISIBLE</const>Is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                    is always true.</li>
             </ul>
         </li>
     </ul>
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index a5887a313940..9ec97218e111 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -44,22 +44,19 @@ service AccessibleTableView
 
     <ul>
         <li>The parent returned by
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleParent</method>
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
             is the accessible text document view, a page of the accessible
             text document page preview, or the accessible spreadsheet
             page preview.</li>
         <li>The children returned by
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleChild</method> all
-            support the interface XAccessible. Calling
-            <method scope="::com::sun::star::accessibility"
-            >XAccessible::getAccessibleContext</method> for these children
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+            all support the interface XAccessible. Calling
+            ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+            for these children
             returns an object that supports the service.
             ::com::sun::star::table::AccessibleCellView:
             A child where calling
-            <method scope="::com::sun::star::accessibility"
-            >XAccessibleContext::getAccessibleChild</method>
+            ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
             an object that supports this service is returned for
             every partially visible cell in this table.
         <p>The following rules apply to the children order.</p>
@@ -72,38 +69,38 @@ service AccessibleTableView
         </ul>
         <li>The description is ???.</li>
         <li>The name is the given table name and a number to make it non-ambiguous.</li>
-        <li>The role is <const scope="::com::sun::star::accessibility"
-            >AccessibleRole::TABLE</const></li>
+        <li>The role is
+            ::com::sun::star::accessibility::AccessibleRole::TABLE</li>
         <li>In a spreadsheet page preview there are relations between the
             table and the shapes with an anchor
             on this table (not with an anchor on a cell in this table).</li>
         <li>The following states are supported:
             <ul>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::DEFUNC</const> is always false if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                    is always false if the
                     table is not deleted, the document is open. Also it is
                     false if the table was showed in a page preview and the
                     page preview is already opened, otherwise it is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is false if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    is false if the
                     table is showed in a page preview or the table is
                     protected, otherwise it is true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::ENABLED</const> is always true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTI_SELECTABLE</const> is false
+                <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                    is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+                    is false
                     if the table is showed in a page preview, otherwise it is
                     true.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::OPAQUE</const> is false, if the table
+                <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    is false, if the table
                     has no background color or graphic, otherwise it is
                     false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
+                <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    is true if the
                     Bounding Box lies in the Bounding Box of the parent.
                     Otherwise it is false.</li>
-                <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::VISIBLE</const>Is always true.</li>
+                <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                    is always true.</li>
             </ul>
         </li>
     </ul>
diff --git a/offapi/com/sun/star/table/CellProperties.idl b/offapi/com/sun/star/table/CellProperties.idl
index e132507d82e7..94b71db5ae80 100644
--- a/offapi/com/sun/star/table/CellProperties.idl
+++ b/offapi/com/sun/star/table/CellProperties.idl
@@ -205,7 +205,7 @@ published service CellProperties
     //=== BorderLine2 / TableBorder2 optional properties, preferred ===========
 
     /** contains a description of the cell or cell range border.
-        Preferred over <type>TableBorder>/type> #TableBorder.
+        Preferred over TableBorder #TableBorder.
 
         <p>If used with a cell range, the top, left, right, and bottom
         lines are at the edges of the entire range, not at the edges of
diff --git a/offapi/com/sun/star/table/CellRangeListSource.idl b/offapi/com/sun/star/table/CellRangeListSource.idl
index 301d7efea799..edbb53fbb243 100644
--- a/offapi/com/sun/star/table/CellRangeListSource.idl
+++ b/offapi/com/sun/star/table/CellRangeListSource.idl
@@ -51,13 +51,15 @@ service CellRangeListSource
 
         <p>This interface is used to initialize the component after creation. It has
         to be used exactly once in the life time of the component, every second call
-        to <member scope"com::sun::star::lang">XInitialization::initialize</member>
+        to com::sun::star::lang::XInitialization::initialize()
         will throw an exception.</p>
 
-        <p>The arguments passed to the <member scope"com::sun::star::lang">XInitialization::initialize</member>
+        <p>The arguments passed to the
+        com::sun::star::lang::XInitialization::initialize()
         method must be instances of com::sun::star::beans::NamedValue, where
-        the <member scope"com::sun::star::beans">NamedValue::Name</member> denotes the type of information
-        to initialize, and the <member scope"com::sun::star::beans">NamedValue::Value</member>
+        the com::sun::star::beans::NamedValue::Name denotes the type of
+        information to initialize, and the
+        com::sun::star::beans::NamedValue::Value
         the initial value.</p>
 
         <p>The following aspects of the components can be initialized:<br/>
diff --git a/offapi/com/sun/star/table/CellValueBinding.idl b/offapi/com/sun/star/table/CellValueBinding.idl
index 5925dcc96550..ee6320b3ff42 100644
--- a/offapi/com/sun/star/table/CellValueBinding.idl
+++ b/offapi/com/sun/star/table/CellValueBinding.idl
@@ -64,13 +64,14 @@ service CellValueBinding
 
         <p>This interface is used to initialize the component after creation. It has
         to be used exactly once in the life time of the component, every second call
-        to <member scope"com::sun::star::lang">XInitialization::initialize</member>
+        to com::sun::star::lang::XInitialization::initialize()
         will throw an exception.</p>
 
-        <p>The arguments passed to the <member scope"com::sun::star::lang">XInitialization::initialize</member>
+        <p>The arguments passed to the
+        com::sun::star::lang::XInitialization::initialize()
         method must be instances of com::sun::star::beans::NamedValue, where
-        the <member scope"com::sun::star::beans">NamedValue::Name</member> denotes the type of information
-        to initialize, and the <member scope"com::sun::star::beans">NamedValue::Value</member>
+        the com::sun::star::beans::NamedValue::Name denotes the type of information
+        to initialize, and the com::sun::star::beans::NamedValue::Value
         the initial value.</p>
 
         <p>The following aspects of the components can be initialized:<br/>
diff --git a/offapi/com/sun/star/task/XAbortChannel.idl b/offapi/com/sun/star/task/XAbortChannel.idl
index 8b9bb6012a84..bd0643814484 100644
--- a/offapi/com/sun/star/task/XAbortChannel.idl
+++ b/offapi/com/sun/star/task/XAbortChannel.idl
@@ -25,8 +25,7 @@
 module com { module sun { module star { module task {
 
 /** Use this interface to abort a command asynchronously.
-    For example, have a look at <type scope="com::sun::star::deployment">
-    XPackageManager</type>.
+    For example, have a look at com::sun::star::deployment::XPackageManager.
 */
 interface XAbortChannel
 {
diff --git a/offapi/com/sun/star/text/AccessibleEndnoteView.idl b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
index 55ef2e24af46..f019eba79cc9 100644
--- a/offapi/com/sun/star/text/AccessibleEndnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
@@ -39,28 +39,24 @@ service AccessibleEndnoteView
 
         <ul>
             <li>The parent returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</method>
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
                 is either the accessible view of a text document,
                 a page of the accessible page preview of a text document,
                 or the accessible page preview of a spreadsheet document.
             <li>The children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method> all
-                support the interface XAccessible. Calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleContext</method> for these children returns
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                all support the interface XAccessible. Calling
+                ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+                for these children returns
                 an object that supports one of the following services.
                 <ul>
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleParagraphView</type>:
+                    <li>::com::sun::star::text::AccessibleParagraphView:
                         A child of this kind is returned for every paragraph
                         fragment that is contained in the document body and
                         is at least partially visible. A paragraph fragment is
                         the part of a paragraph that is displayed on a
                         certain page.
-                    <li><type scope="::com::sun::star::table"
-                        >AccessibleTableView</type>:
+                    <li>::com::sun::star::table::AccessibleTableView:
                         A child of this kind is returned for every table
                         fragment that is contained in the document body
                         and is at least partially visible. A table fragment is
@@ -68,8 +64,8 @@ service AccessibleEndnoteView
                 </ul>
                 <p>The logical order of paragraph and table fragments is never
                    changed.
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::ENDNOTE</const>
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::ENDNOTE
             <li>The name is "endnote" (or the equivalent term
                 in application's language) with a number appended.
             <li>The description is endnote" (or the equivalent term
@@ -79,23 +75,19 @@ service AccessibleEndnoteView
             <li>There are no relations. <em>TODO: One might specify a relation
                 to the endnote anchor's paragraph.</em>
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleStateSet</method>:
+                returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that the
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that the
                         document window has been closed or the endnote is
                         not existing any longer)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::EDITABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>Depending of the application's region setting, the locale is
                 the western, Asian or complex default language of the document.
diff --git a/offapi/com/sun/star/text/AccessibleFootnoteView.idl b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
index 1846463a78b2..a88b672f58d1 100644
--- a/offapi/com/sun/star/text/AccessibleFootnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
@@ -40,27 +40,25 @@ service AccessibleFootnoteView
         partially visible on the screen.
 
         <ul>
-            <li>The parent returned by <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</method>
+            <li>The parent returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
                 is either the accessible view of a text document,
                 a page of the accessible page preview of a text document,
                 or the accessible page preview of a spreadsheet document.
-            <li>The children returned by <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method> all
-                support the interface XAccessible. Calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleContext</method> for these children returns
+            <li>The children returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                all support the interface XAccessible. Calling
+                ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+                for these children returns
                 an object that supports one of the following services.
                 <ul>
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleParagraphView</type>:
+                    <li>::com::sun::star::text::AccessibleParagraphView:
                         A child of this kind is returned for every paragraph
                         fragment that is contained in the document body and
                         is at least partially visible. A paragraph fragment is
                         the part of a paragraph that is displayed on a
                         certain page.
-                    <li><type scope="::com::sun::star::table"
-                        >AccessibleTableView</type>:
+                    <li>::com::sun::star::table::AccessibleTableView:
                         A child of this kind is returned for every table
                         fragment that is contained in the document body
                         and is at least partially visible. A table fragment is
@@ -68,8 +66,8 @@ service AccessibleFootnoteView
                 </ul>
                 <p>The logical order of paragraph and table fragments is never
                    changed.
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::FOOTNOTE</const>
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::FOOTNOTE
             <li>The name is "footnote" (or the equivalent term
                 in application's language) with a number appended.
             <li>The description is footnote" (or the equivalent term
@@ -79,23 +77,19 @@ service AccessibleFootnoteView
             <li>There are no relations. <em>TODO: One might specify a relation
                 to the footnote anchor's paragraph.</em>
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleStateSet</type>:
+                returned by
+                ::com::sun::star::accessibility::XAccessible::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed or the footnote is
                         not existing any longer)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::EDITABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>Depending of the application's region setting, the locale is
                 the western, Asian or complex default language of the document.
diff --git a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
index 466a902b0127..0a65f18f2a8b 100644
--- a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
+++ b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
@@ -41,29 +41,25 @@ service AccessibleHeaderFooterView
 
         <ul>
             <li>The parent returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</method>
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
                 is either the accessible view of a text document,
                 a page of the accessible page preview of a text document,
                 or the accessible page preview of a spreadsheet document.
             <li>The children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method> all
-                support the interface XAccessible. Calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleContext</method> for these children returns
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                all support the interface XAccessible. Calling
+                ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+                for these children returns
                 an object that supports one of the following services.
                 <ul>
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleParagraphView</type>:
+                    <li>::com::sun::star::text::AccessibleParagraphView:
                         A child of this kind is returned for every paragraph
                         that is contained in the document body and
                         is at least partially visible. The child always
                         represents a whole paragraph (and not a fragment only),
                         because there are no page breaks within headers and
                         footers.
-                    <li><type scope="::com::sun::star::table"
-                        >AccessibleTableView</type>:
+                    <li>::com::sun::star::table::AccessibleTableView:
                         A child of this kind is returned for every table
                         that is contained in the document body
                         and is at least partially visible. The child always
@@ -73,10 +69,8 @@ service AccessibleHeaderFooterView
                 </ul>
             <p>The logical order of paragraphs and tables is never changed.
             <li>The role is either
-                <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::HEADER</const> or
-                <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::FOOTER</const>.
+                ::com::sun::star::accessibility::AccessibleRole::HEADER or
+                ::com::sun::star::accessibility::AccessibleRole::FOOTER.
             <li>The name is "header" or "footer" (or the equivalent term
                 in application's language) with a number appended.
             <li>The description is "header" or "footer" (or the equivalent term
@@ -84,23 +78,19 @@ service AccessibleHeaderFooterView
                 the format that is specified in the page's style.
             <li>There are no relations.
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleStateSet</type>:
+                returned by
+                ::com::sun::star::accessibility::XAccessible::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed or the header or
                         footer is not existing any longer)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::EDITABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>Depending of the application's region setting, the locale is
                 the western, Asian or complex default language of the document.
diff --git a/offapi/com/sun/star/text/AccessiblePageView.idl b/offapi/com/sun/star/text/AccessiblePageView.idl
index bf747158b669..505e24a773b3 100644
--- a/offapi/com/sun/star/text/AccessiblePageView.idl
+++ b/offapi/com/sun/star/text/AccessiblePageView.idl
@@ -40,49 +40,39 @@ service AccessiblePageView
 
         <ul>
             <li>The parent returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</method> is the
-                accessible page preview of a text document.  That is, the
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
+                is the accessible page preview of a text document.  That is, the
                 object returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleContext</method> supports
-                <type scope="::com::sun::star::text"
-                >AccessibleTextDocumentPageView</type>.
+                ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+                supports
+                ::com::sun::star::text::AccessibleTextDocumentPageView.
             <li>The children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method> all
-                support the interface XAccessible. Calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleContext</method> for these
-                children returns an object that supports one of the
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                all support the interface XAccessible. Calling
+                ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+                for these children returns an object that supports one of the
                 following services.
                 <ul>
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleHeaderFooterView</type>:
+                    <li>::com::sun::star::text::AccessibleHeaderFooterView:
                         A child of this kind is returned for every header
                         and footer that is contained in the page.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleFootnoteView</type>:
+                    <li>::com::sun::star::text::AccessibleFootnoteView:
                         A child of this kind is returned for every footnote
                         that is contained in the page.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleEndnoteView</type>:
+                    <li>::com::sun::star::text::AccessibleEndnoteView:
                         A child of this kind is returned for every endnote
                         that is contained in the page.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleParagraphView</type>:
+                    <li>::com::sun::star::text::AccessibleParagraphView:
                         A child of this kind is returned for every paragraph
                         fragment that is contained in the page.
                         A paragraph fragment is the part of a paragraph that
                         is displayed on a certain page.
-                    <li><type scope="::com::sun::star::table"
-                        >AccessibleTableView</type>:
+                    <li>::com::sun::star::table::AccessibleTableView:
                         A child of this kind is returned for every table
                         fragment that is contained in the page.
                         A table fragment is the part of a table that is
                         displayed on a certain page.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleTextFrameView</type>:
+                    <li>::com::sun::star::text::AccessibleTextFrameView:
                         A child of this kind is returned for every text
                         frame that is contained in the page. These objects
                         are children of the AccessiblePageView
@@ -91,8 +81,7 @@ service AccessiblePageView
                         exception are text frames that are bound as
                         character.  They are children of the paragraph they
                         are contained in.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleTextGraphicObject</type>:
+                    <li>::com::sun::star::text::AccessibleTextGraphicObject:
                         A child of this kind is returned for every graphic that
                         is contained in the page. These objects are
                         children of the AccessiblePageView
@@ -100,8 +89,7 @@ service AccessiblePageView
                         a frame or a character. The only exception
                         are text frames that are bound as character. They are
                         children of the paragraph they are contained in.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleTextEmbeddedObject</type>:
+                    <li>::com::sun::star::text::AccessibleTextEmbeddedObject:
                         A child of this kind is returned for every embedded
                         object that is contained in the page.
                         These objects are children of the
@@ -109,8 +97,7 @@ service AccessiblePageView
                         whether they are bound to a page, a paragraph, a frame,
                         or a character.  They are children of the paragraph they
                         are contained in.
-                    <li><type scope="::com::sun::star::drawing"
-                        >AccessibleShape</type>:
+                    <li>::com::sun::star::drawing::AccessibleShape:
                         A child of this kind (or one of its derived
                         interfaces) is returned for every shape that is
                         contained in the page. These objects are children of
@@ -143,8 +130,8 @@ service AccessiblePageView
                         with the exception of controls that appear really last,
                         but also keep the z order.
                 </ul>
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::PANEL</const>
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::PANEL
             <li>The name is "page" (or the equivalent term
                 in application's language) with a number appended.
             <li>The description is "page" (or the equivalent term
@@ -153,26 +140,20 @@ service AccessiblePageView
                 page style.
             <li>There are no relations.</li>
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleStateSet</method>:
+                returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed or the endnote
                         is not existing any longer)</li>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
-                        contained)</li>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSED</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)</li>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>The locale is the application's locale.
         </ul>
diff --git a/offapi/com/sun/star/text/AccessibleParagraphView.idl b/offapi/com/sun/star/text/AccessibleParagraphView.idl
index 889b5ba47ab4..d87bfb36a43f 100644
--- a/offapi/com/sun/star/text/AccessibleParagraphView.idl
+++ b/offapi/com/sun/star/text/AccessibleParagraphView.idl
@@ -43,26 +43,23 @@ service AccessibleParagraphView
 
         <ul>
             <li>The parent returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</method> is the
-                accessible view of a text document (in this case the
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
+                is the accessible view of a text document (in this case the
                 paragraph is contained in a page body) or the accessible
                 view of a header, footer, footnote, endnote, table cell,
                 text frame, page or shape.</li>
             <li>The children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method> are the
-                graphics, text boxes and OLE objects that are bound
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                are the graphics, text boxes and OLE objects that are bound
                 <em>as</em> character within the paragraph. Graphics, text
                 boxes and OLE objects that are bound to the paragraph or
                 <em>to</em> a character within the paragraph are not
                 children of the paragraph fragment but of the document view
                 itself.</li>
             <li>The role is either
-                <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::PARAGRAPH</const> or
-                <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::HEADING</const>. The later one is returned
+                ::com::sun::star::accessibility::AccessibleRole::PARAGRAPH or
+                ::com::sun::star::accessibility::AccessibleRole::HEADING.
+                The later one is returned
                 if the paragraph's style is contained in the chapter
                 numbering of a text document.
             <li>The name is "paragraph" or "heading" (or the equivalent term
@@ -72,34 +69,24 @@ service AccessibleParagraphView
                 the paragraph.
             <li>There are no relations.
             <li>The following states are supported by the
-                <type scope="::com::sun::star::accessibility"
-                >XAccessibleStateSet</type> returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleStateSet</method>.
+                ::com::sun::star::accessibility::AccessibleStateSet returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet().
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed or the paragraph
                         fragment is not existing any longer).
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::EDITABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::MULTILINE</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::MULTISELECTABLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
                         (always contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSED</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::MULTILINE
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::MULTISELECTABLE
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSED
                 </ul>
             <li>Depending of the application's region setting, the locale is
                 the western, Asian or complex language of the paragraph.
@@ -121,16 +108,14 @@ service AccessibleParagraphView
         <p>For text frames, graphics, etc. that are bound as character some
         text is generated that contains the objects description.
         <p>The attributes (or properties) returned by
-        <method scope="::com::sun::star::accessibility"
-        >XAccessibleText::getCharacterAttributes</method>
+        ::com::sun::star::accessibility::XAccessibleText::getCharacterAttributes()
         are a sub set of the properties described by the service
         ::com::sun::star::style::CharacterProperties. For
         properties that have Asian and complex counterparts, the value that
         is visible is returned. This can be in fact the western, Asian or
         complex value.  Its not possible to change the value of any property
         by using
-        <method scope="::com::sun::star::accessibility"
-        >XAccessibleEditableText::setAttributes</method>.
+        ::com::sun::star::accessibility::XAccessibleEditableText::setAttributes().
         <p><em>TODO: If there is a demand, some attributes might be added that
         tells whether the character at a certain index is editable or generated.
         </em>
@@ -139,8 +124,8 @@ service AccessibleParagraphView
     [optional] interface ::com::sun::star::accessibility::XAccessibleEditableText;
 
     /** This interface is a subset of
-        <type scope="::com::sun::star::accessibility"
-        >XAccessibleEditableText</type> and gives access to a paragraph
+        ::com::sun::star::accessibility::XAccessibleEditableText
+        and gives access to a paragraph
         fragment's text in a read-only mode.  The text contains the
         paragraph's text (changeable as well as generated text, like chapter
         numbers, hyphens or fields). Characters of generated text contribute
@@ -148,9 +133,8 @@ service AccessibleParagraphView
         <p>For text frames, graphics, etc. that are bound as character
         some text is generated that contains the objects description.
         <p>The attributes (or properties) returned by
-        <method scope="::com::sun::star::accessibility"
-        >XAccessibleText::getCharacterAttributes</method> are a sub set of the properties
-        described by the service
+        ::com::sun::star::accessibility::XAccessibleText::getCharacterAttributes()
+        are a sub set of the properties described by the service
         ::com::sun::star::style::CharacterProperties. For
         properties that have Asian and complex counterparts, the value that
         is visible is returned. This can be in fact the western, Asian or
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
index eaf38e1766d6..cfe22fe76e99 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
@@ -39,38 +39,33 @@ service AccessibleTextDocumentPageView
           page preview of a text document.
         <ul>
             <li>The children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</type> all support
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                all support
                 the interface XAccessible. Calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleContext</type> for these children
+                ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+                for these children
                 returns an object that supports one of the service
-                <type scope="::com::sun::star::text"
-                >AccessiblePageView</type>.
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::DOCUMENT</const>.
+                ::com::sun::star::text::AccessiblePageView.
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::DOCUMENT.
             <li>The name is "document view" (or the equivalent term
                 in application's language).
             <li>The description also is "document view" (or the equivalent term
                 in application's language).
             <li>There are no relation sets.
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleStateSet</method>:
+                returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>The locale is the application's locale.
         </ul>
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
index b9c337f948aa..4d4acf4a151f 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
@@ -42,41 +42,34 @@ service AccessibleTextDocumentView
 
         <ul>
             <li>The children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method> all support
-                the interface XAccessible. Calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleContext</method> for these children
-                returns an object that supports one of the following
-                services.
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                all support the interface XAccessible. Calling
+                ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+                for these children returns an object that supports one of the
+                following services.
                 <ul>
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleHeaderFooterView</type>:
+                    <li>::com::sun::star::text::AccessibleHeaderFooterView:
                         A child of this kind is returned for every header
                         and footer that is at least partially visible.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleFootnoteView</type>:
+                    <li>::com::sun::star::text::AccessibleFootnoteView:
                         A child of this kind is returned for every footnote
                         that is at least partially visible.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleEndnoteView</type>:
+                    <li>::com::sun::star::text::AccessibleEndnoteView:
                         A child of this kind is returned for every endnote
                         that is at least partially visible.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleParagraphView</type>:
+                    <li>::com::sun::star::text::AccessibleParagraphView:
                         A child of this kind is returned for every paragraph
                         fragment that is contained in the document body and
                         is at least partially visible. A paragraph fragment is
                         the part of a paragraph that is displayed on a
                         certain page.
-                    <li><type scope="::com::sun::star::table"
-                        >AccessibleTableView</type>:
+                    <li>::com::sun::star::table::AccessibleTableView:
                         A child of this kind is returned for every table
                         fragment that is contained in the document body
                         and is at least partially visible. A table fragment is
                         the part of a table that is displayed on a certain page.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleTextFrameView</type>: A child of this
+                    <li>::com::sun::star::text::AccessibleTextFrameView:
+                        A child of this
                         kind is returned for every text frame that is at
                         least partially visible. These objects are children
                         of the
@@ -85,8 +78,7 @@ service AccessibleTextDocumentView
                         frame, or a character. The only exception are text
                         frames that are bound as character. They are children
                         of the paragraph they are contained in.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleTextGraphicObject</type>:
+                    <li>::com::sun::star::text::AccessibleTextGraphicObject:
                         A child of this kind is returned for every graphic that
                         is at least partially visible. These objects are
                         children of the AccessibleTextDocumentView
@@ -94,8 +86,7 @@ service AccessibleTextDocumentView
                         a frame or a character. The only exception
                         are text frames that are bound as character. They are
                         children of the paragraph they are contained in.
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleTextEmbeddedObject</type>:
+                    <li>::com::sun::star::text::AccessibleTextEmbeddedObject:
                         A child of this kind is returned for every embedded
                         object that is at least partially visible.
                         These objects are children of the
@@ -103,8 +94,8 @@ service AccessibleTextDocumentView
                         whether they are bound to a page, a paragraph, a frame,
                         or a character.  They are children of the paragraph they
                         are contained in.
-                    <li><type scope="::com::sun::star::drawing"
-                        >AccessibleShape</type>: A child of this kind (or a
+                    <li>::com::sun::star::drawing::AccessibleShape:
+                        A child of this kind (or a
                         derived interface) is returned for every shape that
                         is at least partially visible. These objects are
                         children of the
@@ -137,35 +128,28 @@ service AccessibleTextDocumentView
                         with the exception of controls that appear really last,
                         but also keep the z order.
                 </ul>
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::DOCUMENT</const>.
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::DOCUMENT.
             <li>The name is "document view" (or the equivalent term
                 in application's language).
             <li>The description also is "document view" (or the equivalent term
                 in application's language).
             <li>There are no relation sets.
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleStateSet</method>:
+                returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
-                        the document window has been closed)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::EDITABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::MULTI_SELECTABLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that the document window has been closed)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
                         (always contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>Depending of the application's region setting, the locale is
                 the western, Asian or complex default language of the document.
diff --git a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
index 87cd56d1c497..bf455397f7fb 100644
--- a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
@@ -44,16 +44,15 @@ service AccessibleTextEmbeddedObject
 
         <ul>
             <li>The parent returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</method> is the
-                accessible view of a paragraph if the embedded object is
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
+                is the accessible view of a paragraph if the embedded object is
                 bound as character, and the accessible view of the document
                 (or of a page in the page preview) in any other case.
             <li>There are no children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method>. See above.
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::EMBEDDED_OBJECT</const>
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                . See above.
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::EMBEDDED_OBJECT
             <li>The name is the one assigned to the object in the text
                 document. This means that it is not internationalized.
             <li>The description is the one assigned to the object in the text
@@ -61,32 +60,23 @@ service AccessibleTextEmbeddedObject
                 description has been set, the description equals the name.
             <li>There are no relations.
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleStateSet</method>:
+                returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed or the graphic
                         is not existing any longer)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::EDITABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SELECTABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SELECTED</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSED</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>The locale is the one the text document itself.
         </ul>
diff --git a/offapi/com/sun/star/text/AccessibleTextFrameView.idl b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
index b2c7da8872e3..3d0dcdf6f776 100644
--- a/offapi/com/sun/star/text/AccessibleTextFrameView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
@@ -41,29 +41,27 @@ service AccessibleTextFrameView
 
         <ul>
             <li>The parent returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</type> is the
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
+                is the
                 accessible view of a paragraph if the text frame is bound as
                 character, and the accessible view (or of a page in the page
                 preview) of the document in any other case.
             <li>The children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</type> all support the
-                interface XAccessible. Calling
-                <method scope="::com::sun::star::accessibility"
-                >XAccessible::getAccessibleContext</type> for these children
-                returns an object that supports one of the following
-                services.
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
+                all support the interface XAccessible. Calling
+                ::com::sun::star::accessibility::XAccessible::getAccessibleContext()
+                for these children returns an object that supports one of the
+                following services.
                 <ul>
-                    <li><type scope="::com::sun::star::text"
-                        >AccessibleParagraphView</type>: A child of this
+                    <li>::com::sun::star::text::AccessibleParagraphView:
+                        A child of this
                         kind is returned for every paragraph fragment that
                         is contained in the document body and is at least
                         partially visible. A paragraph fragment is the part
                         of a paragraph that is displayed on a certain page
                         or a certain column.
-                    <li><type scope="::com::sun::star::table"
-                        >AccessibleTableView</type>: A child of this kind is
+                    <li>::com::sun::star::table::AccessibleTableView:
+                        A child of this kind is
                         returned for every table fragment that is contained
                         in the document body and is at least partially
                         visible. A table fragment is the part of a table
@@ -72,8 +70,8 @@ service AccessibleTextFrameView
                 </ul>
                 <p>The logical order of paragraph and table fragments is never
                    changed.
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::TEXT_FRAME</const>
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::TEXT_FRAME
             <li>The name is the one assigned to the text frame in the text
                 document. This means that it is not internationalized.
             <li>The description is the one assigned to the text frame in the
@@ -81,32 +79,23 @@ service AccessibleTextFrameView
                 no description has been set, the description equals the name.
             <li>There are no relations.
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleStateSet</method>:
+                returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed or the graphic
                         is not existing any longer)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::EDITABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SELECTABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SELECTED</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSED</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>The locale is the one the text document itself.
             <li>There are the two relations CONTENT_FLOWS_FROM and
diff --git a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
index 6d3048c56369..6337dfb5b541 100644
--- a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
@@ -39,16 +39,14 @@ service AccessibleTextGraphicObject
 
         <ul>
             <li>The parent returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleParent</method> is the
-                accessible view of a paragraph if the graphic is bound as
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleParent()
+                is the accessible view of a paragraph if the graphic is bound as
                 character, and the accessible view of the document (or of a
                 page in the page preview) in any other case.
             <li>There are no children returned by
-                <method scope="::com::sun::star::accessibility"
-                >XAccessibleContext::getAccessibleChild</method>.
-            <li>The role is <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::GRAPHIC</const>
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild().
+            <li>The role is
+                ::com::sun::star::accessibility::AccessibleRole::GRAPHIC
             <li>The name is the one assigned to the graphic in the text
                 document. This means that it is not internationalized.
             <li>The description is the one assigned to the graphic in the text
@@ -56,32 +54,23 @@ service AccessibleTextGraphicObject
                 description has been set, the description equals the name.
             <li>There are no relations.
             <li>The following states might be contained in the state set
-                returned by <method scope="::com::sun::star::accessibility
-                ">XAccessibleContext::getAccessibleStateSet</type>:
+                returned by
+                ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet():
                 <ul>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::DEFUNC</const> (indicates that
+                    <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC
+                        (indicates that
                         the document window has been closed or the graphic
                         is not existing any longer)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::EDITABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
-                        contained)
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::OPAQUE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SELECTABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SELECTED</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSABLE</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::FOCUSED</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::SHOWING</const>
-                    <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::VISIBLE</const>
+                    <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED
+                        (always contained)
+                    <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                    <li>::com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                    <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING
+                    <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE
                 </ul>
             <li>The locale is the one the text document itself.
         </ul>
diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl
index b04d9d9ac544..b5dfb7c0ed69 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -304,14 +304,14 @@ published service BaseFrameProperties
             @since LibreOffice 4.1
         */
         [optional, property] com::sun::star::drawing::FillStyle FillStyle;
-        /** If the property #FillStyle is set to <const>
-            FillStyle::GRADIENT</const>, this describes the gradient used.
+        /** If the property #FillStyle is set to
+            FillStyle::GRADIENT, this describes the gradient used.
 
             @since LibreOffice 4.1
         */
         [optional, property] com::sun::star::awt::Gradient FillGradient;
-        /** If the property #FillStyle is set to <const>
-            FillStyle::GRADIENT</const>, this is the name of the gradient used.
+        /** If the property #FillStyle is set to
+            FillStyle::GRADIENT, this is the name of the gradient used.
 
             @since LibreOffice 4.1
         */
diff --git a/offapi/com/sun/star/text/TextFieldMaster.idl b/offapi/com/sun/star/text/TextFieldMaster.idl
index d256391fac40..0de4c0ab566a 100644
--- a/offapi/com/sun/star/text/TextFieldMaster.idl
+++ b/offapi/com/sun/star/text/TextFieldMaster.idl
@@ -44,8 +44,8 @@ published service TextFieldMaster
     /** contains a sequence of all fields that depend on this master.
      */
     [readonly, property]  sequence< XDependentTextField> DependentTextFields;
-    /** contains the instance name as it is used in the <type scope="::com::sun::star::text">
-        XTextFieldsSupplier</type>.
+    /** contains the instance name as it is used in the
+        ::com::sun::star::text::XTextFieldsSupplier.
      */
     [readonly, property]  string InstanceName;
 };
diff --git a/offapi/com/sun/star/text/TextPortion.idl b/offapi/com/sun/star/text/TextPortion.idl
index 7ca7fb05c197..d44730cfed9b 100644
--- a/offapi/com/sun/star/text/TextPortion.idl
+++ b/offapi/com/sun/star/text/TextPortion.idl
@@ -68,8 +68,7 @@ published service TextPortion
         <dt>Text</dt><dd>string content</dd>
         <dt>TextField</dt><dd>a text field</dd>
         <dt>TextContent</dt><dd>text content - supplied via the
-            interface <type scope="com::sun::star::container">
-            XContentEnumerationAccess</type></dd>
+            interface com::sun::star::container::XContentEnumerationAccess</dd>
         <dt>ControlCharacter</dt><dd>a control character</dd>
         <dt>Footnote</dt><dd>a footnote or an endnote</dd>
         <dt>ReferenceMark</dt><dd>a reference mark</dd>
diff --git a/offapi/com/sun/star/text/XParagraphAppend.idl b/offapi/com/sun/star/text/XParagraphAppend.idl
index 343ca9eede29..153d345b8e06 100644
--- a/offapi/com/sun/star/text/XParagraphAppend.idl
+++ b/offapi/com/sun/star/text/XParagraphAppend.idl
@@ -42,7 +42,7 @@ interface XParagraphAppend : com::sun::star::uno::XInterface
 
         @param
             CharacterAndParagraphProperties can contain all the properties defined by the service
-                      <type scope="com::sun::star::text">Paragraph.
+                      Paragraph.
 
          */
          com::sun::star::text::XTextRange finishParagraph(  [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties )
@@ -56,7 +56,7 @@ interface XParagraphAppend : com::sun::star::uno::XInterface
 
         @param
             CharacterAndParagraphProperties can contain all the properties defined by the service
-                      <type scope="com::sun::star::text">Paragraph.
+                      Paragraph.
 
         @param
             TextRange specifies the position of the insertion.
diff --git a/offapi/com/sun/star/text/XSimpleText.idl b/offapi/com/sun/star/text/XSimpleText.idl
index aaeb618594b6..a7f842259bcf 100644
--- a/offapi/com/sun/star/text/XSimpleText.idl
+++ b/offapi/com/sun/star/text/XSimpleText.idl
@@ -79,7 +79,7 @@ published interface XSimpleText: com::sun::star::text::XTextRange
 
         @param xRange
             specifies the position of insertion. For example,
-            <method>XSimpleText::createTextCursor</member> can be used to
+            XSimpleText::createTextCursor() can be used to
             get an XTextRange for this argument.
 
             <p>If the parameter bAbsorb() was `TRUE`
diff --git a/offapi/com/sun/star/text/XTextContentAppend.idl b/offapi/com/sun/star/text/XTextContentAppend.idl
index afac7ab3b76d..e737ccccfd2b 100644
--- a/offapi/com/sun/star/text/XTextContentAppend.idl
+++ b/offapi/com/sun/star/text/XTextContentAppend.idl
@@ -38,14 +38,14 @@ interface XTextContentAppend : com::sun::star::uno::XInterface
         /** appends a text content at the end of the text.
 
                 <p> The sequence can contain all the properties defined by the service
-                <type scope="com::sun::star::text">.
+                Paragraph.
         </p>
 
         @param TextContent
             contains the object to be inserted.
         @param CharacterAndParagraphProperties
             can contain all the properties defined by the service
-                      <type scope="com::sun::star::text">Paragraph.
+                      Paragraph.
         @return
             the anchor text range of the inserted text content.
      */
@@ -61,7 +61,7 @@ interface XTextContentAppend : com::sun::star::uno::XInterface
             contains the object to be inserted.
         @param CharacterAndParagraphProperties
             can contain all the properties defined by the service
-                      <type scope="com::sun::star::text">Paragraph.
+                      Paragraph.
         @param TextRange
             insert position
         @return
diff --git a/offapi/com/sun/star/text/XTextPortionAppend.idl b/offapi/com/sun/star/text/XTextPortionAppend.idl
index 3c6c478efa93..a44cf2dd40b2 100644
--- a/offapi/com/sun/star/text/XTextPortionAppend.idl
+++ b/offapi/com/sun/star/text/XTextPortionAppend.idl
@@ -37,7 +37,7 @@ interface XTextPortionAppend : com::sun::star::uno::XInterface
 
         /** appends a new text portion to the paragraph at the end of the text.
 
-                <p> The sequence can contain all the properties defined by the service <type scope="com::sun::star::text">TextPortion.
+                <p> The sequence can contain all the properties defined by the service TextPortion.
         </p>
 
         @param
@@ -45,7 +45,7 @@ interface XTextPortionAppend : com::sun::star::uno::XInterface
 
         @param
             CharacterAndParagraphProperties can contain all the properties defined by the service
-                      <type scope="com::sun::star::text">Paragraph.
+                      Paragraph.
      */
          com::sun::star::text::XTextRange  appendTextPortion(
                                 [in] string Text,
@@ -55,7 +55,7 @@ interface XTextPortionAppend : com::sun::star::uno::XInterface
 
         /** inserts a new text portion to the paragraph at a given position.
 
-                <p> The sequence can contain all the properties defined by the service <type scope="com::sun::star::text">TextPortion.
+                <p> The sequence can contain all the properties defined by the service TextPortion.
         </p>
 
         @param
@@ -63,7 +63,7 @@ interface XTextPortionAppend : com::sun::star::uno::XInterface
 
         @param
             CharacterAndParagraphProperties can contain all the properties defined by the service
-                      <type scope="com::sun::star::text">Paragraph.
+                      Paragraph.
 
         @param
             TextRange specifies the position of the insert.
diff --git a/offapi/com/sun/star/text/fieldmaster/SetExpression.idl b/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
index 91036e88608b..55ed6c70eb3e 100644
--- a/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
+++ b/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
@@ -41,7 +41,9 @@ published service SetExpression
      is set as number sequence.
      */
     [property]  string NumberingSeparator;
-    /** determines the type of the field as <type scope="com::sun::star::text"SetVariableType</type>
+
+    /** determines the type of the field as
+        com::sun::star::text::SetVariableType
      */
     [property]  short SubType;
 };
diff --git a/offapi/com/sun/star/ucb/CmisContentProvider.idl b/offapi/com/sun/star/ucb/CmisContentProvider.idl
index 131c926a1157..1eb600a1a3f9 100644
--- a/offapi/com/sun/star/ucb/CmisContentProvider.idl
+++ b/offapi/com/sun/star/ucb/CmisContentProvider.idl
@@ -19,7 +19,7 @@
 module com { module sun { module star { module ucb {
 
 /** The Cmis Content Provider implements a ContentProvider
-    for the <Type>UniversalContentBroker</type> (UCB).
+    for the UniversalContentBroker (UCB).
 
     <p>The served contents enable access to directories and files on a
     cmis-enabled server.</p>
diff --git a/offapi/com/sun/star/ucb/FTPContentProvider.idl b/offapi/com/sun/star/ucb/FTPContentProvider.idl
index 1e7229c4d73b..585367af8887 100644
--- a/offapi/com/sun/star/ucb/FTPContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FTPContentProvider.idl
@@ -26,7 +26,7 @@
 module com { module sun { module star { module ucb {
 
 /** The FTP Content Provider (FCP) implements a ContentProvider
-    for the <Type>UniversalContentBroker</type> (UCB).
+    for the UniversalContentBroker (UCB).
 
     <p>The served contents enable access to directories and files on a
     ftp-server.
diff --git a/offapi/com/sun/star/ucb/FileContentProvider.idl b/offapi/com/sun/star/ucb/FileContentProvider.idl
index 3362a6424746..e0f313429f34 100644
--- a/offapi/com/sun/star/ucb/FileContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FileContentProvider.idl
@@ -28,7 +28,7 @@
 module com { module sun { module star { module ucb {
 
 /** The File Content Provider (FCP) implements a ContentProvider
-    for the <Type>UniversalContentBroker</type> (UCB).
+    for the UniversalContentBroker (UCB).
 
     <p>The served contents enable access to the local file system.
 
diff --git a/offapi/com/sun/star/ucb/HelpContentProvider.idl b/offapi/com/sun/star/ucb/HelpContentProvider.idl
index 059179ed895e..86302d41daa3 100644
--- a/offapi/com/sun/star/ucb/HelpContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HelpContentProvider.idl
@@ -26,7 +26,7 @@
 module com { module sun { module star { module ucb {
 
 /** The Help Content Provider (HCP) implements a ContentProvider
-    for the <Type>UniversalContentBroker</type> (UCB).
+    for the UniversalContentBroker (UCB).
 
     <p>The served contents enable access to the help contents and to the
     search engine.
diff --git a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
index e2bd215b2aea..a0690b4409fc 100644
--- a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
@@ -77,7 +77,7 @@ published interface XFetchProviderForContentAccess: com::sun::star::uno::XInterf
                                 , [in] long nRowCount
                                 , [in] boolean bDirection );
 
-    /** returns the <type>XContent</types>s of the columns of the indicated rows
+    /** returns the XContent s of the columns of the indicated rows
 
         @returns
         FetchResult::Rows contains a sequence of anys. Each
diff --git a/offapi/com/sun/star/ui/ConfigurableUIElement.idl b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
index 12a9a42d9c5e..94dd7ce4230c 100644
--- a/offapi/com/sun/star/ui/ConfigurableUIElement.idl
+++ b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
@@ -54,7 +54,7 @@ service ConfigurableUIElement
 
         <p>
         A configurable user interface element must be initialized using
-        <member scope=com::sun::star::lang>XInitialization::initialize</member> before
+        com::sun::star::lang::XInitialization::initialize() before
         it can be used. The following properties must be provided:
         <ul>
             <li><b>ResourceURL</b><br>specifies the user interface name.</li>
diff --git a/offapi/com/sun/star/ui/ItemStyle.idl b/offapi/com/sun/star/ui/ItemStyle.idl
index cfd8558cb240..8479bbc15a75 100644
--- a/offapi/com/sun/star/ui/ItemStyle.idl
+++ b/offapi/com/sun/star/ui/ItemStyle.idl
@@ -112,8 +112,8 @@ constants ItemStyle
 
         <p>This style can also be used for custom toolbars and menus, in a
         custom toolbar an item's Style setting can used to override the
-        toolbar container setting, the style can be bitwise OR-ed with <member
-        scope="::com::sun::star::ui::ItemStyle">TEXT</member> to define text,
+        toolbar container setting, the style can be bitwise OR-ed with
+        ::com::sun::star::ui::ItemStyle::TEXT to define text,
         text+icon or icon only is to be displayed. Similarly for menu items,
         an items Style can override the application setting to display either
         text or icon (note: for menu an icon only setting interpreted as
@@ -141,8 +141,8 @@ constants ItemStyle
 
         <p>This style can be used for custom toolbars and menus, in a custom
         toolbar an item's Style setting can used to override the toolbar
-        container setting, the style can be bitwise OR-ed with <member
-        scope="com::sun::star::ui::ItemStyle">ICON</member> to define text,
+        container setting, the style can be bitwise OR-ed with
+        com::sun::star::ui::ItemStyle::ICON to define text,
         text+icon or icon only is to be displayed. Similarly for menu items,
         an items Style can override the application setting to display either
         text or icon (note: for menu an icon only setting interpreted as
diff --git a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
index ffe2cdadf10a..71fd6a0a640a 100644
--- a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
@@ -49,8 +49,7 @@ service ModuleUICategoryDescription
         can be used by a UI to display the category name.
         The key to a user interface command category depends on the specific
         implementation. OpenOffice.org uses a pre-defined number of
-        identifiers defined in <type scope="::com::sun:star::frame">
-        CommandGroup</type>.
+        identifiers defined in ::com::sun:star::frame::CommandGroup.
         </p>
 
         @see ::com::sun::star::frame::ModuleManager
diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index 0798b51a8d53..9ebceb714e1f 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -52,7 +52,7 @@ service UIElement
     /** interface to initialize a user interface element instance.
 
         A user interface element must be initialized using
-        <member scope=com::sun::star::lang>XInitialization::initialize</member> before
+        com::sun::star::lang::XInitialization::initialize() before
         it can be used. The following property must be provided:
         <ul>
             <li><b>ResourceURL</b>specifies a string property which is the unique identifier of
diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl
index 38d5a8c35b07..47d45aac1128 100644
--- a/offapi/com/sun/star/ui/XImageManager.idl
+++ b/offapi/com/sun/star/ui/XImageManager.idl
@@ -194,7 +194,7 @@ interface XImageManager
     /** initializes an image manager instance.
 
         An image manager instance must be initialized using
-        <member scope=com::sun::star::lang>XInitialization::initialize</member>
+        com::sun::star::lang::XInitialization::initialize()
         before it can be used.<br>
         The following property must be provided if the image manager is
         related to a module:
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
index b6e31168e66d..b538728ac7da 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
@@ -38,7 +38,7 @@ interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterf
         @param ModuleIdentifier
             a module identifier which identifies an OpenOffice.org module. The
             module identifier can be retrieved from the
-            <type scope=com::sun::star::frame>ModuleManager</type> service.
+            com::sun::star::frame::ModuleManager service.
 
         @returns
             an object implementing
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index 9493d78a24bd..f67284c0c177 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui {
     com::sun::star::awt::XSystemDependentMenuBarPeer
     which supports to retrieve the system dependent menu handle.
     A floating window or a toolbar user interface element return a
-    <type scope=com::sun::star::awt>XWindow</type>
+    com::sun::star::awt::XWindow
     interface.
     </p>
 */
diff --git a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
index a2cb04ab80b3..1bd17ccd35df 100644
--- a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module ui { module dialogs {
 
     <p>The application will set the com::sun::star::document::MediaDescriptor
     using the interface com::sun::star::beans::XPropertyAccess and then
-    call <method>XExecutableDialog::execute<method>.</p>
+    call XExecutableDialog::execute().</p>
 
     <p>If that method returns <code>ExecutableDialogResults::OK</code>,
     the application will retrieve the changed com::sun::star::document::MediaDescriptor
@@ -58,9 +58,10 @@ published service FilterOptionsDialog
 
     /** this interface executes a dialog that displays the options
         for a filter.
-        If <method>XExecutableDialog::execute<method>
+        If XExecutableDialog::execute()
         returns <code>ExecutableDialogResults::OK</code>,
-        the options can be retrieved by calling <method scope="com::sun::star::beans">XPropertyAccess::getPropertyValues<method>.
+        the options can be retrieved by calling
+        com::sun::star::beans::XPropertyAccess::getPropertyValues.
      */
     interface ::com::sun::star::ui::dialogs::XExecutableDialog;
 };
diff --git a/offapi/com/sun/star/util/SortDescriptor.idl b/offapi/com/sun/star/util/SortDescriptor.idl
index 7f7f38f34341..4854064da1ba 100644
--- a/offapi/com/sun/star/util/SortDescriptor.idl
+++ b/offapi/com/sun/star/util/SortDescriptor.idl
@@ -47,7 +47,7 @@ published service SortDescriptor
             The sorting order may be defined for separate keys in specific
             implementations. For those this property may not need to be set.
 
-            @see <type scope"com::sun::star::text">TextSortDescriptor</type>
+            @see com::sun::star::text::TextSortDescriptor
      */
         [optional, property] boolean SortAscending;
 
@@ -78,7 +78,7 @@ published service SortDescriptor
             The collator algorithm may be defined for separate keys in specific
             implementations. For those this property may not need to be set.
 
-            @see <type scope"com::sun::star::text">TextSortDescriptor</type>
+            @see com::sun::star::text::TextSortDescriptor
 
             @see com::sun::star::i18n::XCollator
      */
diff --git a/offapi/com/sun/star/view/PrinterDescriptor.idl b/offapi/com/sun/star/view/PrinterDescriptor.idl
index c419500e9afb..0d184df4948b 100644
--- a/offapi/com/sun/star/view/PrinterDescriptor.idl
+++ b/offapi/com/sun/star/view/PrinterDescriptor.idl
@@ -32,7 +32,8 @@ module com {  module sun {  module star {  module view {
 
 /** describes a printer by specifying the queue name and some settings.
 
-    <p>This service may be represented by a <type scope="com::sun::star::beans" dim="[]">PropertyValue</type>.
+    <p>This service may be represented by a
+    com::sun::star::beans::PropertyValue[].
 
     @see com::sun::star::beans::PropertyValue
  */
@@ -53,14 +54,14 @@ published service PrinterDescriptor
         is a user-defined size.
 
         <p>Setting this property may change the value of
-        #PrinterDescriptorPaperSize</member.</p>
+        #PrinterDescriptorPaperSize.</p>
      */
     [property] com::sun::star::view::PaperFormat PaperFormat;
 
     /** specifies the size of the paper in 100th mm.
 
         <p>Setting this property may change the value of
-        #PrinterDescriptorPaperFormat</member.</p>
+        #PrinterDescriptorPaperFormat.</p>
      */
     [property] com::sun::star::awt::Size PaperSize;
 
diff --git a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
index a00f04464e56..d7c8bd9e016a 100644
--- a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
@@ -29,7 +29,7 @@ module com {  module sun {  module star {  module view {
 /** makes it possible to append and remove objects from a selection.
 
     <p>The method XSelectionSupplier::setSelection() for an
-    instance that also supports <type>XMultiSelectionSupplier</method> should
+    instance that also supports XMultiSelectionSupplier should
     be implemented that it also takes either a selectable object or a sequence
     of selectable objects.</p>
 
diff --git a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
index 6361a6dffa92..8bcd45062347 100644
--- a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
@@ -31,7 +31,7 @@ module com {  module sun {  module star {  module xml {  module sax {
 /** a container for the attributes of an XML element.
 
     <br>Attributes are separated into known attributes and unknown attributes.
-    <p>Known attributes have a local name that is known to the <type>XFastTokenHandler</token>
+    <p>Known attributes have a local name that is known to the XFastTokenHandler
     registered at the XFastParser which created the sax event containing
     this attributes. If an attribute also has a namespace, that must be registered
     at the XFastParser, else this attribute is also unknown even if