Merge branch 'upstream' into debian/sid

2 files changed, 7 insertions, 8 deletions

diff --git a/data/v1/README b/data/v1/README
index 6b7f388..ddab48f 100644
--- a/data/v1/README
+++ b/data/v1/README
@@ -1,10 +1,5 @@
-Note on sisu markup 2006-11-27, Ralph Amissah
-
-Books prepared as sisu markup samples, output formats to be generated using
-SiSU are contained in a separate package sisu_markup_samples
-
-sisu contains a few documents published under the GPL or that are Debian Free
-Software Guideline license compatible:
+The package sisu contains a few documents published under the GPL or that are
+Debian Free Software Guideline license compatible, notably:
 
   Text: Free as in Freedom - Richard Stallman's Crusade for Free Software
     URL: <http://faifzilla.org/>
@@ -17,6 +12,10 @@ Software Guideline license compatible:
     invariant sections, and with the Back-Cover Texts being no invariant sections
     URL: <http://www.gnu.org/copyleft/fdl.html>
 
+A few additional sample books prepared as sisu markup samples, output formats
+to be generated using SiSU are contained in a separate package
+sisu_markup_samples
+
 sisu_markup_samples contains gpl content and additional material released under
 various licenses mostly different Creative Commons licences that do not permit
 inclusion in the Debian Project as they do not meet the DFSG for various
diff --git a/data/v1/samples/little_brother.cory_doctorow.sst b/data/v1/samples/little_brother.cory_doctorow.sst
index fa30fb1..c069e5b 100644
--- a/data/v1/samples/little_brother.cory_doctorow.sst
+++ b/data/v1/samples/little_brother.cory_doctorow.sst
@@ -6324,7 +6324,7 @@ Bruce Schneier
 http://www.schneier.com
 
 1~afterword_2 Afterword by Andrew "bunnie" Huang, Xbox Hacker
- 
+
 Hackers are explorers, digital pioneers. It's in a hacker's nature to question conventions and be tempted by intricate problems. Any complex system is sport for a hacker; a side effect of this is the hacker's natural affinity for problems involving security. Society is a large and complex system, and is certainly not off limits to a little hacking. As a result, hackers are often stereotyped as iconoclasts and social misfits, people who defy social norms for the sake of defiance. When I hacked the Xbox in 2002 while at MIT, I wasn’t doing it to rebel or to cause harm; I was just following a natural impulse, the same impulse that leads to fixing a broken iPod or exploring the roofs and tunnels at MIT. 
  
 Unfortunately, the combination of not complying with social norms and knowing “threatening” things like how to read the arphid on your credit card or how to pick locks causes some people to fear hackers. However, the motivations of a hacker are typically as simple as “I’m an engineer because I like to design things.” People often ask me, “Why did you hack the Xbox security system?” And my answer is simple: First, I own the things that I buy. If someone can tell me what I can and can’t run on my hardware, then I don’t own it. Second, because it’s there. It’s a system of sufficient complexity to make good sport. It was a great diversion from the late nights working on my PhD.