Merge branch 'upstream' into debian/sid

2 files changed, 0 insertions, 271 deletions

diff --git a/data/v2/samples/_sisu/skin/yml/list.yml b/data/v2/samples/_sisu/skin/yml/list.yml
deleted file mode 100644
index e02a153..0000000
--- a/data/v2/samples/_sisu/skin/yml/list.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-sisu:
-  site:
-  - sisu
-open_society:
-  site:
-  - vs
-  - twon
-  - fc
-  - content
-  - di
-  - faif
-  - twobits
-  - ffa
-  - catb
-  - littlebrother
-  - magickingdom
-  - ftw
-sisu_icon:
-  site:
-  - sisu_icon
-ruby:
-  site:
-  - ruby_logo
-fsf:
-  site:
-  - fsf
-gpl:
-  site:
-  - gpl
-sisu_search_libre:
-  search:
-  - sisu_books_libre_sisusearch
diff --git a/data/v2/samples/_sisu/skin/yml/promo.yml b/data/v2/samples/_sisu/skin/yml/promo.yml
deleted file mode 100644
index a52f874..0000000
--- a/data/v2/samples/_sisu/skin/yml/promo.yml
+++ /dev/null
@@ -1,239 +0,0 @@
-# Author: ralph@amissah.com
-site:
-  sisu_icon:
-    url:        SiSU
-    image:      sisu.png
-    blurb:      ~
-  sisu:
-    title:      SiSU
-    url:        index.html
-    blurb:      ~
-    links:
-    -
-      title:    What does SiSU do? Summary
-      url:      SiSU/1.html#summary
-    -
-      title:    SiSU Book Samples and Markup Examples
-      url:      SiSU/examples.html
-    -
-      title:    Manual
-      url:      http://sisudoc.org/sisu/sisu_manual/
-    -
-      title:    Markup
-      url:      http://sisudoc.org/sisu/sisu_markup/
-    -
-      title:    Commands
-      url:      http://sisudoc.org/sisu/sisu_commands/
-    -
-      title:    SiSU Download
-      url:      SiSU/download.html
-    -
-      title:    SiSU Changelog
-      url:      SiSU/changelog.html
-      blurb:    ~
-    -
-      title:    output by Author
-      url:      sisu_site_metadata/harvest_authors.html
-    -
-      title:    output by Topic
-      url:      sisu_site_metadata/harvest_topics.html
-    -
-      title:    Wikipedia entry
-      url:      http://en.wikipedia.org/wiki/SiSU
-      blurb:    ~
-    -
-      title:    Freshmeat
-      url:      http://freshmeat.net/projects/sisu/
-    -
-      title:    Ruby Application Archive
-      url:      http://raa.ruby-lang.org/project/sisu/
-  vs:
-    title:      Viral Spiral
-    subtitle:   How the Commoners Built a Digital Republic of Their Own
-    author:     David Bollier
-    year:       2009
-    url:        viral_spiral.david_bollier
-    links:
-    -
-      title:    Source Wiki
-      url:      http://viralspiral.cc/
-  twon:
-    title:      The Wealth of Networks
-    subtitle:   How Social Production Transforms Markets and Freedom
-    author:     Yochai Benkler
-    year:       2006
-    url:        the_wealth_of_networks.yochai_benkler
-    links:
-    -
-      title:    Wikipedia entry
-      url:      http://en.wikipedia.org/wiki/The_Wealth_of_Networks
-    -
-      title:    Source Wiki
-      url:      http://www.benkler.org/wealth_of_networks/index.php/Main_Page
-  fc:
-    title:      Free Culture
-    subtitle:   How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
-    author:     Lawrence Lessig
-    year:       2004
-    url:        free_culture.lawrence_lessig
-    links:
-    -
-      title:    Wikipedia entry
-      url:      http://en.wikipedia.org/wiki/Free_Culture_%28book%29
-    -
-      title:    Creative Commons
-      url:      http://creativecommons.org/
-    -
-      title:    Source
-      url:      http://www.free-culture.cc/
-  di:
-    title:      Democratizing Innovation
-    author:     Eric von Hippel
-    year:       2005
-    url:        democratizing_innovation.eric_von_hippel
-    links:
-    -
-      title:    Wikipedia entry
-      url:      http://en.wikipedia.org/wiki/Democratizing_Innovation
-    -
-      title:    Source
-      url:      http://web.mit.edu/evhippel/www/democ1.htm
-  faif:
-    title:      Free As In Freedom
-    subtitle:   Richard Stallman's Crusade for Free Software
-    author:     Sam Williams
-    year:       2002
-    url:        free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
-    links:
-    -
-      title:    Wikipedia entry
-      url:      http://en.wikipedia.org/wiki/Free_as_in_Freedom:_Richard_Stallman%27s_Crusade_for_Free_Software
-    -
-      title:    Source
-      url:      http://faifzilla.org/
-    -
-      title:    FSF
-      url:      http://www.fsf.org/
-    -
-      title:    FSF Wikipedia
-      url:      http://en.wikipedia.org/wiki/Free_Software_Foundation
-    -
-      title:    GPL
-      url:      http://www.gnu.org/copyleft/gpl.html
-    -
-      title:    GPL Wikipedia
-      url:      http://en.wikipedia.org/wiki/GNU_General_Public_License
-  twobits:
-    title:      Two Bits
-    subtitle:   The Cultural Significance of Free Software
-    author:     Christopher Kelty
-    year:       2008
-    url:        two_bits.christopher_kelty
-    links:
-    -
-      title:    Home
-      url:      http://twobits.net
-  ffa:
-    title:      Free For All
-    subtitle:   How Linux and the Free Software Movement Undercut the High Tech Titans
-    author:     Peter Wayner
-    year:       2002
-    url:        free_for_all.peter_wayner
-    links:
-    -
-      title:    Source
-      url:      http://www.wayner.org/books/ffa/
-  catb:
-    title:      The Cathedral & the Bazaar
-    subtitle:   Musings on Linux and Open Source by an Accidental Revolutionary
-    author:     Erik S. Raymond
-    year:       1999
-    url:        the_cathedral_and_the_bazaar.eric_s_raymond
-    links:
-    -
-      title:    Wikipedia entry
-      url:      http://en.wikipedia.org/wiki/Cathedral_and_the_bazaar
-    -
-      title:    Source
-      url:      http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/
-  fsf:
-    title:      Free Software Foundation
-    subtitle:   FSF
-    url:        http://www.fsf.org/
-    links:
-    -
-      title:    Wikipedia entry
-      url:      http://en.wikipedia.org/wiki/Free_Software_Foundation
-    -
-      title:    GPL
-      subtitle: GNU General Public License
-      url:      http://www.gnu.org/copyleft/gpl.html
-  gpl:
-    title:      GNU General Public License
-    subtitle:   GPL
-    url:        http://www.gnu.org/copyleft/gpl.html
-    links:
-    -
-      title:   Wikipedia entry
-      url:     http://en.wikipedia.org/wiki/GNU_General_Public_License
-    -
-      title:    GPL 3
-      url:      http://gplv3.fsf.org/
-    -
-      title:    Software License List
-      url:      http://www.fsf.org/licensing/licenses/
-  content:
-    title:      CONTENT
-    subtitle:   Selected Essays on Technology, Creativity, Copyright and the Future of the Future
-    author:     Cory Doctorow
-    year:       2008
-    url:        content.cory_doctorow
-    links:
-    -
-      title:    Home
-      url:      http://craphound.com/content
-    -
-      title:   Wikipedia entry
-      url:     http://en.wikipedia.org/wiki/Cory_Doctorow
-  magickingdom:
-    title:      Down and Out in the Magic Kingdom
-    author:     Cory Doctorow
-    year:       2003
-    url:        down_and_out_in_the_magic_kingdom.cory_doctorow
-    links:
-    -
-      title:    Home
-      url:      http://craphound.com/down
-    -
-      title:   Wikipedia entry
-      url:     http://en.wikipedia.org/wiki/Down_and_Out_in_the_Magic_Kingdom
-  littlebrother:
-    title:      Little Brother
-    author:     Cory Doctorow
-    year:       2008
-    url:        little_brother.cory_doctorow
-    links:
-    -
-      title:    Home
-      url:      http://craphound.com/littlebrother
-    -
-      title:   Wikipedia entry
-      url:     http://en.wikipedia.org/wiki/Little_Brother_(Cory_Doctorow_novel)
-  ftw:
-    title:      For the Win
-    author:     Cory Doctorow
-    year:       2008
-    url:        for_the_win.cory_doctorow
-    links:
-    -
-      title:    Home
-      url:      http://craphound.com/ftw
-    -
-      title:   Wikipedia entry
-      url:     http://en.wikipedia.org/wiki/For_The_Win_(Cory_Doctorow_novel)
-search:
-  sisu_books_libre_sisusearch:
-    type:      sisusearch
-    action:    http://search.sisudoc.org
-    target:    _top
-    db:        sisu