[Axiom-developer] 20080729.03.tpd.patch (bookvol7.1 part 2 of 2)

[daly]

part 2 of 2 patch with updates to the primes and factorization branch
=======================================================================
diff --git a/books/bookvol7.1.pamphlet b/books/bookvol7.1.pamphlet
index c022143..a595b42 100644
--- a/books/bookvol7.1.pamphlet
+++ b/books/bookvol7.1.pamphlet
@@ -2579,6 +2579,7 @@ answer for \texht{$12^2$}{12**2}.
 \pagehead{BinaryExpansionXmpPage}{binary.ht}{BinaryExpansion}
 \pagepic{ps/v71binaryexpansionxmppage.eps}{BinaryExpansionXmpPage}
 \pagefrom{Axiom Number Types}{NumberPage}
+\pagefrom{Integer}{IntegerXmpPage}
 \pageto{DecimalExpansion}{DecimalExpansionXmpPage}
 \pageto{RadixExpansion}{RadixExpansionXmpPage}
 \pageto{HexadecimalExpansion}{HexExpansionXmpPage}
@@ -4001,8 +4002,9 @@ for t in 1..4]) \bound{lhs}\free{g gam m n r s}}
 \pagehead{ComplexXmpPage}{complex.ht}{Complex}
 \pagepic{ps/v71complexxmppage.eps}{ComplexXmpPage}
 \pagefrom{Axiom Number Types}{NumberPage}
+\pagefrom{Primes and Factorization}{ugxIntegerPrimesPage}
 \pageto{Numeric Functions}{ugProblemNumericPage}
-\pageto{notitle}{ugTypesConvertPage}
+\pageto{Conversion}{ugTypesConvertPage}
 <<complex.ht>>=
 \begin{page}{ComplexXmpPage}{Complex}
 \beginscroll
@@ -5117,6 +5119,7 @@ u=0..\%pi,v=0..2*\%pi)}
 \pagehead{DecimalExpansionXmpPage}{decimal.ht}{Decimal Expansion}
 \pagepic{ps/v71decimalexpansionxmppage.eps}{DecimalExpansionXmpPage}
 \pagefrom{Axiom Number Types}{NumberPage}
+\pagefrom{Integer}{IntegerXmpPage}
 \pageto{BinaryExpansion}{BinaryExpansionXmpPage}
 \pageto{HexadecimalExpansion}{HexExpansionXmpPage}
 \pageto{RadixExpansion}{RadixExpansionXmpPage}
@@ -7839,11 +7842,16 @@ with the given extension, and the same defaults are 
used.
 @
 \section{fr.ht}
 \pagehead{FactoredXmpPage}{fr.ht}{Factored}
-\pageto{notitle}{ugxFactoredDecompPage}
-\pageto{notitle}{ugxFactoredExpandPage}
-\pageto{notitle}{ugxFactoredArithPage}
-\pageto{notitle}{ugxFactoredNewPage}
-\pageto{notitle}{ugxFactoredVarPage}
+\pagepic{ps/v71factoredxmppage.eps}{FactoredXmpPage}
+\pagefrom{Primes and Factorization}{ugxIntegerPrimesPage}
+\pagefrom{Computation of Galois Groups}{ugProblemGaloisPage}
+\pagefrom{FactoredFunctions2}{FactoredFnsTwoXmpPage}
+\pagefrom{Some Examples of Domains and Packages}{ExamplesExposedPage}
+\pageto{Decomposing Factored Objects}{ugxFactoredDecompPage}
+\pageto{Expanding Factored Objects}{ugxFactoredExpandPage}
+\pageto{Arithmetic with Factored Objects}{ugxFactoredArithPage}
+\pageto{Creating New Factored Objects}{ugxFactoredNewPage}
+\pageto{Factored Objects with Variables}{ugxFactoredVarPage}
 <<fr.ht>>=
 \begin{page}{FactoredXmpPage}{Factored}
 \beginscroll
@@ -7886,6 +7894,8 @@ multiplication order.
 
 @
 \pagehead{ugxFactoredDecompPage}{fr.ht}{Decomposing Factored Objects}
