From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Mar 2012 23:45:16 +0000 (+0000)
Subject: small fixes
X-Git-Tag: f0.2~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=c773a9f7d593c5d6ce9dc772914562797de6024e;p=topbloke-formulae.git

small fixes
---

diff --git a/merge.tex b/merge.tex
index 5be4479..d348670 100644
--- a/merge.tex
+++ b/merge.tex
@@ -62,7 +62,7 @@ Given those conditions, Tip Merge and Merge Acyclic do not apply.
 By Foreign Contents of $L$, $\patchof{M} = \bot$ as well.
 So by Foreign Contents for any $A \in \{L,M,R\}$,
 $\forall_{\p, D \in \py} D \not\le A$
-so by No Replay for A $D \not\isin A$.
+so by No Replay for $A$, $D \not\isin A$.
 Thus $\pendsof{A}{\py} = \{ \}$ and the RHS of both Merge Ends
 conditions are satisifed.
 
@@ -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 R$,
+By Tip Self Inpatch, $\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$,