From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Mar 2012 23:46:59 +0000 (+0000)
Subject: rename Tip Self Inpatch -> Tip Self Contents
X-Git-Tag: f0.2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=eb6afbbe29da33f29289cbbfbf358487380842bd

rename Tip Self Inpatch -> Tip Self Contents
---

diff --git a/anticommit.tex b/anticommit.tex
index 37c40f0..47e0a9b 100644
--- a/anticommit.tex
+++ b/anticommit.tex
@@ -61,7 +61,7 @@ $D \not\isin R^-$.  Thus $D \not\isin C$.  OK.
 
 By Currently Included, $D \isin L$.
 
-By Tip Self Inpatch for $R^+$, $D \isin R^+ \equiv D \le R^+$, but by
+By Tip Self Contents for $R^+$, $D \isin R^+ \equiv D \le R^+$, but by
 by Unique Tip, $D \le R^+ \equiv D \le L$.
 So $D \isin R^+$.
 
diff --git a/lemmas.tex b/lemmas.tex
index 7d72e54..044e937 100644
--- a/lemmas.tex
+++ b/lemmas.tex
@@ -53,7 +53,7 @@ So by Base Acyclic $D \isin B \implies D \notin \py$.
   \end{cases}
 }\]
 
-\subsection{Tip Self Inpatch}
+\subsection{Tip Self Contents}
 Given Base Acyclic for $C$,
 $$
   \bigforall_{C \in \py} C \haspatch \p \land \neg[ C \nothaspatch \p ]
diff --git a/merge.tex b/merge.tex
index d348670..6786dd0 100644
--- a/merge.tex
+++ b/merge.tex
@@ -117,7 +117,7 @@ This involves considering $D \in \py$.
 
 \subsubsection{For $L \nothaspatch \p, R \nothaspatch \p$:}
 $D \not\isin L \land D \not\isin R$.  $C \not\in \py$ (otherwise $L
-\in \py$ ie $\neg[ L \nothaspatch \p ]$ by Tip Self Inpatch for $L$).
+\in \py$ ie $\neg[ L \nothaspatch \p ]$ by Tip Self Contents for $L$).
 So $D \neq C$.
 Applying $\merge$ gives $D \not\isin C$ i.e. $C \nothaspatch \p$.
 
@@ -162,7 +162,7 @@ various cases that $D \isin C \equiv M \nothaspatch \p \land D \le C$
 (which suffices by definition of $\haspatch$ and $\nothaspatch$).
 
 Consider $D = C$:  Thus $C \in \py, L \in \py$.
-By Tip Self Inpatch, $\neg[ L \nothaspatch \p ]$ so $L \neq X$,
+By Tip Self Contents, $\neg[ L \nothaspatch \p ]$ so $L \neq X$,
 therefore we must have $L=Y$, $R=X$.
 By Tip Merge $M = \baseof{L}$ so $M \in \pn$ so
 by Base Acyclic $M \nothaspatch \p$.  By $\merge$, $D \isin C$,