FSFE/fsfe-website
27
32
Fork 93
Code Issues 63 Pull Requests 18 Wiki Activity

typo

Browse Source 
svn path=/trunk/; revision=35438
This commit is contained in:
eal
2017-06-12 13:13:51 +00:00
parent 9857ca63c4
commit 1334075d86
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
contribute/spreadtheword.en.xhtml
View File

@@ -37,7 +37,13 @@
<h2 id="promo-material">FSFE Promotion Material</h2>
<div id="toc">
<p style="text-indent:1em;">Available promotion material</p>
<p style="text-indent:0.5em;padding-top: 1em;font-size: 1.15em;"><strong>The FSFE promo page</strong></p>
<ul style="margin-bottom: 1em;">
<li><a href="#how-to-order">How to order</a></li>
<li><a href="#feedback">Feedback</a></li>
</ul>
<p style="text-indent:0.5em;padding-top: 1em;"><strong>Available promotion material</strong></p>
<ul style="margin-bottom: 1em;">
<li><a href="#fsfe-and-fellowship-material">About FSFE and the Fellowship</a></li>
<li><a href="#freedom">Free Software &amp; users' freedom</a></li>
@@ -46,20 +52,34 @@
<li><a href="#nocloud">"There is no cloud" campaign</a></li>
<li><a href="#dfd">Document Freedom Day</a></li>
</ul>
<p style="text-indent:0.5em;padding-top: 1em;"><strong>Behind the scene</strong></p>
<ul>
<li><a href="#archives">Our Archive</a></li>
<li><a href="#upcoming">Upcoming promotion and campaigns</a></li>
</ul>
</div>
<p>
Are you going to a Free Software meeting or are you even organising one? Maybe you like to promote Free Software and the work of the FSFE around your friends and colleagues? There are various reasons why and when you might like to receive promotion material for Free Software and the FSFE. Whatever it might be, we will be happy to send you our printed promotion material for no cost. You find an overview about our material on this page with details about each product below.</p>
Are you going to a Free Software meeting or are you even organising one? Maybe you like to promote Free Software and the work of the FSFE around your friends and colleagues or at some public event? There are various reasons why and when you might like to receive promotion material for Free Software and the FSFE. Whatever it might be, we will be happy to send you our printed promotion material for <strong>no cost</strong>.<br /> On this page, you find an overview about our material and details about each product.</p>
<h2 id="id-how-and-what-to-order">How to order</h2>
<h2 id="how-to-order">How to order</h2>
<p>
To order promotion material please use the following order form. You might either order our default package or individual quantities and tell us explicitly what kind of promotion material you need or prefer. Feel free to decide for yourself. However, please keep in mind, that for postal reasons, in general we just send packages up to 1kg. If you need more, please ask in advance.
To order promotion material please use the following order form. You can order our default package or individual quantities and tell us explicitly what kind of promotion material you need or prefer. Feel free to decide for yourself. However, please keep in mind, that for postal reasons, in general we just send packages up to 1kg. If you need more, please ask in advance.
</p>
<h2 id="feedback">Any feedback?</h2>
<p>Did you experience any trouble with your order, found a typo in our text, you have a remark or an idea for upcoming promotion material? Or you just like to send us a motivating message? Please <a href="mailto:contact@fsfe.org">share your feedback</a> with us.</p>
<p>We are always eager to hear some nice stories or to see pictures that you have with our promotion material. Many people also share their experience and pictures via social media with us. </p>
<form class="highlight labeledform" id="orderpromo" method="post" action="/cgi-bin/promotion.php" accept-charset="utf-8">
<!-- Translators: please set the value for the language to your language code -->
<input type="hidden" name="language" value="en" />

2
news/nl/nl-201706.en.xhtml
View File

@@ -8,7 +8,7 @@
<h1 class="p-name">FSFE Newsletter -June 2017</h1>
<h2>New European Interoperabilty Framework urges public administrations to use and contribute to Free Software</h2>
<h2>New European Interoperability Framework urges public administrations to use and contribute to Free Software</h2>
<p newsteaser="yes">After a round of public consultation last year, the 'new' <a href="https://ec.europa.eu/isa2/eif_en">European Interoperability Framework</a> (EIF) was finally published in March 2017. In alignment with <a href="https://fsfe.org/activities/os/eif-v3">our answers</a> to the public consultation, and with the <a href="http://ec.europa.eu/isa2/sites/isa/files/eif-public-consultation-factual-summary-en.pdf">general responses</a> from citizens and businesses that demanded more Free Software within public e-services, the revised EIF includes a recommendation to public administrations across Europe to "ensure a level playing field for Free Software and demonstrate active and fair consideration of using Free Software" when offering e-services.</p>