Undo changes to line ending done by commit from Kirill, and merge his changes.

[text-free-culture-lessig.git] / freeculture.xml

diff --git a/freeculture.xml b/freeculture.xml
index c8aea4abd99ec16367ebd3a80e17c19f7b67aec6..f22ac2c707ac3f50dc824ffeb5c5c5fcdcf124df 100644 (file)
--- a/freeculture.xml
+++ b/freeculture.xml
@@ -9850,10 +9850,12 @@ think there's little in this story to worry you.
 But there's an aspect of this story that is not lefty in any sense.
 Indeed, it is an aspect that could be written by the most extreme
 promarket ideologue. And if you're one of these sorts (and a special
 But there's an aspect of this story that is not lefty in any sense.
 Indeed, it is an aspect that could be written by the most extreme
 promarket ideologue. And if you're one of these sorts (and a special

-one at that, 188 pages into a book like this), then you can see this
-other aspect by substituting <quote>free market</quote> every place I've spoken of
-<quote>free culture.</quote>  The point is the same, even if the interests
-affecting culture are more fundamental.
+one at that, <xref xrefstyle="select: pagenumber"
+linkend="innovators"/> pages into a book like this), then you
+can see this other aspect by substituting <quote>free market</quote>
+every place I've spoken of <quote>free culture.</quote> The point is
+the same, even if the interests affecting culture are more
+fundamental.

 </para>
 <para>
 The charge I've been making about the regulation of culture is the
 </para>
 <para>
 The charge I've been making about the regulation of culture is the


@@ -10007,7 +10009,7 @@ such a view of the law will cost you and your firm dearly.
 This strategy is not just limited to the lawyers. In April 2003,
 Universal and EMI brought a lawsuit against Hummer Winblad, the
 venture capital firm (VC) that had funded Napster at a certain stage of
 This strategy is not just limited to the lawyers. In April 2003,
 Universal and EMI brought a lawsuit against Hummer Winblad, the
 venture capital firm (VC) that had funded Napster at a certain stage of

-its development, its cofounder ( John Hummer), and general partner
+its development, its cofounder (John Hummer), and general partner

 (Hank Barry).<footnote><para>
 <!-- f4. -->
 See Joseph Menn, <quote>Universal, EMI Sue Napster Investor,</quote> <citetitle>Los Angeles
 (Hank Barry).<footnote><para>
 <!-- f4. -->
 See Joseph Menn, <quote>Universal, EMI Sue Napster Investor,</quote> <citetitle>Los Angeles