ZArith + other : favor the use of modern names instead of compat notations

 - For instance, refl_equal --> eq_refl
 - Npos, Zpos, Zneg now admit more uniform qualified aliases
   N.pos, Z.pos, Z.neg.
 - A new module BinInt.Pos2Z with results about injections from
   positive to Z
 - A result about Z.pow pushed in the generic layer
 - Zmult_le_compat_{r,l} --> Z.mul_le_mono_nonneg_{r,l}
 - Using tactic Z.le_elim instead of Zle_lt_or_eq
 - Some cleanup in ring, field, micromega
   (use of "Equivalence", "Proper" ...)
 - Some adaptions in QArith (for instance changed Qpower.Qpower_decomp)
 - In ZMake and ZMake, functor parameters are now named NN and ZZ
   instead of N and Z for avoiding confusions

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

1 files changed, 2 insertions, 2 deletions

diff --git a/theories/ZArith/Zeven.v b/theories/ZArith/Zeven.v
index a032a801d..bef8ee78b 100644
--- a/theories/ZArith/Zeven.v
+++ b/theories/ZArith/Zeven.v
@@ -136,7 +136,7 @@ Notation Zodd_bool_succ := Z.odd_succ (compat "8.3").
 Notation Zodd_bool_pred := Z.odd_pred (compat "8.3").
 
 (******************************************************************)
-(** * Definition of [Zquot2], [Zdiv2] and properties wrt [Zeven]
+(** * Definition of [Z.quot2], [Z.div2] and properties wrt [Zeven]
   and [Zodd] *)
 
 Notation Zdiv2 := Z.div2 (compat "8.3").
@@ -225,7 +225,7 @@ Lemma Zsplit2 n :
  {p : Z * Z | let (x1, x2) := p in n = x1 + x2 /\ (x1 = x2 \/ x2 = x1 + 1)}.
 Proof.
  destruct (Z_modulo_2 n) as [(y,Hy)|(y,Hy)];
-  rewrite Z.mul_comm, <- Zplus_diag_eq_mult_2 in Hy.
+  rewrite <- Z.add_diag in Hy.
  - exists (y, y). split. assumption. now left.
  - exists (y, y + 1). split. now rewrite Z.add_assoc. now right.
 Qed.