www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/award .symlinks award.html prior-years.html


From: Karl Berry
Subject: www/award .symlinks award.html prior-years.html
Date: Wed, 03 May 2006 21:40:13 +0000

CVSROOT:        /web/www
Module name:    www
Branch:         
Changes by:     Karl Berry <address@hidden>     06/05/03 21:40:13

Modified files:
        award          : .symlinks award.html 
Removed files:
        award          : prior-years.html 

Log message:
        update award.html from prior-years.html, and make both index.html and 
prior-years.html symlink to award.html

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/www/www/award/.symlinks.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/www/www/award/award.html.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: www/award/.symlinks
diff -u www/award/.symlinks:1.2 www/award/.symlinks:1.3
--- www/award/.symlinks:1.2     Tue Aug  9 20:40:26 2005
+++ www/award/.symlinks Wed May  3 21:40:04 2006
@@ -1,3 +1,2 @@
-prior-years.html index.html
-award.html award.es.html
-award-1998.html award-1998.es.html
+award.html index.html
+award.html prior-years.html
Index: www/award/award.html
diff -u www/award/award.html:1.10 www/award/award.html:1.11
--- www/award/award.html:1.10   Wed May  3 05:07:43 2006
+++ www/award/award.html        Wed May  3 21:40:04 2006
@@ -1,136 +1,74 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <HTML>
 <HEAD>
-<TITLE>The Free Software Award - GNU Project - Free Software Foundation 
(FSF)</TITLE>
-<LINK REV="made" HREF="mailto:address@hidden";>
+<TITLE>Prior Years' Free Software Award - GNU Project - Free Software 
Foundation (FSF)</TITLE>
+<LINK REV="made" HREF="mailto:address@hidden";>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#1F00FF" ALINK="#FF0000" 
VLINK="#9900DD">
-<H3>The Free Software Award</H3>
-<A HREF="/graphics/atypinggnu.html"><IMG SRC="/graphics/gnu-type-sm.jpg"
-   ALT=" [image of the typing GNU] "
-   WIDTH="137" HEIGHT="114"></A>
-
-[
-<!-- Please keep this list alphabetical -->
-<!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-  <A HREF="/award/award.html">English</A>
-
-<!-- | A HREF="boilerplate.LG.html" LANGUAGE /A  -->
-<!-- Please keep this list alphabetical -->
-<!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-]
-<P>
-<HR>
-<P>
-<!-- Replace this list with the page's contents. -->
-<H4>Table of contents</H4>
-<UL>
-  <LI><A HREF="#introduction" NAME="TOCintroduction">Introduction</A>
-  <LI><A HREF="#1998" NAME="TOC1998">1998 Awards</A>
-
-  <LI><A HREF="#1999" NAME="TOC1999">1999 Awards</A>
-  <LI><A HREF="#2000" NAME="TOC2000">2000 Awards</A>
-  <LI><A HREF="#2001" NAME="TOC2001">2001 Awards</A>
-  <LI><A HREF="#2002" NAME="TOC2002">2002 Awards</A>
-  <LI><A HREF="#2003" NAME="TOC2003">2003 Awards</A>
+<H3>Free Software Awards</H3>
 
-</UL>
+<A HREF="/graphics/agnuhead.html"><IMG SRC="/graphics/gnu-head-sm.jpg"
+   ALT=" [image of the Head of a GNU] "
+   WIDTH="129" HEIGHT="122"></A>
 
 <P>
 <HR>
