* algebra/catdef.spad.pamphlet (OrderedRing): Extend

	CharactericZero too.

3 files changed, 10 insertions, 15 deletions

diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index 0bd4dfc6..979b4314 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -174,7 +174,7 @@ strap-0/RMODULE.$(FASLEXT): strap-0/ABELGRP.$(FASLEXT) \
 strap-0/SRING.$(FASLEXT): strap-0/ABELMON.$(FASLEXT) \
 	strap-0/MONOID.$(FASLEXT)
 strap-0/ORDRING.$(FASLEXT): strap-0/OAGROUP.$(FASLEXT) \
-	strap-0/RING.$(FASLEXT) strap-0/MONOID.$(FASLEXT)
+	strap-0/CHARZ.$(FASLEXT) strap-0/MONOID.$(FASLEXT)
 strap-0/RING.$(FASLEXT): strap-0/RNG.$(FASLEXT) \
 	strap-0/SRING.$(FASLEXT) \
 	strap-0/LMODULE.$(FASLEXT) strap-0/KRCFROM.$(FASLEXT)
@@ -491,7 +491,7 @@ strap-1/SRING.$(FASLEXT): strap-1/ABELMON.$(FASLEXT) \
 	strap-1/MONOID.$(FASLEXT)
 
 strap-1/ORDRING.$(FASLEXT): strap-1/OAGROUP.$(FASLEXT) \
-	strap-1/RING.$(FASLEXT) strap-1/MONOID.$(FASLEXT)
+	strap-1/CHARZ.$(FASLEXT) strap-1/MONOID.$(FASLEXT)
 
 strap-1/COMRING.$(FASLEXT): strap-1/RING.$(FASLEXT) \
 	strap-1/BMODULE.$(FASLEXT)
@@ -506,9 +506,6 @@ strap-1/INTDOM.$(FASLEXT): strap-1/COMRING.$(FASLEXT) \
 	strap-1/ALGEBRA.$(FASLEXT) strap-1/ENTIRER.$(FASLEXT) \
 	strap-0/FIELD.$(FASLEXT)
 
-strap-1/ORDRING.$(FASLEXT): strap-1/OAGROUP.$(FASLEXT) \
-	strap-1/RING.$(FASLEXT) strap-1/MONOID.$(FASLEXT)
-
 strap-1/OINTDOM.$(FASLEXT): strap-1/INTDOM.$(FASLEXT) \
 	strap-1/ORDRING.$(FASLEXT)
 
@@ -852,7 +849,7 @@ strap-2/SRING.$(FASLEXT): strap-2/ABELMON.$(FASLEXT) \
 strap-2/DIOID.$(FASLEXT): strap-2/OAMON.$(FASLEXT) strap-2/SRING.$(FASLEXT)
 
 strap-2/ORDRING.$(FASLEXT): strap-2/OAGROUP.$(FASLEXT) \
-	strap-2/RING.$(FASLEXT) strap-2/MONOID.$(FASLEXT)
+	strap-2/CHARZ.$(FASLEXT) strap-2/MONOID.$(FASLEXT)
 
 strap-2/COMRING.$(FASLEXT): strap-2/RING.$(FASLEXT) \
 	strap-2/BMODULE.$(FASLEXT)
@@ -1526,7 +1523,7 @@ $(OUT)/RING.$(FASLEXT): $(OUT)/RNG.$(FASLEXT) $(OUT)/SRING.$(FASLEXT) \
 $(OUT)/MONOID.$(FASLEXT): $(OUT)/SGROUP.$(FASLEXT)
 $(OUT)/ABELGRP.$(FASLEXT): $(OUT)/CABMON.$(FASLEXT) $(OUT)/LLINSET.$(FASLEXT)
 $(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT)
