2 files changed, 18 insertions, 8 deletions
diff --git a/test-suite/bugs/closed/shouldsucceed/2603.v b/test-suite/bugs/closed/shouldsucceed/2603.v
index a556b9bf4..371bfdc57 100644
--- a/test-suite/bugs/closed/shouldsucceed/2603.v
+++ b/test-suite/bugs/closed/shouldsucceed/2603.v
@@ -1,3 +1,18 @@
+(** Namespace of module vs. namescope of definitions/constructors/...
+
+As noticed by A. Appel in bug #2603, module names and definition
+names used to be in the same namespace. But conflict with names
+of constructors (or 2nd mutual inductive...) used to not be checked
+enough, leading to stange situations.
+
+- In 8.3pl3 we introduced checks that forbid uniformly the following
+  situations.
+
+- For 8.4 we finally managed to make module names and other names
+  live in two separate namespace, hence allowing all of the following
+  situations.
+*)
+
 Module Type T.
 End T.
 
@@ -9,10 +24,10 @@ End L.
 
 Module M1 : L with Module E:=K.
 Module E := K.
-Fail Inductive t := E. (* Used to be accepted, but End M1 below was failing *)
+Inductive t := E. (* Used to be accepted, but End M1 below was failing *)
 End M1.
 
 Module M2 : L with Module E:=K.
 Inductive t := E.
-Fail Module E := K. (* Used to be accepted *)
-Fail End M2. (* Used to be accepted *)
+Module E := K. (* Used to be accepted *)
+End M2. (* Used to be accepted *)
diff --git a/test-suite/success/Hints.v b/test-suite/success/Hints.v
index a93f89000..071fb9579 100644
--- a/test-suite/success/Hints.v
+++ b/test-suite/success/Hints.v
@@ -16,11 +16,6 @@ Hint Immediate refl_equal sym_equal: foo.
 Hint Unfold fst sym_equal.
 Hint Unfold fst sym_equal: foo.
 
-(* What's this stranged syntax ? *)
-Hint Destruct h6 := 4 Conclusion (_ <= _) => fun H => apply H.
-Hint Destruct h7 := 4 Discardable Hypothesis (_ <= _) => fun H => apply H.
-Hint Destruct h8 := 4 Hypothesis (_ <= _) => fun H => apply H.
-
 (* Checks that local names are accepted *)
 Section A.
   Remark Refl : forall (A : Set) (x : A), x = x.