# HG changeset patch
# User Kevin Walker <kevin@canyon23.net>
# Date 1277063620 25200
# Node ID 75c962025a070fa44db6a98ac23277a2f3496210
# Parent  6caac26b5c2991a14219c900231212580626a351# Parent  2e9a8385c2e76054440746d8fd351d8dab2f8002
Automated merge with https://tqft.net/hg/blob/

diff -r 6caac26b5c29 -r 75c962025a07 text/deligne.tex
--- a/text/deligne.tex	Sun Jun 20 12:43:11 2010 -0700
+++ b/text/deligne.tex	Sun Jun 20 12:53:40 2010 -0700
@@ -11,7 +11,7 @@
 (Proposition \ref{prop:deligne} below).
 Then we sketch the proof.
 
-\nn{Does this generalisation encompass Kontsevich's proposed generalisation from \cite[\S2.5]{MR1718044}, 
+\nn{Does this generalization encompass Kontsevich's proposed generalization from \cite[\S2.5]{MR1718044}, 
 that (I think...) the Hochschild homology of an $E_n$ algebra is an $E_{n+1}$ algebra? -S}
 
 %from http://www.ams.org/mathscinet-getitem?mr=1805894
diff -r 6caac26b5c29 -r 75c962025a07 text/ncat.tex
--- a/text/ncat.tex	Sun Jun 20 12:43:11 2010 -0700
+++ b/text/ncat.tex	Sun Jun 20 12:53:40 2010 -0700
@@ -1521,36 +1521,40 @@
 gluing subintervals together and/or omitting some of the rightmost subintervals.
 (See Figure \ref{fig:lmar}.)
 \begin{figure}[t]$$
+\definecolor{arcolor}{rgb}{.75,.4,.1}
 \begin{tikzpicture}
+\pgfsetlinewidth{1pt}
 \fill (0,0) circle (.1);
 \draw (0,0) -- (2,0);
 \draw (1,0.1) -- (1,-0.1);
 
-\draw [->,red] (1,0.25) -- (1,0.75);
+\draw [->, arcolor] (1,0.25) -- (1,0.75);
 
 \fill (0,1) circle (.1);
 \draw (0,1) -- (2,1);
 \end{tikzpicture}
 \qquad
 \begin{tikzpicture}
+\pgfsetlinewidth{1pt}
 \fill (0,0) circle (.1);
 \draw (0,0) -- (2,0);
 \draw (1,0.1) -- (1,-0.1);
 
-\draw [->,red] (1,0.25) -- (1,0.75);
+\draw [->, arcolor] (1,0.25) -- (1,0.75);
 
 \fill (0,1) circle (.1);
 \draw (0,1) -- (1,1);
 \end{tikzpicture}
 \qquad
 \begin{tikzpicture}
+\pgfsetlinewidth{1pt}
 \fill (0,0) circle (.1);
 \draw (0,0) -- (3,0);
 \foreach \x in {0.5, 1.0, 1.25, 1.5, 2.0, 2.5} {
 	\draw (\x,0.1) -- (\x,-0.1);
 }
 
-\draw [->,red] (1,0.25) -- (1,0.75);
+\draw [->, arcolor] (1,0.25) -- (1,0.75);
 
 \fill (0,1) circle (.1);
 \draw (0,1) -- (2,1);