-$(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/RING.$(FASLEXT) \
+$(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \
 	$(OUT)/MONOID.$(FASLEXT)
 $(OUT)/COMRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
 $(OUT)/DIFRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT)
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index d42b3b54..3594cecf 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -1664,7 +1664,7 @@ strap-0/RMODULE.$(FASLEXT): strap-0/ABELGRP.$(FASLEXT) \
 strap-0/SRING.$(FASLEXT): strap-0/ABELMON.$(FASLEXT) \
 	strap-0/MONOID.$(FASLEXT)
 strap-0/ORDRING.$(FASLEXT): strap-0/OAGROUP.$(FASLEXT) \
-	strap-0/RING.$(FASLEXT) strap-0/MONOID.$(FASLEXT)
+	strap-0/CHARZ.$(FASLEXT) strap-0/MONOID.$(FASLEXT)
 strap-0/RING.$(FASLEXT): strap-0/RNG.$(FASLEXT) \
 	strap-0/SRING.$(FASLEXT) \
 	strap-0/LMODULE.$(FASLEXT) strap-0/KRCFROM.$(FASLEXT)
@@ -1981,7 +1981,7 @@ strap-1/SRING.$(FASLEXT): strap-1/ABELMON.$(FASLEXT) \
 	strap-1/MONOID.$(FASLEXT)
 
 strap-1/ORDRING.$(FASLEXT): strap-1/OAGROUP.$(FASLEXT) \
-	strap-1/RING.$(FASLEXT) strap-1/MONOID.$(FASLEXT)
+	strap-1/CHARZ.$(FASLEXT) strap-1/MONOID.$(FASLEXT)
 
 strap-1/COMRING.$(FASLEXT): strap-1/RING.$(FASLEXT) \
 	strap-1/BMODULE.$(FASLEXT)
@@ -1996,9 +1996,6 @@ strap-1/INTDOM.$(FASLEXT): strap-1/COMRING.$(FASLEXT) \
 	strap-1/ALGEBRA.$(FASLEXT) strap-1/ENTIRER.$(FASLEXT) \
 	strap-0/FIELD.$(FASLEXT)
 
-strap-1/ORDRING.$(FASLEXT): strap-1/OAGROUP.$(FASLEXT) \
-	strap-1/RING.$(FASLEXT) strap-1/MONOID.$(FASLEXT)
-
 strap-1/OINTDOM.$(FASLEXT): strap-1/INTDOM.$(FASLEXT) \
 	strap-1/ORDRING.$(FASLEXT)
 
@@ -2342,7 +2339,7 @@ strap-2/SRING.$(FASLEXT): strap-2/ABELMON.$(FASLEXT) \
 strap-2/DIOID.$(FASLEXT): strap-2/OAMON.$(FASLEXT) strap-2/SRING.$(FASLEXT)
 
 strap-2/ORDRING.$(FASLEXT): strap-2/OAGROUP.$(FASLEXT) \
-	strap-2/RING.$(FASLEXT) strap-2/MONOID.$(FASLEXT)
+	strap-2/CHARZ.$(FASLEXT) strap-2/MONOID.$(FASLEXT)
 
 strap-2/COMRING.$(FASLEXT): strap-2/RING.$(FASLEXT) \
 	strap-2/BMODULE.$(FASLEXT)
@@ -2825,7 +2822,7 @@ $(OUT)/RING.$(FASLEXT): $(OUT)/RNG.$(FASLEXT) $(OUT)/SRING.$(FASLEXT) \
 $(OUT)/MONOID.$(FASLEXT): $(OUT)/SGROUP.$(FASLEXT)
 $(OUT)/ABELGRP.$(FASLEXT): $(OUT)/CABMON.$(FASLEXT) $(OUT)/LLINSET.$(FASLEXT)
 $(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT)
-$(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/RING.$(FASLEXT) \
+$(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \
 	$(OUT)/MONOID.$(FASLEXT)
 $(OUT)/COMRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
 $(OUT)/DIFRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT)
diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet
index fa6edba6..8261e7ea 100644
--- a/src/algebra/catdef.spad.pamphlet
+++ b/src/algebra/catdef.spad.pamphlet
@@ -1630,7 +1630,8 @@ OrderedMonoid(): Category == Join(OrderedSemiGroup, Monoid)
 ++ Axiom:
 ++   \spad{0<a and b<c => ab< ac}
 
-OrderedRing(): Category == Join(OrderedAbelianGroup,Ring,Monoid)
+OrderedRing(): Category ==
+  Join(OrderedAbelianGroup,CharacteristicZero,Monoid)
 
 @