diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
index cf6fe58a8552f9eb46341770b53acf0d54f17889..97efed44048e4b74008724c7109302add888796f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
@@ -118,7 +118,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
 
 /**
- * You can think of {@link ICommonServer} as the openBIS core. It contains entity-type unspecific
+ * Definition of the client-server interface of the openBIS core. It contains entity-type unspecific
  * operations needed by all openBIS installations. Customization for a specific use cases (i.e.
  * specific entity types) can be achieved through implementing plugins.
  * 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java
index 4480e02adeeecd2e18f86696b6cbd9a40540b16f..7027063db24dba8e725cfec765bcc569cf59dda3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java
@@ -66,6 +66,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentUpdatesDTO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SampleUpdatesDTO;
 
 /**
+ * Definition of the client-server interface.
+ * <p>
  * Provides backend support for the "default" rendering of detail views (e.g. for samples,
  * materials, datasets) of the openBIS presentation layer. Plugins have the choice to either use
  * this "generic" functionality, or to implement/extend it on their own. {@link IGenericServer} can
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java.expected b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java.expected
index 4c43bd74b2331c69c3ee944fc32cb229f0c86d2a..97efed44048e4b74008724c7109302add888796f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java.expected
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java.expected
@@ -118,7 +118,9 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
 
 /**
- * Definition of the client-server interface.
+ * Definition of the client-server interface of the openBIS core. It contains entity-type unspecific
+ * operations needed by all openBIS installations. Customization for a specific use cases (i.e.
+ * specific entity types) can be achieved through implementing plugins.
  * 
  * @author Franz-Josef Elmer
  */
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java.expected b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java.expected
index 7f5c626b1c4ebfc9f994486fa064c4f106a1a856..7027063db24dba8e725cfec765bcc569cf59dda3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java.expected
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java.expected
@@ -67,6 +67,12 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SampleUpdatesDTO;
 
 /**
  * Definition of the client-server interface.
+ * <p>
+ * Provides backend support for the "default" rendering of detail views (e.g. for samples,
+ * materials, datasets) of the openBIS presentation layer. Plugins have the choice to either use
+ * this "generic" functionality, or to implement/extend it on their own. {@link IGenericServer} can
+ * be thought of as an optional convenience/utility service that goes together with the central
+ * entity-type unspecific <code>ICommonServer</code>.
  * 
  * @author Franz-Josef Elmer
  */