Merge branch 'upstream' into debian/sid

2 files changed, 192 insertions, 0 deletions

diff --git a/data/v2/samples/_sisu/skin/yml/list.yml b/data/v2/samples/_sisu/skin/yml/list.yml
new file mode 100644
index 0000000..4aea9b9
--- /dev/null
+++ b/data/v2/samples/_sisu/skin/yml/list.yml
@@ -0,0 +1,24 @@
+sisu:
+  site:
+  - sisu
+open_society:
+  site:
+  - twon
+  - fc
+  - faif
+  - twobits
+  - ffa
+  - catb
+  - littlebrother
+sisu_icon:
+  site:
+  - sisu_icon
+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
new file mode 100644
index 0000000..de18d07
--- /dev/null
+++ b/data/v2/samples/_sisu/skin/yml/promo.yml
@@ -0,0 +1,168 @@
+# 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:    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/
+  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/
+  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/
+  littlebrother:
+    title:      Little Brother
+    author:     Cory Doctorow
+    year:       2008
+    url:        little_brother.cory_doctorow
+    links:
+    -
+      title:    Home
+      url:      http://craphound.com/littlebrother
+search:
+  sisu_books_libre_sisusearch:
+    type:      sisusearch
+    action:    http://search.sisudoc.org
+    target:    _top
+    db:        sisu