From: ben <ben@saturne.(none)>
Date: Wed, 12 Aug 2015 13:57:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: edition-2015-10-10~324^2
X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/d0d9426971f7547ae13ac3eef8848a62a5163644?hp=-c

Merge remote-tracking branch 'upstream/master'
---

d0d9426971f7547ae13ac3eef8848a62a5163644
diff --combined freeculture.xml
index 93336ea,f5adda0..9029da4
--- a/freeculture.xml
+++ b/freeculture.xml
@@@ -23,6 -23,8 +23,8 @@@
  
   <pubdate>2004-03-25</pubdate>
  
+  <edition>1</edition>
+ 
   <releaseinfo>Version 2004-02-10</releaseinfo>
  
   <authorgroup>
@@@ -90,10 -92,9 +92,9 @@@
     </para>
  
     <para>
- This version of <citetitle>Free Culture</citetitle> is licensed under
- a Creative Commons license. This license permits non-commercial use of
- this work, so long as attribution is given.  For more information
- about the license visit
+ This book is licensed under a Creative Commons license. This license
+ permits non-commercial use of this work, so long as attribution is
+ given.  For more information about the license visit
  <ulink url="http://creativecommons.org/licenses/by-nc/1.0/">http://creativecommons.org/licenses/by-nc/1.0/</ulink>
     </para>
   </legalnotice>
@@@ -101,10 -102,10 +102,10 @@@
   <abstract>
    <title>About the author</title>
    <para>
- Lawrence Lessig 
+ Lawrence Lessig
  (<ulink url="http://www.lessig.org">http://www.lessig.org</ulink>),
- professor of law and a John A. Wilson Distinguished Faculty Scholar
- at Stanford Law School, is founder of the Stanford Center for Internet
+ professor of law and a Roy L. Furman Professor of Law and Leadership
+ at Harvard Law School, is founder of the Stanford Center for Internet
  and Society and is chairman of the Creative Commons
  (<ulink url="http://creativecommons.org">http://creativecommons.org</ulink>).
  The author of The Future of Ideas (Random House, 2001) and Code: And
@@@ -112,17 -113,12 +113,12 @@@ Other Laws of Cyberspace (Basic Books, 
  the boards of the Public Library of Science, the Electronic Frontier
  Foundation, and Public Knowledge. He was the winner of the Free
  Software Foundation's Award for the Advancement of Free Software,
- twice listed in BusinessWeek's <quote>e.biz 25,</quote> and named one of Scientific
- American's <quote>50 visionaries.</quote> A graduate of the University of
- Pennsylvania, Cambridge University, and Yale Law School, Lessig
- clerked for Judge Richard Posner of the U.S. Seventh Circuit Court of
- Appeals.
+ twice listed in BusinessWeek's <quote>e.biz 25,</quote> and named one
+ of Scientific American's <quote>50 visionaries.</quote> A graduate of
+ the University of Pennsylvania, Cambridge University, and Yale Law
+ School, Lessig clerked for Judge Richard Posner of the U.S. Seventh
+ Circuit Court of Appeals.
    </para>
- 
- <para>
- <ulink url="http://free-culture.cc/"/>
- </para>
- 
   </abstract>
  
  <!-- testing different ways to tag the cover page -->
@@@ -150,6 -146,8 +146,8 @@@
       -->
    <biblioid class="libraryofcongress">2003063276</biblioid>
  
+   <biblioid class="uri">http://free-culture.cc/</biblioid>
+ 
  </bookinfo>
  <!-- PAGE BREAK 3 -->
  <dedication id="alsobylessig">
@@@ -7998,7 -7996,7 +7996,7 @@@ translation): Aristotle's <citetitle>Po
  </para>
  <figure id="fig-1621">
  <title></title>
- <graphic fileref="images/1621.png" align="center" width="50%"></graphic>
+ <graphic fileref="images/aristotele-ebook.png" align="center" width="50%"></graphic>
  </figure>
  <para>
  According to its permissions, no printing or copying is permitted
@@@ -8457,7 -8455,7 +8455,7 @@@ and bad uses
  <title>&mdash; On which item have the courts ruled that manufacturers and
  retailers be held responsible for having supplied the
  equipment?</title>
- <graphic fileref="images/1711.png" align="center" width="100%"></graphic>
+ <graphic fileref="images/vcr-comic.png" align="center" width="100%"></graphic>
  </figure>
  <indexterm><primary>Conrad, Paul</primary></indexterm>
  <para>
@@@ -15551,7 -15549,8 +15549,7 @@@ the material
  </para>
  
  <!-- insert endnotes here -->
 -<?latex \theendnotes
 -?>
 +<index type="endnotes"/>
  
  <!--PAGE BREAK 336-->
  
@@@ -15649,14 -15648,6 +15647,6 @@@ Copyright &copy; 2004 Lawrence Lessig
  <ulink url="http://free-culture.cc/"/>
  </para>
  
- <para>
- This version of <citetitle>Free Culture</citetitle> is licensed under
- a Creative Commons license. This license permits non-commercial use of
- this work, so long as attribution is given.  For more information
- about the license visit
- <ulink url="http://creativecommons.org/licenses/by-nc/1.0/">http://creativecommons.org/licenses/by-nc/1.0/</ulink>
- </para>
- 
  <para>
  Published 2015 by Petter Reinholdtsen in his spare time.  First
  published 2004 by The Penguin Press.  Thomas Gramstad Forlag donated
@@@ -15700,11 -15691,19 +15690,19 @@@ Classifications: (Dewey
  <?latex } %\centering
  ?>
  
+ <para>
+ This book is licensed under a Creative Commons license. This license
+ permits non-commercial use of this work, so long as attribution is
+ given.  For more information about the license visit
+ <ulink url="http://creativecommons.org/licenses/by-nc/1.0/">http://creativecommons.org/licenses/by-nc/1.0/</ulink>
+ </para>
+ 
  <para>
  The book source is in DocBook notation and the other formats are
  derived from this.  The source is based on a version from Hans Schou.
  Typeset using Crimson Text and formatted using dblatex.  Many thanks
- to the dblatex developer for his help.  The source is available from
+ to the dblatex developer Benoît Guillon for his help.  The source is
+ available from
  <ulink url="https://github.com/petterreinholdtsen/free-culture-lessig"/>.
  Please report any problems using the GitHub issue tracker.
  </para>
@@@ -15725,7 -15724,7 +15723,7 @@@
  <tbody>
   <row>
   <entry>978-82-8067-010-6</entry>
-  <entry>Paper copy from XXX</entry>
+  <entry>Printed copy from Lulu</entry>
   </row>
   <row>
   <entry>978-82-8067-011-3</entry>