-<P>
-<H4><A HREF="#TOCintroduction" NAME="introduction">Introduction</A></H4>
-<P>
-The Free Software Foundation project gives the Free Software Award annually
-to an individual who has made a great contribution to the progress and
-development of free software (free as in freedom; see <a
-href="http://www.gnu.org/philosophy/free-sw.html";>http://www.gnu.org/philosophy/free-sw.html</a>
-for the definition), through activities that accord with the spirit of free
-software.
-<p>
-Any kind of activity could be eligible--writing software, writing
-documentation, publishing CDs, even journalism--but whatever the activity,
-we want to recognize long-term central contributions to the development of
-the world of free software.  "Accord with the spirit" means, for example,
-that software, manuals or collections of them (on tape or CD) must be
-entirely free.  (Once again, that's free as in freedom; see <a
-href="http://www.gnu.org/philosophy/selling.html";>http://www.gnu.org/philosophy/selling.html</a>.)
-Work done commercially is eligible, but we give awards to individuals, not
-to companies, organizations, or teams.
-<p>
 
-People such as Alan Cox, Miguel de Icaza, Donald Knuth, Larry Lessig,
-Brian Paul, Guido van Rossum, Richard Stallman, Linus Torvalds, and Larry
-Wall who have already received this or other awards for their
-contributions, are not eligible for the Award for the Advancement of Free
-Software.  Among those who are eligible, the award committee will try to
-choose whoever has made the greatest contribution.
-<p>
-We ask for nominations from the public in the middle of each year, and
-we present the award late in the year or early in the next year.
-<p>
-<H4><A HREF="#TOC1998" NAME="1998">1998 Awards</A></H4>
 <P>
-The <a href="/award/1998/nominees.html">list of nominees</a>, <a
-href="/award/1998/finalists.html">finalists</a>, and <a
-href="/award/award-1998.html">citation of winner Larry Wall</a> are
-available.
-<p>
-<H4><A HREF="#TOC1999" NAME="1999">1999 Awards</A></H4>
+<!-- We need a general description of the award -->
+To date, we have given out these FSF Awards
+for the Advancement of Free Software, recognizing a person who has
+made a great contribution to the progress and development of free
+software:
 
-<P>
-The <a href="/award/award-1999.html">list of nominees</a> and <a
-href="/award/1999/1999.html">citation of winner Miguel de Icaza</a> are
-available.
-<P>
-<H4><A HREF="#TOC2000" NAME="2000">2000 Awards</A></H4>
-<P>
-Details of the 2000 awards ceremony, including a movie, still photos, text
-transcript, and citation of winner Brian Paul, are available <a
-href="/award/2000/2000.html">here</a>.
-<P>
-<H4><A HREF="#TOC2001" NAME="2001">2001 Awards</A></H4>
+<!-- Please add years so the latest is first -->
 
-<P>
-Details of the 2001 awards ceremony are available <a
-href="/award/2001/2001.html">here</a>.
-<P>
+<H3>2005</H3> <A
+HREF="http://www.fsf.org/news/fs-award-2005.html";>Send nominations for
+the 2005 award by 31 October 2005</A>.
 
-<H4><A HREF="#TOC2002" NAME="2002">2002 Awards</A></H4>
-<P>
-<a href="/award/2002/2002.html">Details of the 2002 award ceremony are
-available</a>.  Larry Lessig won the award.
+<H3>2004</H3>
+<A HREF="http://www.fsf.org/news/fsaward2004.html";><STRONG>Theo de 
Raadt</STRONG> received the 2004 FSF Award for the Advancement of Free 
Software</A>.
 
-<P>
-<H4><A HREF="#TOC2003" NAME="2003">2003 Awards</A></H4>
-<P>
-<a href="/award/2003/2003.html">Details for the 2003 award ceremony are
-available</a>.  Alan Cox won the award.
+<H3>2003</H3>
+<A HREF="/award/2003/2003.html"><STRONG>Alan Cox</STRONG>
+received the 2003 FSF Award for the Advancement of Free Software</A>.
 
-<P>
-<H4><A HREF="#TOC2003" NAME="2003">2004 Awards</A></H4>
-<P>
-<a href="/award/2004/2004-call.html">A call for nominations for the 2004
-        award has been posted</a>.  Nominations must be received by the
-        end of October 2004.
-<P>
 
-<!--
-  * If needed, change the copyright block at the bottom. In general, all pages
-    on the GNU web server should have the section about verbatim copying. 
Please
-    do NOT remove this without talking with the webmasters first.
--->
-<HR>
+<H3>2002</H3>
+<A HREF="/award/2002/2002.html"><STRONG>Lawrence Lessig</STRONG>
+received the 2002 FSF Award for the Advancement of Free Software</A>.
+
+<H3>2001</H3>
+<A HREF="/award/2001/2001.html"><STRONG>Guido van Rossum</STRONG>
+received the 2001 FSF Award for the Advancement of Free Software</A>.
+
+<H3>2000</H3>
+
+<A HREF="/award/2000/2000.html"><STRONG>Brian Paul</STRONG>
+
+received the 2000 FSF Award for the Advancement of Free Software</A>.
+
+<H3>1999</H3>
+
+<A HREF="/award/1999/1999.html"><STRONG>Miguel de Icaza</STRONG>
+received the 1999 FSF Award for the Advancement of Free Software</A>
+from among these
+<A HREF="/award/award-1999.html">nominees</A>.
 
-[
-<!-- Please keep this list alphabetical -->
-<!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-  <A HREF="/award/award.html">English</A>
-
-<!-- | A HREF="boilerplate.LG.html" LANGUAGE /A  -->
-<!-- Please keep this list alphabetical -->
-<!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-]
+<!-- Please add years so the latest is first -->
+<H3>1998</H3>
+<A HREF="/award/award-1998.html"><STRONG>Larry Wall</STRONG>
+
+received the 1998 FSF Award for the Advancement of Free Software</A>
+from among these
+<a href="/award/1998/nominees.html">nominees</a>
+and
+<a href="/award/1998/finalists.html">finalists</a>.
+
+<P>
+<HR>
+<!-- Please add years so the latest is first -->
 
 <P>
 Return to <A HREF="/home.html">GNU's home page</A>.
@@ -139,27 +77,27 @@
 Please send FSF &amp; GNU inquiries &amp; questions to 
 
 <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-There are also <A HREF="/home.html#ContactInfo">other ways to
+There are also <A HREF="http://www.fsf.org/about/contact.html";>other ways to
 contact</A> the FSF.
-
 <P>
 
 Please send comments on these web pages to
 
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
+<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
 send other questions to
 <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
+
 <P>
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software 
Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA  02110-1301,  USA
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 <BR>
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301,  USA
 <P>
 Verbatim copying and distribution of this entire article is
-permitted in any medium, provided this notice is preserved.<P>
+permitted in any medium, provided this notice is preserved.
+<P>
 Updated:
-<!-- hhmts start -->
-$Date: 2006/05/03 05:07:43 $ $Author: ramprasadb $
-<!-- hhmts end -->
+<!-- timestamp start -->
+$Date: 2006/05/03 21:40:04 $ $Author: karl $
+<!-- timestamp end -->
 <HR>
-
 </BODY>
 </HTML>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]