From e18f64458daef616fdf80f38ce28c64eef4fa225 Mon Sep 17 00:00:00 2001
From: eal <eal@fsfe.org>
Date: Tue, 26 Jun 2012 16:34:55 +0000
Subject: [PATCH] test

svn path=/trunk/; revision=23629
---
 order/promopack.en.xhtml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/order/promopack.en.xhtml b/order/promopack.en.xhtml
index 12717b7d75..8f45cb4ea2 100644
--- a/order/promopack.en.xhtml
+++ b/order/promopack.en.xhtml
@@ -36,13 +36,30 @@
 
 <h3>General FSFE and Fellowship material</h3>
 
-<h4>"Join the Fellowship" Poster</h4>
-<p><img src="/order/promotion/joinfellowship-poster_thumb.png" style="text-align:left"></img>Our "Join the Fellowship" Poster. A good poster to pin on a prominent place, for example inside a Hackerspace, and for use at any public activity.</p>
+
+<p><img src="/order/promotion/joinfellowship-poster_thumb.png" style="text-align:left"></img>Our "Join the Fellowship" Poster. A good poster to pin on a prominent place, for example inside a Hackerspace, and for use at any public activity. Size A1.</p>
+
+<p><img src="/order/promotion/fellowhip-folder_thumb.png" style="text-align:left" />Our Fellowship <span style="font-weight:bold">folder</span> that contains core information about FSFE, Free Software and how to contribute. There is an English and a German version available. Both are in size A4 and in size A5 available. Both are made to contain additional information. While we have an information page for the latter, the first could be filled by you or with printed versions of our political work [FIXME: insert link]</p>
+
+<p><img src="/order/promotion/plussy-sticker_thumb.png" style="text-align:left"></img>The classic Plussy <span style="font-weight:bold">stickers</span>, the symbol of FSFE`s Fellowship.</p>
+
 
 <h3>FreeYourAndroid Campaign</h3>
 
-<h4>"Free your Android" Poster</h4>
-<p><img src="/order/promotion/fya-poster_thumb.png" style="text-align:left"></img>This is the poster of our "Free Your Android" campaign for which are flyers available, too. Experience shows, that this poster is very eye catchy and attracts a lot of people to ask about the backgrounds of this campaign.</p>
+
+<p><img src="/order/promotion/fya-poster_thumb.png" style="text-align:left"></img>This is the <span style="font-weight:bold">poster</span> of our Free Your Android" campaign for which are flyers available, too. Experience shows, that this poster is very eye catchy and attracts a lot of people to ask about the backgrounds of this campaign. Size A1.</p>
+
+
+<p><img src="/order/promotion/fya-flyer-en_thumb.png" style="text-align:left"></img>This is the <span style="font-weight:bold">flyer</span> of our "Free Your Android" campaign for which are posters available, too. It is made in size A7, which makes them very easy to spread and for interested persons very easy to put in pocket or their moneybag. The print is double sided: One side is in English, the other one in German.</p>
+<img src="/order/promotion/fya-flyer-de_thumb.png" style="text-align:left" />
+
+<h3>"Document Freedom Day" Campaign</h3>
+<p><img src="/order/promotion/icryd-sticker_thumb.png" style="text-align:left"></img>
+Our "I cannot read your documents" <span style="font-weight:bold">stickers</span> addresses our <a href="http://www.documentfreedom.org">Document Freedom Day</a> campaign. The slogan represents the problem that the use of proprietary file formats exclude all people not using the same proprietary software from reading the document.</p>
+
+
+
+
 
 
   </body>