+\pagepic{ps/v71ugxfactoreddecomppage.eps}{ugxFactoredDecompPage}
+\pagefrom{Factored}{FactoredXmpPage}
 <<fr.ht>>=
 \begin{page}{ugxFactoredDecompPage}{Decomposing Factored Objects}
 \beginscroll
@@ -7946,6 +7956,8 @@ Neither of these operations returns the unit.
 
 @
 \pagehead{ugxFactoredExpandPage}{fr.ht}{Expanding Factored Objects}
+\pagepic{ps/v71ugxfactoredexpandpage.eps}{ugxFactoredExpandPage}
+\pagefrom{Factored}{FactoredXmpPage}
 <<fr.ht>>=
 \begin{page}{ugxFactoredExpandPage}{Expanding Factored Objects}
 \beginscroll
@@ -7975,6 +7987,8 @@ but with multiplicity one, you could do it this way.
 
 @
 \pagehead{ugxFactoredArithPage}{fr.ht}{Arithmetic with Factored Objects}
+\pagepic{ps/v71ugxfactoredarithpage.eps}{ugxFactoredArithPage}
+\pagefrom{Factored}{FactoredXmpPage}
 <<fr.ht>>=
 \begin{page}{ugxFactoredArithPage}{Arithmetic with Factored Objects}
 \beginscroll
@@ -8056,7 +8070,9 @@ package calling
 
 @
 \pagehead{ugxFactoredNewPage}{fr.ht}{Creating New Factored Objects}
-\pageto{notitle}{FactoredFnsTwoXmpPage}
+\pagepic{ps/v71ugxfactorednewpage.eps}{ugxFactoredNewPage}
+\pagefrom{Factored}{FactoredXmpPage}
+\pageto{FactoredFunctions2}{FactoredFnsTwoXmpPage}
 <<fr.ht>>=
 \begin{page}{ugxFactoredNewPage}{Creating New Factored Objects}
 \beginscroll
@@ -8115,6 +8131,8 @@ returned by \spadfunFrom{factorList}{Factored}.
 
 @
 \pagehead{ugxFactoredVarPage}{fr.ht}{Factored Objects with Variables}
+\pagepic{ps/v71ugxfactoredvarpage.eps}{ugxFactoredVarPage}
+\pagefrom{Factored}{FactoredXmpPage}
 <<fr.ht>>=
 \begin{page}{ugxFactoredVarPage}{Factored Objects with Variables}
 \beginscroll
@@ -8151,8 +8169,10 @@ You can differentiate with respect to a variable.
 @
 \section{fr2.ht}
 \pagehead{FactoredFnsTwoXmpPage}{fr2.ht}{FactoredFunctions2}
-\pageto{notitle}{FactoredXmpPage}
-\pageto{notitle}{ugProblemGaloisPage}
+\pagepic{ps/v71factoredfnstwoxmppage.eps}{FactoredFnsTwoXmpPage}
+\pagefrom{Creating New Factored Objects}{ugxFactoredNewPage}
+\pageto{Factored}{FactoredXmpPage}
+\pageto{Computation of Galois Groups}{ugProblemGaloisPage}
 <<fr2.ht>>=
 \begin{page}{FactoredFnsTwoXmpPage}{FactoredFunctions2}
 \beginscroll
@@ -11022,6 +11042,7 @@ Apply \spadfun{heapsort} to present elements in order.
 \pagehead{HexExpansionXmpPage}{hexadec.ht}{HexadecimalExpansion}
 \pagepic{ps/v71hexexpansionxmppage.eps}{HexExpansionXmpPage}
 \pagefrom{Axiom Number Types}{NumberPage}
+\pagefrom{Integer}{IntegerXmpPage}
 \pageto{DecimalExpansion}{DecimalExpansionXmpPage}
 \pageto{BinaryExpansion}{BinaryExpansionXmpPage}
 \pageto{RadixExpansion}{RadixExpansionXmpPage}
