diff --git a/plugins/doc/org.eclipse.papyrus.sirius.doc/src/site/mediawiki/papyrus-sirius-userDoc.mediawiki b/plugins/doc/org.eclipse.papyrus.sirius.doc/src/site/mediawiki/papyrus-sirius-userDoc.mediawiki
index 972c1b2..4dcc7a6 100755
--- a/plugins/doc/org.eclipse.papyrus.sirius.doc/src/site/mediawiki/papyrus-sirius-userDoc.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.sirius.doc/src/site/mediawiki/papyrus-sirius-userDoc.mediawiki
@@ -268,7 +268,10 @@
 * Ports cannot be drag and dropped on another container (like Border nodes in other diagrams)
 
 == Semantic Drag and Drop ==
-Same rules as for the Composite Structure diagram are used here. No specific cases have been implemented here. 
+Same rules as for the Composite Structure diagram are used here.
+Some specific cases have been implemented here:
+* Type can be drag and drop on Property or Port to type its associated semantic element.
+* Property/Port contained in Type can be drag and drop on Property/Port typed by this Type.
 
 == Reconnection ==
 Same rules as for the Composite Structure diagram are used here.
@@ -321,7 +324,7 @@
 == Semantic Drag and Drop ==
 If a user want to drag and drop an element from the model explorer view on the diagram, he has to select the element from ModelExplorer view and drag and drop it into its container Node in the diagram (no semantic modification). 
 Semantic drag and drop will always be authorized in its container representation except for specific case :
-* Class can be drag and drop on Property or Port to type its associated semantic element.
+* Type can be drag and drop on Property or Port to type its associated semantic element.
 * Collaboration can be drag and drop on CollaborationUse to type its associated semantic element.
 Semantic drag and drop of Edge will drag and drop Edge on diagram if it does not already exist. If source Edge or target Edge or both are not represented on diagram, source and/or target will be drag and drop too.
 
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/src/org/eclipse/papyrus/sirius/uml/diagram/component/services/ComponentDiagramDropBehaviorProvider.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/src/org/eclipse/papyrus/sirius/uml/diagram/component/services/ComponentDiagramDropBehaviorProvider.java
index 01f382d..fcaae85 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/src/org/eclipse/papyrus/sirius/uml/diagram/component/services/ComponentDiagramDropBehaviorProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/src/org/eclipse/papyrus/sirius/uml/diagram/component/services/ComponentDiagramDropBehaviorProvider.java
@@ -29,7 +29,7 @@
 public class ComponentDiagramDropBehaviorProvider extends AbstractDiagramServices {
 
 	/**
-	 * Checks if a given droppedElement can be drag and dropped from Model Explorer into a given newContainer.
+	 * Checks if a given droppedElement can be drag and dropped from Model Explorer view into a given newContainer.
 	 *
 	 * @param droppedElement
 	 *            the UML element to drag and drop
@@ -45,7 +45,7 @@
 	}
 
 	/**
-	 * Drag and drop a given semantic droppedElement from Model Explorer into a graphical containerView.
+	 * Drag and drop a given semantic droppedElement from Model Explorer view into a graphical containerView.
 	 *
 	 * @param droppedElement
 	 *            the semantic UML element to drag and drop