[Office-commits] r9796 - trunk/campaigns/pipeline

[sysadmin]

Author: www-data
Date: Tue Sep 29 15:33:02 2009
New Revision: 9796

Log:
web commit by holmes

Modified:
   trunk/campaigns/pipeline/videotestimonials.mdwn

Modified: trunk/campaigns/pipeline/videotestimonials.mdwn
==============================================================================
--- trunk/campaigns/pipeline/videotestimonials.mdwn     Tue Sep 29 15:29:32 
2009        (r9795)
+++ trunk/campaigns/pipeline/videotestimonials.mdwn     Tue Sep 29 15:33:02 
2009        (r9796)
@@ -44,22 +44,7 @@
 
 Materials:
 
-### Submission Guidelines 
-
-* By submitting videos, you're agreeing to license them under the public 
domain, and that you have the permission you need from everyone who's in the 
video.
-* Please no submissions from anyone under 13 years old.
-* If you can, try converting your videos using this command, and posting them 
for us to download.  
-
- ffmpeg2theora -p videobin --artist "Your Name" --title "Your Title" --date 
"Your Date" --location "Your Location" --copyright "2009, You" --license 
"Public Domain" VIDEOFILENAME.MP4 -o NEWVIDEOFILENAME.OGV
-
-* If that looks to hard, post them to [videobin.org](http://videobin.org) or 
[Tinyvid.TV](http://tinyvid.tv/) and send us a link.
-* Email your submissions as a link (not as an attachment) to address@hidden
-* Include your name and how you'd like to be identified (e.g. Jane Jones, 
university professor) and optionally a short note on what you do or where 
you're from.
-* If you're in a noisy place, try using a lapel mic or something similar 
instead of the mic in the video camera.
 
-One important note: There are a lot of people out there promoting open source 
and an operating system they call Linux on the grounds that it's inexpensive 
and works well -- but it's really important that those of us who share the GNU 
Project's concern for the ethical issues make a point of letting people know 
about the importance of software freedom -- so send us your video about *free 
software* and the *GNU/Linux* operating system.  Also, if you want to recommend 
a distro, make sure it's on the [list of free 
distributions](http://www.gnu.org/distros/free-distros.html).
- 
-To be completely clear, we can't use videos that use the words "Linux" (not 
referring to the kernel) and "Open" (referring to software).  See: [Confusing 
Words and Phrases that are Worth 
Avoiding](http://www.gnu.org/philosophy/words-to-avoid.html).
 
 ### Email to info-fsf
 
@@ -171,6 +156,23 @@
 
 On a related note: We've been collecting <a 
href="http://www.fsf.org/resources/testimonials";>written testimonials</a> for a 
while.  If you'd like to submit a written testimonial, email address@hidden
 
+### Submission Guidelines 
+
+* By submitting videos, you're agreeing to license them under the public 
domain, and that you have the permission you need from everyone who's in the 
video.
+* Please no submissions from anyone under 13 years old.
+* If you can, try converting your videos using this command, and posting them 
for us to download.  
+
+ ffmpeg2theora -p videobin --artist "Your Name" --title "Your Title" --date 
"Your Date" --location "Your Location" --copyright "2009, You" --license 
"Public Domain" VIDEOFILENAME.MP4 -o NEWVIDEOFILENAME.OGV
+
+* If that looks to hard, post them to [videobin.org](http://videobin.org) or 
[Tinyvid.TV](http://tinyvid.tv/) and send us a link.
+* Email your submissions as a link (not as an attachment) to address@hidden
+* Include your name and how you'd like to be identified (e.g. Jane Jones, 
university professor) and optionally a short note on what you do or where 
you're from.
+* If you're in a noisy place, try using a lapel mic or something similar 
instead of the mic in the video camera.
+
+One important note: There are a lot of people out there promoting open source 
and an operating system they call Linux on the grounds that it's inexpensive 
and works well -- but it's really important that those of us who share the GNU 
Project's concern for the ethical issues make a point of letting people know 
about the importance of software freedom -- so send us your video about *free 
software* and the *GNU/Linux* operating system.  Also, if you want to recommend 
a distro, make sure it's on the [list of free 
distributions](http://www.gnu.org/distros/free-distros.html).
+ 
+To be completely clear, we can't use videos that use the words "Linux" (not 
referring to the kernel) and "Open" (referring to software).  See: [Confusing 
Words and Phrases that are Worth 
Avoiding](http://www.gnu.org/philosophy/words-to-avoid.html).
+
 ### Report back from Dana Moser w/ video links:
 
 Subject: Re: Any video yet?