Fixed extra space in printing notation { x & P } + minor other things

(shorter proof of O_S in trunk + typo).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12271 85f007b7-540e-0410-9357-904b9bb8a0f7

2 files changed, 5 insertions, 6 deletions

diff --git a/theories/Init/Notations.v b/theories/Init/Notations.v
index c4780ace5..0c628298d 100644
--- a/theories/Init/Notations.v
+++ b/theories/Init/Notations.v
@@ -68,13 +68,13 @@ Reserved Notation "{ x }" (at level 0, x at level 99).
 (** Notations for sigma-types or subsets *)
 
 Reserved Notation "{ x  |  P }" (at level 0, x at level 99).
-Reserved Notation "{ x  |  P  &  Q }" (at level 0, x at level 99).
+Reserved Notation "{ x  |  P  & Q }" (at level 0, x at level 99).
 
 Reserved Notation "{ x : A  |  P }" (at level 0, x at level 99).
-Reserved Notation "{ x : A  |  P  &  Q }" (at level 0, x at level 99).
+Reserved Notation "{ x : A  |  P  & Q }" (at level 0, x at level 99).
 
-Reserved Notation "{ x : A  &  P }" (at level 0, x at level 99).
-Reserved Notation "{ x : A  &  P  &  Q }" (at level 0, x at level 99).
+Reserved Notation "{ x : A  & P }" (at level 0, x at level 99).
+Reserved Notation "{ x : A  & P  & Q }" (at level 0, x at level 99).
 
 Delimit Scope type_scope with type.
 Delimit Scope core_scope with core.
diff --git a/theories/Init/Peano.v b/theories/Init/Peano.v
index 322a25468..9924d8a65 100644
--- a/theories/Init/Peano.v
+++ b/theories/Init/Peano.v
@@ -77,8 +77,7 @@ Definition IsSucc (n:nat) : Prop :=
 
 Theorem O_S : forall n:nat, 0 <> S n.
 Proof.
-  unfold not; intros n H.
-  inversion H.
+  discriminate.
 Qed.
 Hint Resolve O_S: core.