@@ -11085,7 +11106,6 @@ These numbers are bona fide algebraic objects.
 \pagehead{IntegerXmpPage}{int.ht}{Integer}
 \pagepic{ps/v71integerxmppage.eps}{IntegerXmpPage}
 \pagefrom{Integers}{IntegerPage}
-\pagefrom{Fraction}{FractionXmpPage}
 \pageto{Numbers}{ugIntroNumbersPage}
 \pageto{IntegerNumberTheoryFunctions}{IntNumberTheoryFnsXmpPage}
 \pageto{DecimalExpansion}{DecimalExpansionXmpPage}
@@ -11131,9 +11151,11 @@ and
 
 @
 \pagehead{ugxIntegerBasicPage}{int.ht}{Basic Functions}
-\pageto{notitle}{FractionXmpPage}
-\pageto{notitle}{ugTypesUnionsPage}
-\pageto{notitle}{ugTypesRecordsPage}
+\pagepic{ps/v71ugxintegerbasicpage.eps}{ugxIntegerBasicPage}
+\pagefrom{Integer}{IntegerXmpPage}
+\pageto{Fraction}{FractionXmpPage}
+\pageto{Unions}{ugTypesUnionsPage}
+\pageto{Records}{ugTypesRecordsPage}
 <<int.ht>>=
 \begin{page}{ugxIntegerBasicPage}{Basic Functions}
 \beginscroll
@@ -11333,6 +11355,7 @@ Records are discussed in detail in
 \pagehead{ugxIntegerPrimesPage}{int.ht}{Primes and Factorization}
 \pagepic{ps/v71ugxintegerprimespage.eps}{ugxIntegerPrimesPage}
 \pagefrom{Integers}{IntegerPage}
+\pagefrom{Integer}{IntegerXmpPage}
 \pageto{Factored}{FactoredXmpPage}
 \pageto{Complex}{ComplexXmpPage}
 <<int.ht>>=
