diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java
index 911ed5d86442f2b664e54f2314211341bbd82ea7..2cbd184ca810d1b52666a83b6fb369ac57757e99 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java
@@ -20,11 +20,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Interface implemented by objects describing an input UI element (text field, combo box).
- * <p>
- * All methods of this interface are part of the Managed Properties API.
  * 
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IManagedInputWidgetDescription extends ISerializable
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java
index e08874838eddc0eb9b0572a2a7b4b36b711b401d..c56a825971680778ff6d5b384e4ffbd02da1c6da 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java
@@ -20,11 +20,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Factory for creation of instances of {@link IManagedInputWidgetDescription}.
- * <p>
- * All methods of this interface are part of the Managed Properties API.
  * 
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IManagedInputWidgetDescriptionFactory extends ISerializable
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java
index 4a45a9f3aaeeb739dc69d7dc3317270235dcce70..e647d91deb0636c7d74929840b1bc4ad1db13057 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java
@@ -20,11 +20,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Interface implemented by objects describing an output UI element (table, label).
- * <p>
- * All methods of this interface are part of the Managed Properties API.
  * 
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IManagedOutputWidgetDescription extends ISerializable
 {
     /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java
index e88c2d92a43ed897178ca98ed0fa79b5d5b11c84..0d8c5e5e2c11e4d7c416cd6bedc284aa66b16cf0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java
@@ -20,11 +20,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Interface implemented by managed property.
- * <p>
- * All methods of this interface are part of the Managed Properties API.
  * 
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IManagedProperty extends ISerializable
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java
index e2a0bdd3f673784953ef2da53fd60d445dbca14b..31371e438452e3ada6f5cb7ad0dec82637f71287 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java
@@ -22,11 +22,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Description of action that a user can perform on the client side.
- * <p>
- * All methods of this interface are part of the Managed Properties API.
  * 
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IManagedUiAction extends ISerializable
 {
     /** Returns string identifier of the action. */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java
index df89db8dec49d8bc5d4578701df89089e0f8cdd0..1e189d3c4754bd891115f9da1e297ca989186633 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java
@@ -25,6 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
  * 
  * @author Chandrasekhar Ramakrishnan
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IManagedUiDescription extends ISerializable
 {
     /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiTableAction.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiTableAction.java
index 6810a8e23e126cb34e742c0a8e19a53507ad48b6..e63839c5da8a20364dc526650f766dd623a8d657 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiTableAction.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiTableAction.java
@@ -27,12 +27,11 @@ import java.util.Map;
  * <p>
  * For actions that require single row to be selected it is possible to bind values of selected
  * row's columns with input fields (e.g. useful in edit actions).
- * <p>
- * All methods of this interface are part of the Managed Properties API.
  * 
  * @see ManagedTableActionRowSelectionType
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IManagedUiTableAction extends IManagedUiAction
 {
     /** Returns selection type specifying when the action should be enabled. */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java
index 593c44a8a6f1cb3351e709e0e31dea09f8b0d50f..7837acf7a49c106c95d7e7deda643f43eb79e0ef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java
@@ -20,11 +20,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Representation of a user, e.g. one who modifies a property.
- * <p>
- * <b>All methods of this interface are part of the Managed Properties API.</b>
  * 
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IPerson extends ISerializable
 {
     /** @return id of the user */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java
index c9d232c672fdf2c16e74244438fcd70860bce1a5..882014a3aca72534f81beb8921c629965f4e41c9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java
@@ -20,11 +20,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Interface implemented by table models.
- * <p>
- * NOTE: For now the interface is empty. It was introduced not to expose internal API.
  * 
  * @author Piotr Buczek
  */
+// NOTE: For now the interface is empty. It was introduced not to expose internal API
 public interface ITableModel extends ISerializable
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java
index 69956c101c1ae7821440994a4286ffb7f380783e..6d472aa58b23c4c20cfdc27cdef27f2cf9d77a97 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java
@@ -19,10 +19,9 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
 import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
- * NOTE: This enumeration is part of the Managed Properties API.
- * 
  * @author Chandrasekhar Ramakrishnan
  */
+// NOTE: This enumeration is part of the Managed Properties API.
 public enum ManagedInputFieldType implements ISerializable
 {
     TEXT, MULTILINE_TEXT, COMBO_BOX
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java
index fb2d438dca90879a1f82f69bcd75b91d4def2cfe..60187549004b842b25946b0ee337d5e926b3c6ee 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java
@@ -19,10 +19,9 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
 import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
- * NOTE: This enumeration is part of the Managed Properties API.
- * 
  * @author Piotr Buczek
  */
+// NOTE: This enumeration is part of the Managed Properties API.
 public enum ManagedOutputWidgetType implements ISerializable
 {
     TABLE, LABEL;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java
index 1f8fdccddbc2b71aaae345646ece612612ef95f2..26e139bb033ea2e021064b52375b54663c79e9a5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java
@@ -20,11 +20,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Selection modes of table actions.
- * <p>
- * NOTE: This enumeration is part of the Managed Properties API.
  * 
  * @author Piotr Buczek
  */
+// NOTE: This enumeration is part of the Managed Properties API.
 public enum ManagedTableActionRowSelectionType implements ISerializable
 {
     /** e.g. create/add action */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/EntityLinkElementKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/EntityLinkElementKind.java
index 637a59ab57daf5a01ed7da674daf6abe765e282b..1cc88d3e6d7ee3c6150de21ca688c0124f3a7b1e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/EntityLinkElementKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/EntityLinkElementKind.java
@@ -18,11 +18,10 @@ package ch.systemsx.cisd.openbis.generic.shared.managed_property.api;
 
 /**
  * The type of an entity link.
- * <p>
- * NOTE: This enumeration is part of the Managed Properties API.
  * 
  * @author Kaloyan Enimanev
  */
+// NOTE: This enum is part of the Managed Properties API.
 public enum EntityLinkElementKind
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElement.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElement.java
index f5c35b298384704f5d19bc2e0f692dd056ec9a6f..3fb13c8232463990a9e1f626d00fcacf3c2c6c2e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElement.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElement.java
@@ -26,12 +26,11 @@ import java.util.Map;
  * <p>
  * {@link IElement}-s are meant to be used as a convenient, hierarchical property-value persistence
  * technique for managed properties.
- * <p>
- * <b>All methods of this interface are part of the Managed Properties API.</b>
  * 
  * @author Piotr Buczek
  * @author Kaloyan Enimanev
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IElement
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElementFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElementFactory.java
index d78be893ad8fec40cbc99a414301d4efb277f9a2..ca1ea3bb5211f8980dcff2be8384e08e29550253 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElementFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElementFactory.java
@@ -18,11 +18,10 @@ package ch.systemsx.cisd.openbis.generic.shared.managed_property.api;
 
 /**
  * Contains helper method to construct {@link IElement} instances.
- * <p>
- * <b>All methods of this enum are part of the Managed Properties API.</b>
  * 
  * @author Kaloyan Enimanev
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IElementFactory
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityInformationProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityInformationProvider.java
index 75f647026694e3f96aa23badfea8246f12123c92..347af1603955c4f491d51b8f6adb9b74ecb1f0c8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityInformationProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityInformationProvider.java
@@ -18,11 +18,10 @@ package ch.systemsx.cisd.openbis.generic.shared.managed_property.api;
 
 /**
  * Provides required information about entities.
- * <p>
- * <b>All methods of this enum are part of the Managed Properties API.</b>
  * 
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IEntityInformationProvider
 {
     /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityLinkElement.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityLinkElement.java
index 391ceef7d689635dd34fb3fc929969c0c4e5c117..9aed6a98b705f49a47e192a45dda4ec95f91dc33 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityLinkElement.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityLinkElement.java
@@ -18,11 +18,10 @@ package ch.systemsx.cisd.openbis.generic.shared.managed_property.api;
 
 /**
  * Denotes a link to an entity in the openBIS database.
- * <p>
- * <b>All methods of this enum are part of the Managed Properties API.</b>
  * 
  * @author Kaloyan Enimanev
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IEntityLinkElement extends IElement
 {
     /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IRowBuilderAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IRowBuilderAdaptor.java
index 591de1973946343141e405d54aa668645a623ec2..19a7d8d3dde6beecaa50d49f0e0653c5e3d822fa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IRowBuilderAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IRowBuilderAdaptor.java
@@ -20,12 +20,11 @@ import java.util.Date;
 
 /**
  * Builder of a row of a simple table.
- * <p>
- * <b>All methods of this enum are part of the Managed Properties API.</b>
  * 
  * @see ISimpleTableModelBuilderAdaptor
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IRowBuilderAdaptor
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/ISimpleTableModelBuilderAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/ISimpleTableModelBuilderAdaptor.java
index 0ab800943b78a9d77ecb98738ad28b493da49c06..540fe223c717d5f02312ac1fd24dc43ac0f2d233 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/ISimpleTableModelBuilderAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/ISimpleTableModelBuilderAdaptor.java
@@ -21,11 +21,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.ITableModel;
 
 /**
  * Builder of simple table models. All column titles should be unique.
- * <p>
- * <b>All methods of this enum are part of the Managed Properties API.</b>
  * 
  * @author Piotr Buczek
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface ISimpleTableModelBuilderAdaptor
 {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IStructuredPropertyConverter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IStructuredPropertyConverter.java
index a7c63ee69c30ed4b758cb80b670fef0412f99116..04bb8861f6a9c7a3cb66950d8945decaa91c1504 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IStructuredPropertyConverter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IStructuredPropertyConverter.java
@@ -23,11 +23,10 @@ import ch.systemsx.cisd.openbis.generic.shared.managed_property.structured.Eleme
 
 /**
  * Abstracts the conversion of {@link Element} objects to/from database strings.
- * <p>
- * <b>All methods of this enum are part of the Managed Properties API.</b>
  * 
  * @author Kaloyan Enimanev
  */
+// NOTE: All methods of this interface are part of the Managed Properties API.
 public interface IStructuredPropertyConverter
 {
     /**