1.1 --- a/en/ch00-preface.xml	Thu May 07 21:07:35 2009 -0700
     1.2 +++ b/en/ch00-preface.xml	Thu May 07 22:32:55 2009 -0700
     1.3 @@ -5,9 +5,112 @@
     1.4    <title>Preface</title>
     1.5  
     1.6    <sect1>
     1.7 +    <title>Technical storytelling</title>
     1.8 +
     1.9 +    <para id="x_72e">A few years ago, when I wanted to explain why I believed
    1.10 +      that distributed revision control is important, the field was
    1.11 +      then so new that there was almost no published literature to
    1.12 +      refer people to.</para>
    1.13 +
    1.14 +    <para id="x_72f">Although at that time I spent some time working on the
    1.15 +      internals of Mercurial itself, I switched to writing this book
    1.16 +      because that seemed like the most effective way to help the
    1.17 +      software to reach a wide audience, along with the idea that
    1.18 +      revision control ought to be distributed in nature.  I publish
    1.19 +      the book online under a liberal license for the same
    1.20 +      reason: to get the word out.</para>
    1.21 +
    1.22 +    <para id="x_730">There's a familiar rhythm to a good software book that
    1.23 +      closely resembles telling a story: What is this thing?  Why does
    1.24 +      it matter?  How will it help me?  How do I use it?  In this
    1.25 +      book, I try to answer those questions for distributed revision
    1.26 +      control in general, and for Mercurial in particular.</para>
    1.27 +  </sect1>
    1.28 +    
    1.29 +  <sect1>
    1.30 +    <title>Thank you for supporting Mercurial</title>
    1.31 +
    1.32 +    <para id="x_731">By purchasing a copy of this book, you are supporting the
    1.33 +      continued development and freedom of Mercurial in particular,
    1.34 +      and of open source and free software in general. O'Reilly Media
    1.35 +      and I are donating my royalties on the sales of this book to the
    1.36 +      Software Freedom Conservancy (<ulink
    1.37 +	url="http://www.softwarefreedom.org/">http://www.softwarefreedom.org/</ulink>) 
    1.38 +      which provides clerical and legal support to Mercurial and a
    1.39 +      number of other prominent and worthy open source software
    1.40 +      projects.</para>
    1.41 +  </sect1>
    1.42 +
    1.43 +  <sect1>
    1.44 +    <title>Acknowledgments</title>
    1.45 +
    1.46 +    <para id="x_732">This book would not exist were it not for the efforts of
    1.47 +      Matt Mackall, the author and project lead of Mercurial.  He is
    1.48 +      ably assisted by hundreds of volunteer contributors across the
    1.49 +      world.</para>
    1.50 +
    1.51 +    <para id="x_733">My children, Cian and Ruairi, always stood ready to help me
    1.52 +      to unwind with wonderful, madcap little-boy games.  I'd also
    1.53 +      like to thank my ex-wife, Shannon, for her support.</para>
    1.54 +
    1.55 +    <para id="x_734">My colleagues and friends provided help and support in
    1.56 +      innumerable ways.  This list of people is necessarily very
    1.57 +      incomplete: Stephen Hahn, Karyn Ritter, Bonnie Corwin, James
    1.58 +      Vasile, Matt Norwood, Eben Moglen, Bradley Kuhn, Robert Walsh,
    1.59 +      Jeremy Fitzhardinge, Rachel Chalmers.</para>
    1.60 +
    1.61 +    <para id="x_735">I developed this book in the open, posting drafts of
    1.62 +      chapters to the book web site as I completed them.  Readers then
    1.63 +      submitted feedback using a web application that I developed.  By
    1.64 +      the time I finished writing the book, more than 100 people had
    1.65 +      submitted comments, an amazing number considering that the
    1.66 +      comment system was live for only about two months towards the
    1.67 +      end of the writing process.</para>
    1.68 +
    1.69 +    <para id="x_736">I would particularly like to recognize the following people,
    1.70 +      who between them contributed over a third of the total number of
    1.71 +      comments.  I would like to thank them for their care and effort
    1.72 +      in providing so much detailed feedback.</para>
    1.73 +
    1.74 +    <para id="x_737">Martin Geisler, Damien Cassou, Alexey Bakhirkin, Till Plewe,
    1.75 +      Dan Himes, Paul Sargent, Gokberk Hamurcu, Matthijs van der
    1.76 +      Vleuten, Michael Chermside, John Mulligan, Jordi Fita, Jon
    1.77 +      Parise.</para>
    1.78 +
    1.79 +    <para id="x_738">I also want to acknowledge the help of the many people who
    1.80 +      caught errors and provided helpful suggestions throughout the
    1.81 +      book.</para>
    1.82 +
    1.83 +    <para id="x_739">Jeremy W. Sherman, Brian Mearns, Vincent Furia, Iwan
    1.84 +      Luijks, Billy Edwards, Andreas Sliwka, Paweł Sołyga, Eric
    1.85 +      Hanchrow, Steve Nicolai, Michał Masłowski, Kevin Fitch, Johan
    1.86 +      Holmberg, Hal Wine, Volker Simonis, Thomas P Jakobsen, Ted
    1.87 +      Stresen-Reuter, Stephen Rasku, Raphael Das Gupta, Ned
    1.88 +      Batchelder, Lou Keeble, Li Linxiao, Kao Cardoso Félix, Joseph
    1.89 +      Wecker, Jon Prescot, Jon Maken, John Yeary, Jason Harris,
    1.90 +      Geoffrey Zheng, Fredrik Jonson, Ed Davies, David Zumbrunnen,
    1.91 +      David Mercer, David Cabana, Ben Karel, Alan Franzoni, Yousry
    1.92 +      Abdallah, Whitney Young, Vinay Sajip, Tom Towle, Tim Ottinger,
    1.93 +      Thomas Schraitle, Tero Saarni, Ted Mielczarek, Svetoslav
    1.94 +      Agafonkin, Shaun Rowland, Rocco Rutte, Polo-Francois Poli,
    1.95 +      Philip Jenvey, Petr Tesałék, Peter R. Annema, Paul Bonser,
    1.96 +      Olivier Scherler, Olivier Fournier, Nick Parker, Nick Fabry,
    1.97 +      Nicholas Guarracino, Mike Driscoll, Mike Coleman, Mietek Bák,
    1.98 +      Michael Maloney, László Nagy, Kent Johnson, Julio Nobrega, Jord
    1.99 +      Fita, Jonathan March, Jonas Nockert, Jim Tittsler, Jeduan
   1.100 +      Cornejo Legorreta, Jan Larres, James Murphy, Henri Wiechers,
   1.101 +      Hagen Möbius, Gábor Farkas, Fabien Engels, Evert Rol, Evan
   1.102 +      Willms, Eduardo Felipe Castegnaro, Dennis Decker Jensen, Deniz
   1.103 +      Dogan, David Smith, Daed Lee, Christine Slotty, Charles Merriam,
   1.104 +      Guillaume Catto, Brian Dorsey, Bob Nystrom, Benoit Boissinot,
   1.105 +      Avi Rosenschein, Andrew Watts, Andrew Donkin, Alexey Rodriguez,
   1.106 +      Ahmed Chaudhary.</para>
   1.107 +  </sect1>
   1.108 +
   1.109 +  <sect1>
   1.110      <title>Conventions Used in This Book</title>
   1.111  
   1.112 -    <para>The following typographical conventions are used in this
   1.113 +    <para id="x_73a">The following typographical conventions are used in this
   1.114        book:</para>
   1.115  
   1.116      <variablelist>
   1.117 @@ -15,7 +118,7 @@
   1.118          <term>Italic</term>
   1.119  
   1.120          <listitem>
   1.121 -          <para>Indicates new terms, URLs, email addresses, filenames,
   1.122 +          <para id="x_73b">Indicates new terms, URLs, email addresses, filenames,
   1.123  	    and file extensions.</para>
   1.124          </listitem>
   1.125        </varlistentry>
   1.126 @@ -24,7 +127,7 @@
   1.127          <term><literal>Constant width</literal></term>
   1.128  
   1.129          <listitem>
   1.130 -          <para>Used for program listings, as well as within
   1.131 +          <para id="x_73c">Used for program listings, as well as within
   1.132  	    paragraphs to refer to program elements such as variable
   1.133  	    or function names, databases, data types, environment
   1.134  	    variables, statements, and keywords.</para>
   1.135 @@ -35,7 +138,7 @@
   1.136          <term><userinput>Constant width bold</userinput></term>
   1.137  
   1.138          <listitem>
   1.139 -          <para>Shows commands or other text that should be typed
   1.140 +          <para id="x_73d">Shows commands or other text that should be typed
   1.141  	    literally by the user.</para>
   1.142          </listitem>
   1.143        </varlistentry>
   1.144 @@ -44,26 +147,26 @@
   1.145          <term><replaceable>Constant width italic</replaceable></term>
   1.146  
   1.147          <listitem>
   1.148 -          <para>Shows text that should be replaced with user-supplied
   1.149 +          <para id="x_73e">Shows text that should be replaced with user-supplied
   1.150  	    values or by values determined by context.</para>
   1.151          </listitem>
   1.152        </varlistentry>
   1.153      </variablelist>
   1.154  
   1.155      <tip>
   1.156 -      <para>This icon signifies a tip, suggestion, or general
   1.157 +      <para id="x_73f">This icon signifies a tip, suggestion, or general
   1.158  	note.</para>
   1.159      </tip>
   1.160  
   1.161      <caution>
   1.162 -      <para>This icon indicates a warning or caution.</para>
   1.163 +      <para id="x_740">This icon indicates a warning or caution.</para>
   1.164      </caution>
   1.165    </sect1>
   1.166  
   1.167    <sect1>
   1.168      <title>Using Code Examples</title>
   1.169  
   1.170 -    <para>This book is here to help you get your job done. In general,
   1.171 +    <para id="x_741">This book is here to help you get your job done. In general,
   1.172        you may use the code in this book in your programs and
   1.173        documentation. You do not need to contact us for permission
   1.174        unless you’re reproducing a significant portion of the code. For
   1.175 @@ -75,13 +178,13 @@
   1.176        amount of example code from this book into your product’s
   1.177        documentation does require permission.</para>
   1.178  
   1.179 -    <para>We appreciate, but do not require, attribution. An
   1.180 +    <para id="x_742">We appreciate, but do not require, attribution. An
   1.181        attribution usually includes the title, author, publisher, and
   1.182        ISBN. For example: “<emphasis>Book Title</emphasis> by Some
   1.183        Author. Copyright 2008 O’Reilly Media, Inc.,
   1.184        978-0-596-xxxx-x.”</para>
   1.185  
   1.186 -    <para>If you feel your use of code examples falls outside fair use
   1.187 +    <para id="x_743">If you feel your use of code examples falls outside fair use
   1.188        or the permission given above, feel free to contact us at
   1.189        <email>permissions@oreilly.com</email>.</para>
   1.190    </sect1>
   1.191 @@ -90,13 +193,13 @@
   1.192      <title>Safari® Books Online</title>
   1.193  
   1.194      <note role="safarienabled">
   1.195 -      <para>When you see a Safari® Books Online icon on the cover of
   1.196 +      <para id="x_744">When you see a Safari® Books Online icon on the cover of
   1.197  	your favorite technology book, that means the book is
   1.198  	available online through the O’Reilly Network Safari
   1.199  	Bookshelf.</para>
   1.200      </note>
   1.201  
   1.202 -    <para>Safari offers a solution that’s better than e-books. It’s a
   1.203 +    <para id="x_745">Safari offers a solution that’s better than e-books. It’s a
   1.204        virtual library that lets you easily search thousands of top
   1.205        tech books, cut and paste code samples, download chapters, and
   1.206        find quick answers when you need the most accurate, current
   1.207 @@ -107,7 +210,7 @@
   1.208    <sect1>
   1.209      <title>How to Contact Us</title>
   1.210  
   1.211 -    <para>Please address comments and questions concerning this book
   1.212 +    <para id="x_746">Please address comments and questions concerning this book
   1.213        to the publisher:</para>
   1.214  
   1.215      <simplelist type="vert">
   1.216 @@ -124,7 +227,7 @@
   1.217        <member>707 829-0104 (fax)</member>
   1.218      </simplelist>
   1.219  
   1.220 -    <para>We have a web page for this book, where we list errata,
   1.221 +    <para id="x_747">We have a web page for this book, where we list errata,
   1.222        examples, and any additional information. You can access this
   1.223        page at:</para>
   1.224  
   1.225 @@ -136,14 +239,14 @@
   1.226      <remark>Don’t forget to update the &lt;url&gt; attribute,
   1.227        too.</remark>
   1.228  
   1.229 -    <para>To comment or ask technical questions about this book, send
   1.230 +    <para id="x_748">To comment or ask technical questions about this book, send
   1.231        email to:</para>
   1.232  
   1.233      <simplelist type="vert">
   1.234        <member><email>bookquestions@oreilly.com</email></member>
   1.235      </simplelist>
   1.236  
   1.237 -    <para>For more information about our books, conferences, Resource
   1.238 +    <para id="x_749">For more information about our books, conferences, Resource
   1.239        Centers, and the O’Reilly Network, see our web site at:</para>
   1.240  
   1.241      <simplelist type="vert">