# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1153022533 25200
# Node ID 51d94bd2804cbf175e6c58775ed5d927b32f204c
# Parent  6e988159394b139d6f0910a966c7e19b65a1e976# Parent  cc1e6f1d71611c95a15a359963d86b167305cecb
Merge Jeff's PDF image fixes.

diff -r 6e988159394b -r 51d94bd2804c en/Makefile
--- a/en/Makefile	Wed Jul 12 00:33:27 2006 -0700
+++ b/en/Makefile	Sat Jul 15 21:02:13 2006 -0700
@@ -42,7 +42,7 @@
 	if grep 'Reference.*undefined' $(@:.pdf=.log); then exit 1; fi
 endef
 
-pdf/hgbook.pdf: $(sources) $(image-sources:%.svg=%_pdf.png) examples
+pdf/hgbook.pdf: $(sources) $(image-sources:%.svg=%.pdf) examples
 	$(call pdf)
 
 html: html/onepage/hgbook.html html/split/hgbook.html
@@ -80,7 +80,7 @@
 beta/%.tex: %.tex
 	./fblinks $(hg_id) $(dir $@) $<
 
-beta/pdf/hgbook.pdf: $(sources:%.tex=beta/%.tex) $(image-sources:%.svg=%_pdf.png) examples fblinks
+beta/pdf/hgbook.pdf: $(sources:%.tex=beta/%.tex) $(image-sources:%.svg=%.pdf) examples fblinks
 	$(call pdf)
 
 beta/html/onepage/hgbook.html: $(sources:%.tex=beta/%.tex) $(image-sources:%.svg=%.png) examples
@@ -96,10 +96,13 @@
 %.png: %.svg
 	inkscape -D -e $@ $<
 
-# Produce 300dpi PNGs for PDF.
+# Produce eps & pdf for the pdf
 
-%_pdf.png: %.svg
-	inkscape -D -d 300 -e $@ $<
+%.pdf: %.eps
+	epstopdf $<
+
+%.eps: %.svg
+	inkscape -D -E $@ $<
 
 examples: examples/.run
 
@@ -110,5 +113,5 @@
 	echo -n $(hg_id) > build_id.tex
 
 clean:
-	rm -rf beta html pdf *.eps *.png *.aux *.dvi *.log *.out \
+	rm -rf beta html pdf *.eps *.pdf *.png *.aux *.dvi *.log *.out \
 		examples/*.out examples/.run build_id.tex
diff -r 6e988159394b -r 51d94bd2804c en/mq.tex
--- a/en/mq.tex	Wed Jul 12 00:33:27 2006 -0700
+++ b/en/mq.tex	Sat Jul 15 21:02:13 2006 -0700
@@ -78,10 +78,10 @@
 large following among open source software developers.
 
 Quilt manages a \emph{stack of patches} on top of a directory tree.
-To begin, you tell quilt to manage a directory tree; it stores away
-the names and contents of all files in the tree.  To fix a bug, you
-create a new patch (using a single command), edit the files you need
-to fix, then ``refresh'' the patch.  
+To begin, you tell quilt to manage a directory tree, and tell it which
+files you want to manage; it stores away the names and contents of
+those files.  To fix a bug, you create a new patch (using a single
+command), edit the files you need to fix, then ``refresh'' the patch.
 
 The refresh step causes quilt to scan the directory tree; it updates
 the patch with all of the changes you have made.  You can create
@@ -336,7 +336,7 @@
 
 \begin{figure}[ht]
   \centering
-  \grafix{mq-stack}
+  \includegraphics{mq-stack}
   \caption{Applied and unapplied patches in the MQ patch stack}
   \label{fig:mq:stack}
 \end{figure}