@@ -11393,6 +11416,9 @@ See 
\downlink{`Complex'}{ComplexXmpPage}\ignore{Complex} for more details.
 
 @
 \pagehead{ugxIntegerNTPage}{int.ht}{Some Number Theoretic Functions}
+\pagepic{ps/v71ugxintegerntpage.eps}{ugxIntegerNTPage}
+\pagefrom{Integer}{IntegerXmpPage}
+\pageto{IntegerNumberTheoryFunctions}{IntNumberTheoryFnsXmpPage}
 <<int.ht>>=
 \begin{page}{ugxIntegerNTPage}{Some Number Theoretic Functions}
 \beginscroll
@@ -11478,6 +11504,8 @@ Roman numerals.
 {IntegerNumberTheoryFunctions}
 \pagepic{ps/v71intnumbertheoryfnsxmppage.eps}{IntNumberTheoryFnsXmpPage}
 \pagefrom{Integers}{IntegerPage}
+\pagefrom{Integer}{IntegerXmpPage}
+\pagefrom{Some Number Theoretic Functions}{ugxIntegerNTPage}
 <<intheory.ht>>=
 \begin{page}{IntNumberTheoryFnsXmpPage}
 {IntegerNumberTheoryFunctions}
@@ -16481,7 +16509,7 @@ command:
 \pagehead{IntegerPage}{numbers.ht}{Integers}
 \pagepic{ps/v71integerpage.eps}{IntegerPage}
 \pagefrom{Axiom Number Types}{NumberPage}
-\pageto{General Info}{IntegerXmpPage}
+\pageto{Integer}{IntegerXmpPage}
 \pageto{Factorization}{ugxIntegerPrimesPage}
 \pageto{Functions}{IntNumberTheoryFnsXmpPage}
 \pageto{Examples}{IntegerExamplePage}
@@ -16506,7 +16534,7 @@ will factor more rapidly than numbers with large prime 
factors.
 Additional Topics
 \beginmenu
 
-\menulink{General Info}{IntegerXmpPage} \tab{16}
+\menulink{Integer}{IntegerXmpPage} \tab{16}
 General information and examples of integers.
 
 \menulink{Factorization}{ugxIntegerPrimesPage} \tab{16}
@@ -18114,6 +18142,7 @@ The norm is the quaternion times its conjugate.
 \pagehead{RadixExpansionXmpPage}{radix.ht}{RadixExpansion}
 \pagepic{ps/v71radixexpansionxmppage.eps}{RadixExpansionXmpPage}
 \pagefrom{Axiom Number Types}{NumberPage}
+\pagefrom{Integer}{IntegerXmpPage}
 \pageto{HexadecimalExpansion}{HexExpansionXmpPage}
 \pageto{DecimalExpansion}{DecimalExpansionXmpPage}
 \pageto{BinaryExpansion}{BinaryExpansionXmpPage}
@@ -23169,23 +23198,23 @@ of exported functions, an encoded signature and 
numerical index.
 @
 \chapter{Users Guide Chapter 1 (ug01.ht)}
 \pagehead{ugIntroPage}{ug01.ht}{An Overview of Axiom}
-\pageto{notitle}{ugIntroTypoPage}
-\pageto{notitle}{ugIntroStartPage}
-\pageto{notitle}{ugIntroTypoPage}
-\pageto{notitle}{ugIntroExpressionsPage}
-\pageto{notitle}{ugIntroGraphicsPage}
-\pageto{notitle}{ugIntroNumbersPage}
-\pageto{notitle}{ugIntroCollectPage}
-\pageto{notitle}{ugIntroTwoDimPage}
-\pageto{notitle}{ugIntroYouPage}
-\pageto{notitle}{ugIntroVariablesPage}
-\pageto{notitle}{ugIntroCalcLimitsPage}
-\pageto{notitle}{ugIntroSeriesPage}
-\pageto{notitle}{ugIntroCalcDerivPage}
-\pageto{notitle}{ugIntroIntegratePage}
-\pageto{notitle}{ugIntroDiffEqnsPage}
-\pageto{notitle}{ugIntroSolutionPage}
-\pageto{notitle}{ugIntroSysCmmandsPage}
+\pagefrom{Numeric Functions}{ugProblemNumericPage}
+\pageto{Starting Up and Winding Down}{ugIntroStartPage}
+\pageto{Typographic Conventions}{ugIntroTypoPage}
+\pageto{The Axiom Language}{ugIntroExpressionsPage}
+\pageto{Graphics}{ugIntroGraphicsPage}
+\pageto{Numbers}{ugIntroNumbersPage}
+\pageto{Data Structures}{ugIntroCollectPage}
+\pageto{Expanding to Higher Dimensions}{ugIntroTwoDimPage}
+\pageto{Writing Your Own Functions}{ugIntroYouPage}
+\pageto{Polynomials}{ugIntroVariablesPage}
+\pageto{Limits}{ugIntroCalcLimitsPage}
+\pageto{Series}{ugIntroSeriesPage}
+\pageto{Derivatives}{ugIntroCalcDerivPage}
+\pageto{Integration}{ugIntroIntegratePage}
+\pageto{Differential Equations}{ugIntroDiffEqnsPage}
+\pageto{Solution of Equations}{ugIntroSolutionPage}
+\pageto{System Commands}{ugIntroSysCmmandsPage}
 <<ug01.ht>>=
 \begin{page}{ugIntroPage}{1. An Overview of Axiom}
 
@@ -23307,6 +23336,8 @@ want to leave Axiom.
 
 @
 \pagehead{ugAvailCLEFPage}{ug01.ht}{Clef}
+\pagepic{ps/v71ugavailclefpage.eps}{ugAvailCLEFPage}
+\pagefrom{Computation of Galois Groups}{ugProblemGaloisPage}
 <<ug01.ht>>=
 \begin{page}{ugAvailCLEFPage}{1.1.1. \Clef{}}
 \beginscroll
@@ -23952,14 +23983,15 @@ using Axiom's graphics facilities.
 
 @
 \pagehead{ugIntroNumbersPage}{ug01.ht}{Numbers}
-\pageto{notitle}{FloatXmpPage}
-\pageto{notitle}{DoubleFloatXmpPage}
-\pageto{notitle}{ComplexXmpPage}
-\pageto{notitle}{DecimalExpansionXmpPage}
-\pageto{notitle}{ContinuedFractionXmpPage}
-\pageto{notitle}{PartialFractionXmpPage}
-\pageto{notitle}{RadixExpansionXmpPage}
-\pageto{notitle}{ugxProblemFinitePrimePage}
+\pagepic{ps/v71ugintronumberspage.eps}{ugIntroNumbersPage}
+\pagefrom{Integer}{IntegerXmpPage}
+\pageto{Float}{FloatXmpPage}
+\pageto{DoubleFloat}{DoubleFloatXmpPage}
+\pageto{DecimalExpansion}{DecimalExpansionXmpPage}
+\pageto{ContinuedFraction}{ContinuedFractionXmpPage}
+\pageto{PartialFraction}{PartialFractionXmpPage}
+\pageto{RadixExpansion}{RadixExpansionXmpPage}
+\pageto{Modular Arithmetic and Prime Fields}{ugxProblemFinitePrimePage}
 <<ug01.ht>>=
 \begin{page}{ugIntroNumbersPage}{1.5. Numbers}
 \beginscroll
@@ -24087,19 +24119,6 @@ Complex numbers with floating point parts are also 
available.
 }{
 \spadpaste{exp(\%pi/4.0 * \%i)}
 }
-%%--> These are not numbers:
-%\xtc{
-%The real and imaginary parts can be symbolic.
-%}{
-%\spadcommand{complex(u,v) \bound{cuv}}
-%}
-%\xtc{
-%Of course, you can do complex arithmetic with these also.
-%See \downlink{`Complex'}{ComplexXmpPage}\ignore{Complex} 
-for more information.
-%}{
-%\spadcommand{\% ** 2 \free{cuv}}
-%}
 \xtc{
 Every rational number has an exact representation as a
 repeating decimal expansion
@@ -25752,7 +25771,9 @@ manipulates types and modes internally to resolve 
ambiguities.
 
 @
 \pagehead{ugTypesBasicPage}{ug02.ht}{The Basic Idea}
-\pageto{notitle}{ugTypesBasicDomainConsPage}
+\pagepic{ps/v71ugtypesbasicpage.eps}{ugTypesBasicPage}
+\pagefrom{Conversion}{ugTypesConvertPage}
+\pageto{Domain Constructors}{ugTypesBasicDomainConsPage}
 <<ug02.ht>>=
 \begin{page}{ugTypesBasicPage}{2.1. The Basic Idea}
 \beginscroll
@@ -25847,8 +25868,10 @@ and 17,'' and so on.
 
 @
 \pagehead{ugTypesBasicDomainConsPage}{ug02.ht}{Domain Constructors}
-\pageto{notitle}{ugCategoriesPage}
-\pageto{notitle}{ugTypesConvertPage}
+\pagepic{ps/v71ugtypesbasicdomainconspage.eps}{ugTypesBasicDomainConsPage}
+\pagefrom{The Basic Idea}{ugTypesBasicPage}
+\pageto{Categories}{ugCategoriesPage}
+\pageto{Conversion}{ugTypesConvertPage}
 <<ug02.ht>>=
 \begin{page}{ugTypesBasicDomainConsPage}{2.1.1. Domain Constructors}
 \beginscroll
@@ -27059,7 +27082,9 @@ object of type \axiomType{Any} internally looks like
 
 @
 \pagehead{ugTypesConvertPage}{ug02.ht}{Conversion}
-\pageto{notitle}{ugTypesBasicPage}
+\pagepic{ps/v71ugtypesconvertpage.eps}{ugTypesConvertPage}
+\pagefrom{Complex}{ComplexXmpPage}
+\pageto{The Basic Idea}{ugTypesBasicPage}
 <<ug02.ht>>=
 \begin{page}{ugTypesConvertPage}{2.7. Conversion}
 \beginscroll
@@ -36524,6 +36549,7 @@ with Axiom.
 \pagehead{ugProblemNumericPage}{ug08.ht}{Numeric Functions}
 \pagepic{ps/v71ugproblemnumericpage.eps}{ugProblemNumericPage}
 \pagefrom{Axiom Number Types}{NumberPage}
+\pagefrom{Complex}{ComplexXmpPage}
 \pageto{An Overview of Axiom}{ugIntroPage}
 \pageto{Float}{FloatXmpPage}
 \pageto{DoubleFloat}{DoubleFloatXmpPage}
@@ -40869,8 +40895,10 @@ Their intersection is equal to the radical of the 
ideal of \axiom{l}.
 
 @
 \pagehead{ugProblemGaloisPage}{ug08.ht}{Computation of Galois Groups}
-\pageto{notitle}{FactoredXmpPage}
-\pageto{notitle}{ugAvailCLEFPage}
+\pagepic{ps/v71ugproblemgaloispage.eps}{ugProblemGaloisPage}
+\pagefrom{FactoredFunctions2}{FactoredFnsTwoXmpPage}
+\pageto{Factored}{FactoredXmpPage}
+\pageto{Clef}{ugAvailCLEFPage}
 <<ug08.ht>>=
 \begin{page}{ugProblemGaloisPage}{8.13. Computation of Galois Groups}
 \beginscroll
@@ -43362,19 +43390,20 @@ environment and produces the result.  \endscroll 
\autobuttons
 @
 \chapter{Users Guide Chapter 12 (ug12.ht)}
 \pagehead{ugCategoriesPage}{ug12.ht}{Categories}
-\pageto{notitle}{ugTypesBasicDomainConsPage}
-\pageto{notitle}{ugCategoriesDefsPage}
-\pageto{notitle}{ugCategoriesExportsPage}
-\pageto{notitle}{ugCategoriesDocPage}
-\pageto{notitle}{ugCategoriesHierPage}
-\pageto{notitle}{ugCategoriesMembershipPage}
-\pageto{notitle}{ugCategoriesDefaultsPage}
-\pageto{notitle}{ugCategoriesAxiomsPage}
-\pageto{notitle}{ugCategoriesCorrectnessPage}
-\pageto{notitle}{ugCategoriesAttributesPage}
-\pageto{notitle}{ugCategoriesParametersPage}
-\pageto{notitle}{ugCategoriesConditionalsPage}
-\pageto{notitle}{ugCategoriesAndPackagesPage}
+\pagefrom{Domain Constructors}{ugTypesBasicDomainConsPage}
+\pageto{Domain Constructors}{ugTypesBasicDomainConsPage}
+\pageto{Definitions}{ugCategoriesDefsPage}
+\pageto{Exports}{ugCategoriesExportsPage}
+\pageto{Documentation}{ugCategoriesDocPage}
+\pageto{Hierarchies}{ugCategoriesHierPage}
+\pageto{Membership}{ugCategoriesMembershipPage}
+\pageto{Defaults}{ugCategoriesDefaultsPage}
+\pageto{Axioms}{ugCategoriesAxiomsPage}
+\pageto{Correctness}{ugCategoriesCorrectnessPage}
+\pageto{Attributes}{ugCategoriesAttributesPage}
+\pageto{Parameters}{ugCategoriesParametersPage}
+\pageto{Conditionals}{ugCategoriesConditionalsPage}
+\pageto{Anonymous Categories}{ugCategoriesAndPackagesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesPage}{12. Categories}
 \beginscroll
@@ -43444,6 +43473,7 @@ let's see how you define them in Axiom.
 
 @
 \pagehead{ugCategoriesDefsPage}{ug12.ht}{Definitions}
+\pagefrom{Categories}{ugCategoriesPage}
 \pageto{notitle}{ugTypesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesDefsPage}{12.1. Definitions}
@@ -43529,6 +43559,7 @@ In fact, the {\tt Type} is optional in this line; 
``{\tt with
 
 @
 \pagehead{ugCategoriesExportsPage}{ug12.ht}{Exports}
+\pagefrom{Categories}{ugCategoriesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesExportsPage}{12.2. Exports}
 \beginscroll
@@ -43580,6 +43611,7 @@ aThreeArgumentOperation:  ($,Integer,$) -> Fraction($)
 
 @
 \pagehead{ugCategoriesDocPage}{ug12.ht}{Documentation}
+\pagefrom{Categories}{ugCategoriesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesDocPage}{12.3. Documentation}
 \beginscroll
@@ -43661,6 +43693,7 @@ category descriptions.
 
 @
 \pagehead{ugCategoriesHierPage}{ug12.ht}{Hierarchies}
+\pagefrom{Categories}{ugCategoriesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesHierPage}{12.4. Hierarchies}
 \beginscroll
@@ -43701,6 +43734,7 @@ included for emphasis.
 
 @
 \pagehead{ugCategoriesMembershipPage}{ug12.ht}{Membership}
+\pagefrom{Categories}{ugCategoriesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesMembershipPage}{12.5. Membership}
 \beginscroll
@@ -43761,8 +43795,9 @@ operations \spadop{*} and \spadop{**}.
 
 @
 \pagehead{ugCategoriesDefaultsPage}{ug12.ht}{Defaults}
-\pageto{notitle}{ugCategoriesHierPage}
-\pageto{notitle}{ugPackagesPage}
+\pagefrom{Categories}{ugCategoriesPage}
+\pageto{Hierarchies}{ugCategoriesHierPage}
+\pageto{Packages}{ugPackagesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesDefaultsPage}{12.6. Defaults}
 \beginscroll
@@ -43850,7 +43885,8 @@ as automatically generated by Axiom from the above 
definition of
 
 @
 \pagehead{ugCategoriesAxiomsPage}{ug12.ht}{Axioms}
-\pageto{notitle}{ugCategoriesDefaultsPage}
+\pagefrom{Categories}{ugCategoriesPage}
+\pageto{Defaults}{ugCategoriesDefaultsPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesAxiomsPage}{12.7. Axioms}
 \beginscroll
@@ -43903,6 +43939,7 @@ implicit by the use of the name \spadtype{Ring}.
 
 @
 \pagehead{ugCategoriesCorrectnessPage}{ug12.ht}{Correctness}
+\pagefrom{Categories}{ugCategoriesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesCorrectnessPage}{12.8. Correctness}
 \beginscroll
@@ -43959,7 +43996,8 @@ presume that the ring axioms for \spadop{+} hold.
 
 @
 \pagehead{ugCategoriesAttributesPage}{ug12.ht}{Attributes}
-\pageto{notitle}{ugDomainsAssertionsPage}
+\pagefrom{Categories}{ugCategoriesPage}
+\pageto{Category Assertions}{ugDomainsAssertionsPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesAttributesPage}{12.9. Attributes}
 \beginscroll
@@ -44042,6 +44080,7 @@ to rings but do not have this attribute).
 
 @
 \pagehead{ugCategoriesParametersPage}{ug12.ht}{Parameters}
+\pagefrom{Categories}{ugCategoriesPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesParametersPage}{12.10. Parameters}
 \beginscroll
@@ -44101,7 +44140,8 @@ TwoDimensionalArrayCategory(R,\ Row,\ Col)\ with\ 
...}\newline
 
 @
 \pagehead{ugCategoriesConditionalsPage}{ug12.ht}{Conditionals}
-\pageto{notitle}{ugPackagesCondsPage}
+\pagefrom{Categories}{ugCategoriesPage}
+\pageto{Conditionals}{ugPackagesCondsPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesConditionalsPage}{12.11. Conditionals}
 \beginscroll
@@ -44170,7 +44210,8 @@ example.
 
 @
 \pagehead{ugCategoriesAndPackagesPage}{ug12.ht}{Anonymous Categories}
-\pageto{notitle}{ugPackagesAbstractPage}
+\pagefrom{Categories}{ugCategoriesPage}
+\pageto{Abstract Datatypes}{ugPackagesAbstractPage}
 <<ug12.ht>>=
 \begin{page}{ugCategoriesAndPackagesPage}{12.12. Anonymous Categories}
 \beginscroll