1.1 --- a/fr/ch00-preface.xml	Sun Aug 16 04:58:01 2009 +0200
     1.2 +++ b/fr/ch00-preface.xml	Sun Aug 16 13:18:39 2009 +0200
     1.3 @@ -1,78 +1,262 @@
     1.4  <!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : -->
     1.5  
     1.6 -<para>\chapter*{Préface}
     1.7 -\addcontentsline{toc}{chapter}{Préface}
     1.8 -\label{chap:preface}</para>
     1.9 -
    1.10 -<para>La gestion de source distribuée est encore un territoire peu exploré
    1.11 -et qui, par conséquent, a grandi très rapidement grâce à la seule
    1.12 -volonté de ses explorateurs.</para>
    1.13 -
    1.14 -<para>Je rédige un livre sur ce sujet car je crois que c'est un sujet
    1.15 -important qui mérite bien un guide du <quote>terrain</quote>. J'ai choisi d'écrire
    1.16 -ce livre sur Mercurial car c'est l'outil le plus simple pour découvrir
    1.17 -ce nouveau monde et qu'en outre, il répond très bien au besoin de
    1.18 -réels environnements, là où d'autres outils de gestion de source n'y
    1.19 -parviennent pas.</para>
    1.20 -
    1.21 -<sect1>
    1.22 -<title>Cet ouvrage est un travail en cours</title>
    1.23 -
    1.24 -<para>Je publie ce livre tout en continuant à l'écrire, dans l'espoir qu'il
    1.25 -vous sera utile. J'espère aussi que les lecteurs pourront ainsi y contribuer
    1.26 -si ils le souhaitent.</para>
    1.27 -
    1.28 -</sect1>
    1.29 -<sect1>
    1.30 -<title>À propros des exemples de ce livre</title>
    1.31 -
    1.32 -<para>Ce livre a une approche particulière des exemples d'exécution. Ils sont
    1.33 -toujours <quote>dynamiques</quote>&emdash;chacun est le résultat d'un script shell qui
    1.34 -exécute les commandes Mercurial que vous voyez. Chaque fois qu'une
    1.35 -image du livre est construite à partir des sources, tous les scripts d'exemple
    1.36 -sont exécutés automatiquement, et les résultats comparés à ceux attendus.</para>
    1.37 -
    1.38 -<para>Cette approche a l'avantage de garantir que les exemples sont toujours
    1.39 -justes ; ils montrent <emphasis>exactement</emphasis> le comportement de la version de
    1.40 -Mercurial spécifiée dans la couverture de ce livre. Si je mets à jour cette
    1.41 -version, et que les commandes changent, la génération du livre échouera.</para>
    1.42 -
    1.43 -<para>Il y a un petit désavantage à cette approche, les dates et les
    1.44 -durées que vous verrez dans ces exemples ont tendances à être
    1.45 -<quote>réduits</quote> de manière très différente d'une exécution manuelle. Un être humain
    1.46 -ne peut exécuter qu'une commande toutes les secondes, alors que mes scripts
    1.47 -automatisés en exécutent plusieurs en une seule seconde.</para>
    1.48 -
    1.49 -<para>Ainsi, en une seule seconde, plusieurs <quote>commits</quote> peuvent avoir lieu
    1.50 -au sein d'un exemple. Vous le constatez, entre autres, dans les
    1.51 -exemples sur <literal role="hg-ext">bisect</literal>, dans la section <xref linkend="sec:undo:bisect"/>.</para>
    1.52 -
    1.53 -<para>En conséquence, quand vous lisez les exemples, n'accordez pas trop
    1.54 -d'importance aux dates et aux durées d'exécution des commandes. Mais
    1.55 -<emphasis>soyez sûr</emphasis> que le comportement que vous voyez est cohérent et
    1.56 -reproductible.
    1.57 -</para>
    1.58 -
    1.59 -</sect1>
    1.60 -<sect1>
    1.61 -<title>Colophon&emdash;Cet ouvrage est libre</title>
    1.62 -
    1.63 -<para>Ce livre est publié sous la licence <quote>Open Publication License</quote>
    1.64 -\footnote{Pour plus de renseignements :
    1.65 -<ulink url="http://opencontent.org/openpub/">http://opencontent.org/openpub/</ulink>{Open Publication License} },
    1.66 -et est construit uniquement à l'aide de logiciels libres. Il est mis
    1.67 -en forme avec \LaTex{}; et les illustrations sont réalisées avec
    1.68 -<ulink url="http://www.inkscape.org/">Inkscape</ulink>.
    1.69 -</para>
    1.70 -
    1.71 -<para>L'ensemble des fichiers sources de cet ouvrage est publié dans un
    1.72 -dépot mercurial  <ulink url="http://hg.serpentine.com/mercurial/book">http://hg.serpentine.com/mercurial/book</ulink>.
    1.73 -</para>
    1.74 -
    1.75 -</sect1>
    1.76 +<preface id="chap:preface">
    1.77 +  <?dbhtml filename="preface.html"?>
    1.78 +  <title>Preface</title>
    1.79 +
    1.80 +  <sect1>
    1.81 +    <title>Technical storytelling</title>
    1.82 +
    1.83 +    <para id="x_72e">A few years ago, when I wanted to explain why I believed
    1.84 +      that distributed revision control is important, the field was
    1.85 +      then so new that there was almost no published literature to
    1.86 +      refer people to.</para>
    1.87 +
    1.88 +    <para id="x_72f">Although at that time I spent some time working on the
    1.89 +      internals of Mercurial itself, I switched to writing this book
    1.90 +      because that seemed like the most effective way to help the
    1.91 +      software to reach a wide audience, along with the idea that
    1.92 +      revision control ought to be distributed in nature.  I publish
    1.93 +      the book online under a liberal license for the same
    1.94 +      reason: to get the word out.</para>
    1.95 +
    1.96 +    <para id="x_730">There's a familiar rhythm to a good software book that
    1.97 +      closely resembles telling a story: What is this thing?  Why does
    1.98 +      it matter?  How will it help me?  How do I use it?  In this
    1.99 +      book, I try to answer those questions for distributed revision
   1.100 +      control in general, and for Mercurial in particular.</para>
   1.101 +  </sect1>
   1.102 +    
   1.103 +  <sect1>
   1.104 +    <title>Thank you for supporting Mercurial</title>
   1.105 +
   1.106 +    <para id="x_731">By purchasing a copy of this book, you are supporting the
   1.107 +      continued development and freedom of Mercurial in particular,
   1.108 +      and of open source and free software in general. O'Reilly Media
   1.109 +      and I are donating my royalties on the sales of this book to the
   1.110 +      Software Freedom Conservancy (<ulink
   1.111 +	url="http://www.softwarefreedom.org/">http://www.softwarefreedom.org/</ulink>) 
   1.112 +      which provides clerical and legal support to Mercurial and a
   1.113 +      number of other prominent and worthy open source software
   1.114 +      projects.</para>
   1.115 +  </sect1>
   1.116 +
   1.117 +  <sect1>
   1.118 +    <title>Acknowledgments</title>
   1.119 +
   1.120 +    <para id="x_732">This book would not exist were it not for the efforts of
   1.121 +      Matt Mackall, the author and project lead of Mercurial.  He is
   1.122 +      ably assisted by hundreds of volunteer contributors across the
   1.123 +      world.</para>
   1.124 +
   1.125 +    <para id="x_733">My children, Cian and Ruairi, always stood ready to help me
   1.126 +      to unwind with wonderful, madcap little-boy games.  I'd also
   1.127 +      like to thank my ex-wife, Shannon, for her support.</para>
   1.128 +
   1.129 +    <para id="x_734">My colleagues and friends provided help and support in
   1.130 +      innumerable ways.  This list of people is necessarily very
   1.131 +      incomplete: Stephen Hahn, Karyn Ritter, Bonnie Corwin, James
   1.132 +      Vasile, Matt Norwood, Eben Moglen, Bradley Kuhn, Robert Walsh,
   1.133 +      Jeremy Fitzhardinge, Rachel Chalmers.</para>
   1.134 +
   1.135 +    <para id="x_735">I developed this book in the open, posting drafts of
   1.136 +      chapters to the book web site as I completed them.  Readers then
   1.137 +      submitted feedback using a web application that I developed.  By
   1.138 +      the time I finished writing the book, more than 100 people had
   1.139 +      submitted comments, an amazing number considering that the
   1.140 +      comment system was live for only about two months towards the
   1.141 +      end of the writing process.</para>
   1.142 +
   1.143 +    <para id="x_736">I would particularly like to recognize the following people,
   1.144 +      who between them contributed over a third of the total number of
   1.145 +      comments.  I would like to thank them for their care and effort
   1.146 +      in providing so much detailed feedback.</para>
   1.147 +
   1.148 +    <para id="x_737">Martin Geisler, Damien Cassou, Alexey Bakhirkin, Till Plewe,
   1.149 +      Dan Himes, Paul Sargent, Gokberk Hamurcu, Matthijs van der
   1.150 +      Vleuten, Michael Chermside, John Mulligan, Jordi Fita, Jon
   1.151 +      Parise.</para>
   1.152 +
   1.153 +    <para id="x_738">I also want to acknowledge the help of the many people who
   1.154 +      caught errors and provided helpful suggestions throughout the
   1.155 +      book.</para>
   1.156 +
   1.157 +    <para id="x_739">Jeremy W. Sherman, Brian Mearns, Vincent Furia, Iwan
   1.158 +      Luijks, Billy Edwards, Andreas Sliwka, Paweł Sołyga, Eric
   1.159 +      Hanchrow, Steve Nicolai, Michał Masłowski, Kevin Fitch, Johan
   1.160 +      Holmberg, Hal Wine, Volker Simonis, Thomas P Jakobsen, Ted
   1.161 +      Stresen-Reuter, Stephen Rasku, Raphael Das Gupta, Ned
   1.162 +      Batchelder, Lou Keeble, Li Linxiao, Kao Cardoso Félix, Joseph
   1.163 +      Wecker, Jon Prescot, Jon Maken, John Yeary, Jason Harris,
   1.164 +      Geoffrey Zheng, Fredrik Jonson, Ed Davies, David Zumbrunnen,
   1.165 +      David Mercer, David Cabana, Ben Karel, Alan Franzoni, Yousry
   1.166 +      Abdallah, Whitney Young, Vinay Sajip, Tom Towle, Tim Ottinger,
   1.167 +      Thomas Schraitle, Tero Saarni, Ted Mielczarek, Svetoslav
   1.168 +      Agafonkin, Shaun Rowland, Rocco Rutte, Polo-Francois Poli,
   1.169 +      Philip Jenvey, Petr Tesałék, Peter R. Annema, Paul Bonser,
   1.170 +      Olivier Scherler, Olivier Fournier, Nick Parker, Nick Fabry,
   1.171 +      Nicholas Guarracino, Mike Driscoll, Mike Coleman, Mietek Bák,
   1.172 +      Michael Maloney, László Nagy, Kent Johnson, Julio Nobrega, Jord
   1.173 +      Fita, Jonathan March, Jonas Nockert, Jim Tittsler, Jeduan
   1.174 +      Cornejo Legorreta, Jan Larres, James Murphy, Henri Wiechers,
   1.175 +      Hagen Möbius, Gábor Farkas, Fabien Engels, Evert Rol, Evan
   1.176 +      Willms, Eduardo Felipe Castegnaro, Dennis Decker Jensen, Deniz
   1.177 +      Dogan, David Smith, Daed Lee, Christine Slotty, Charles Merriam,
   1.178 +      Guillaume Catto, Brian Dorsey, Bob Nystrom, Benoit Boissinot,
   1.179 +      Avi Rosenschein, Andrew Watts, Andrew Donkin, Alexey Rodriguez,
   1.180 +      Ahmed Chaudhary.</para>
   1.181 +  </sect1>
   1.182 +
   1.183 +  <sect1>
   1.184 +    <title>Conventions Used in This Book</title>
   1.185 +
   1.186 +    <para id="x_73a">The following typographical conventions are used in this
   1.187 +      book:</para>
   1.188 +
   1.189 +    <variablelist>
   1.190 +      <varlistentry>
   1.191 +        <term>Italic</term>
   1.192 +
   1.193 +        <listitem>
   1.194 +          <para id="x_73b">Indicates new terms, URLs, email addresses, filenames,
   1.195 +	    and file extensions.</para>
   1.196 +        </listitem>
   1.197 +      </varlistentry>
   1.198 +
   1.199 +      <varlistentry>
   1.200 +        <term><literal>Constant width</literal></term>
   1.201 +
   1.202 +        <listitem>
   1.203 +          <para id="x_73c">Used for program listings, as well as within
   1.204 +	    paragraphs to refer to program elements such as variable
   1.205 +	    or function names, databases, data types, environment
   1.206 +	    variables, statements, and keywords.</para>
   1.207 +        </listitem>
   1.208 +      </varlistentry>
   1.209 +
   1.210 +      <varlistentry>
   1.211 +        <term><userinput>Constant width bold</userinput></term>
   1.212 +
   1.213 +        <listitem>
   1.214 +          <para id="x_73d">Shows commands or other text that should be typed
   1.215 +	    literally by the user.</para>
   1.216 +        </listitem>
   1.217 +      </varlistentry>
   1.218 +
   1.219 +      <varlistentry>
   1.220 +        <term><replaceable>Constant width italic</replaceable></term>
   1.221 +
   1.222 +        <listitem>
   1.223 +          <para id="x_73e">Shows text that should be replaced with user-supplied
   1.224 +	    values or by values determined by context.</para>
   1.225 +        </listitem>
   1.226 +      </varlistentry>
   1.227 +    </variablelist>
   1.228 +
   1.229 +    <tip>
   1.230 +      <para id="x_73f">This icon signifies a tip, suggestion, or general
   1.231 +	note.</para>
   1.232 +    </tip>
   1.233 +
   1.234 +    <caution>
   1.235 +      <para id="x_740">This icon indicates a warning or caution.</para>
   1.236 +    </caution>
   1.237 +  </sect1>
   1.238 +
   1.239 +  <sect1>
   1.240 +    <title>Using Code Examples</title>
   1.241 +
   1.242 +    <para id="x_741">This book is here to help you get your job done. In general,
   1.243 +      you may use the code in this book in your programs and
   1.244 +      documentation. You do not need to contact us for permission
   1.245 +      unless you’re reproducing a significant portion of the code. For
   1.246 +      example, writing a program that uses several chunks of code from
   1.247 +      this book does not require permission. Selling or distributing a
   1.248 +      CD-ROM of examples from O’Reilly books does require permission.
   1.249 +      Answering a question by citing this book and quoting example
   1.250 +      code does not require permission. Incorporating a significant
   1.251 +      amount of example code from this book into your product’s
   1.252 +      documentation does require permission.</para>
   1.253 +
   1.254 +    <para id="x_742">We appreciate, but do not require, attribution. An
   1.255 +      attribution usually includes the title, author, publisher, and
   1.256 +      ISBN. For example: “<emphasis>Book Title</emphasis> by Some
   1.257 +      Author. Copyright 2008 O’Reilly Media, Inc.,
   1.258 +      978-0-596-xxxx-x.”</para>
   1.259 +
   1.260 +    <para id="x_743">If you feel your use of code examples falls outside fair use
   1.261 +      or the permission given above, feel free to contact us at
   1.262 +      <email>permissions@oreilly.com</email>.</para>
   1.263 +  </sect1>
   1.264 +
   1.265 +  <sect1>
   1.266 +    <title>Safari® Books Online</title>
   1.267 +
   1.268 +    <note role="safarienabled">
   1.269 +      <para id="x_744">When you see a Safari® Books Online icon on the cover of
   1.270 +	your favorite technology book, that means the book is
   1.271 +	available online through the O’Reilly Network Safari
   1.272 +	Bookshelf.</para>
   1.273 +    </note>
   1.274 +
   1.275 +    <para id="x_745">Safari offers a solution that’s better than e-books. It’s a
   1.276 +      virtual library that lets you easily search thousands of top
   1.277 +      tech books, cut and paste code samples, download chapters, and
   1.278 +      find quick answers when you need the most accurate, current
   1.279 +      information. Try it for free at <ulink role="orm:hideurl:ital"
   1.280 +	url="http://my.safaribooksonline.com/?portal=oreilly">http://my.safaribooksonline.com</ulink>.</para>
   1.281 +  </sect1>
   1.282 +
   1.283 +  <sect1>
   1.284 +    <title>How to Contact Us</title>
   1.285 +
   1.286 +    <para id="x_746">Please address comments and questions concerning this book
   1.287 +      to the publisher:</para>
   1.288 +
   1.289 +    <simplelist type="vert">
   1.290 +      <member>O’Reilly Media, Inc.</member>
   1.291 +
   1.292 +      <member>1005 Gravenstein Highway North</member>
   1.293 +
   1.294 +      <member>Sebastopol, CA 95472</member>
   1.295 +
   1.296 +      <member>800-998-9938 (in the United States or Canada)</member>
   1.297 +
   1.298 +      <member>707-829-0515 (international or local)</member>
   1.299 +
   1.300 +      <member>707 829-0104 (fax)</member>
   1.301 +    </simplelist>
   1.302 +
   1.303 +    <para id="x_747">We have a web page for this book, where we list errata,
   1.304 +      examples, and any additional information. You can access this
   1.305 +      page at:</para>
   1.306 +
   1.307 +    <simplelist type="vert">
   1.308 +      <member><ulink url="http://www.oreilly.com/catalog/&lt;catalog
   1.309 +	  page&gt;"></ulink></member>
   1.310 +    </simplelist>
   1.311 +
   1.312 +    <remark>Don’t forget to update the &lt;url&gt; attribute,
   1.313 +      too.</remark>
   1.314 +
   1.315 +    <para id="x_748">To comment or ask technical questions about this book, send
   1.316 +      email to:</para>
   1.317 +
   1.318 +    <simplelist type="vert">
   1.319 +      <member><email>bookquestions@oreilly.com</email></member>
   1.320 +    </simplelist>
   1.321 +
   1.322 +    <para id="x_749">For more information about our books, conferences, Resource
   1.323 +      Centers, and the O’Reilly Network, see our web site at:</para>
   1.324 +
   1.325 +    <simplelist type="vert">
   1.326 +      <member><ulink url="http://www.oreilly.com"></ulink></member>
   1.327 +    </simplelist>
   1.328 +  </sect1>
   1.329 +</preface>
   1.330  
   1.331  <!--
   1.332  local variables: 
   1.333 -sgml-parent-document: ("00book.xml" "book" "chapter")
   1.334 +sgml-parent-document: ("00book.xml" "book" "preface")
   1.335  end:
   1.336 --->
   1.337 \ No newline at end of file
   1.338 +-->