strategy: use \chapter

diff --git a/article.tex b/article.tex
index 740a2bc406c37588e03e7e676611d57ce7c8a8d7..198ced4b05e9700e0a4e5ac41b07e0e8dad1c631 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -126,6 +126,8 @@
 
 \begin{document}
 
+\chapter{Data model}
+
 \input{notation.tex}
 \input{invariants.tex}
 \input{lemmas.tex}
@@ -136,6 +138,9 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+
+\chapter{Merge strategy}
+
 \input{strategy.tex}
 
 \end{document}

diff --git a/notation.tex b/notation.tex
index 6eb2e80d947a8bd1cb7d960bd43738ebbd352d8c..bee8eff2615d1937d73e44f305921410f392306b 100644 (file)
--- a/notation.tex
+++ b/notation.tex
@@ -1,4 +1,4 @@
-\section{Notation}
+\stdsection{Notation}
 
 Throughout, any free variables are implicitly universally quantified
 at the outermost level.

diff --git a/strategy.tex b/strategy.tex
index 50efed7c8598cbf61a0e9b349b9dece2e3634267..4cd80db8ff0e71941307ea0bb36e1ea7ac5b4161 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -1,11 +1,9 @@
-\section{Strategy}
-
 When we are trying to do a merge of some kind, in general,
 we want to merge some source commits $S_0 \ldots S_n$.
 We'll write $S_0 = L$.  We require that $L$ is the current git ref
 for $\patchof{L}$.
 
-\subsection{Notation}
+\stdsection{Notation}
 
 \begin{basedescript}{
 \desclabelwidth{5em}
@@ -31,7 +29,7 @@ All the ends of $\pc$ in the sources.
 
 \end{basedescript}
 
-\subsection{Planning phase}
+\section{Planning phase}
 
 We use a recursive planning algorith, recursing over Topbloke commit
 sets (ie, sets $\py$ or $\pn$).  We'll call the commit set we're
@@ -47,7 +45,7 @@ corresponding to the tip branches for the direct dependencies of
 $\pc$.
 The sole direct contributor of $\pcy$ is $\pcn$.
 
-\subsubsection{Planning step for $\pc = \pcn$.}
+\subsection{Planning step for $\pc = \pcn$.}
 
 Choose an (arbitrary, but ideally somehow optimal in
 a way not discussed here) ordering of $\set E_{\pc}$, $E_j$ (for