Merge branch 'upstream' into debian/sid

1 files changed, 12 insertions, 11 deletions

diff --git a/data/v2/samples/free_culture.lawrence_lessig.sst b/data/v2/samples/free_culture.lawrence_lessig.sst
index 49b407a..cb5fe2c 100644
--- a/data/v2/samples/free_culture.lawrence_lessig.sst
+++ b/data/v2/samples/free_culture.lawrence_lessig.sst
@@ -32,7 +32,7 @@
 @vocabulary: none
 
 @make:
- :breaks: new=:C; break=1
+ :breaks: new=:B; break=1
  :skin: skin_lessig
 
 @links:
@@ -43,6 +43,7 @@
  {@ Amazon.com}http://www.amazon.com/gp/product/1594200068
  {@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=1594200068
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
+ {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
  {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
  {Free as in Freedom (on Richard M. Stallman), Sam Williams @ SiSU}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
  {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
@@ -56,7 +57,7 @@
 
 To Eric Eldred - whose work first drew me to this cause, and for whom it continues still.~#
 
-:C~ PREFACE
+:B~ PREFACE
 
 1~preface [Preface]-#
 
@@ -91,7 +92,7 @@ Like Stallman's arguments for free software, an argument for free culture stumbl
 
 Instead, the free culture that I defend in this book is a balance between anarchy and control. A free culture, like a free market, is filled with property. It is filled with rules of property and contract that get enforced by the state. But just as a free market is perverted if its property becomes feudal, so too can a free culture be queered by extremism in the property rights that define it. That is what I fear about our culture today. It is against that extremism that this book is written.
 
-:C~ INTRODUCTION
+:B~ INTRODUCTION
 
 1~intro [Intro]-#
 
@@ -231,7 +232,7 @@ The two sections set up the core claim of this book: that while the Internet has
 
 We allow this, I believe, not because it is right, and not because most of us really believe in these changes. We allow it because the interests most threatened are among the most powerful players in our depressingly compromised process of making law. This book is the story of one more consequence of this form of corruption - a consequence to which most of us remain oblivious.
 
-:C~ "PIRACY"
+:B~ "PIRACY"
 
 1~intro_piracy [Intro]-#
 
@@ -967,7 +968,7 @@ begins to talk about "balance," the copyright warriors raise a different argumen
 
 "It is /{our property}/," the warriors insist. "And it should be protected just as any other property is protected."
 
-:C~ "PROPERTY"
+:B~ "PROPERTY"
 
 1~intro_property [Intro]-#
 
@@ -2078,7 +2079,7 @@ We achieved that free culture because our law respected important limits on the
 Free culture is increasingly the casualty in this war on piracy. In response to a real, if not yet quantified, threat that the technologies of the Internet present to twentieth-century business models for producing and distributing culture, the law and technology are being transformed in a way that will undermine our tradition of free culture. The property right that is copyright is no longer the balanced right that it was, or was intended to be. The property right that is copyright has become unbalanced, tilted toward an extreme. The opportunity to create and transform becomes weakened in a world in which creation requires permission and creativity must check with a lawyer.
 ={free culture:permission culture vs.;permission culture:free culture vs.}
 
-:C~ PUZZLES
+:B~ PUZZLES
 
 1~ Chapter Eleven: Chimera
 
@@ -2466,7 +2467,7 @@ _1 So when we're talking about numbers like forty to sixty million Americans tha
 
 When forty to sixty million Americans are considered "criminals" under the law, and when the law could achieve the same objective - securing rights to authors - without these millions being considered "criminals," who is the villain? Americans or the law? Which is American, a constant war on our own people or a concerted effort through our democracy to change our law?
 
-:C~ BALANCES
+:B~ BALANCES
 
 1~intro_balances [Intro]-#
 
@@ -3020,7 +3021,7 @@ What is hard to understand is why the public takes this view. It is as if the la
 
 All this seems to follow easily from this untroubled acceptance of the "property" in intellectual property. Common sense supports it, and so long as it does, the assaults will rain down upon the technologies of the Internet. The consequence will be an increasing "permission society." The past can be cultivated only if you can identify the owner and gain permission to build upon his work. The future will be controlled by this dead (and often unfindable) hand of the past.
 
-:C~ CONCLUSION
+:B~ CONCLUSION
 
 1~conclusion [Conclusion]-#
 
@@ -3170,7 +3171,7 @@ I've told a dark story. The truth is more mixed. A technology has given us a new
 
 Common sense must revolt. It must act to free culture. Soon, if this potential is ever to be realized.
 
-:C~ AFTERWORD
+:B~ AFTERWORD
 
 1~intro_afterword [Intro]-#
 
@@ -3551,13 +3552,13 @@ The law should regulate in certain areas of culture - but it should regulate cul
 
 We should ask, "Why?" Show me why your regulation of culture is needed. Show me how it does good. And until you can show me both, keep your lawyers away.
 
-:C~ NOTES
+:B~ NOTES
 
 1~webnotes Notes~#
 
 Throughout this text, there are references to links on the World Wide Web. As anyone who has tried to use the Web knows, these links can be highly unstable. I have tried to remedy the instability by redirecting readers to the original source through the Web site associated with this book. For each link below, you can go to http://free-culture.cc/notes and locate the original source by clicking on the number after the # sign. If the original link remains alive, you will be redirected to that link. If the original link has disappeared, you will be redirected to an appropriate reference for the material.
 
-:C~ ACKNOWLEDGMENTS
+:B~ ACKNOWLEDGMENTS
 
 1~acknowledgements [Acknowledgments]-#