CVSROOT: /web/www
Module name: www
Changes by: Pavel Kharitonov <ineiev> 12/01/29 09:12:05
Modified files:
people : past-webmasters.html people.html speakers.html
webmeisters.html
Log message:
Update templates; validation fix.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/people/past-webmasters.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/people/people.html?cvsroot=www&r1=1.333&r2=1.334
http://web.cvs.savannah.gnu.org/viewcvs/www/people/speakers.html?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/people/webmeisters.html?cvsroot=www&r1=1.187&r2=1.188
Patches:
Index: past-webmasters.html
===================================================================
RCS file: /web/www/www/people/past-webmasters.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- past-webmasters.html 2 Oct 2011 16:28:20 -0000 1.42
+++ past-webmasters.html 29 Jan 2012 09:11:49 -0000 1.43
@@ -1,20 +1,11 @@
<!--#include virtual="/server/header.html" -->
-
- <title>GNU's Webmasters - GNU Project - Free Software Foundation
- (FSF)</title>
-
+<!-- Parent-Version: 1.65 -->
+<title>GNU's Webmasters - GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
-
+<!--#set var="article_name" value="/people/past-webmasters" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<h2>GNU's Webmasters Past and Present</h2>
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html. Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
-
<p>
These people are, or have been at some stage,
<a href="/people/webmeisters.html">webmasters of www.gnu.org</a>.
@@ -129,7 +120,7 @@
since around 1997.</dd>
<dt><strong>Hicham
- Yamout</a></strong> <a href=
+ Yamout</strong> <a href=
"mailto:hic...@gmail.com";><hicham(@)gmail.com></a></dt>
<dd>Is a Computer & Communications Engineer, and is a
@@ -366,45 +357,30 @@
<dd>Webmastering the GNU since 2010.</dd>
</dl><!-- END Webmasters -->
-<!-- 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. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+<!-- If needed, change the copyright block at the bottom. In general,
+ pages on the GNU web server should be under CC BY-ND 3.0 US.
+ Please do NOT change or remove this without talking
+ with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the document
+ and that it is like this: "2001, 2002", not this: "2001-2002". -->
</div><!-- for id="content", starts in the include above -->
-
<!--#include virtual="/server/footer.html" -->
-
<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:g...@gnu.org";><em>g...@gnu.org</em></a>.
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:g...@gnu.org";><g...@gnu.org></a>.
There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections (or suggestions) to
-<!-- If you are a project maintainer or developer, please use -->
-<!-- your own email, as webmasters does not manage most -->
-
-<!-- project webpages (those that we do, you know who you are). -->
-<a
href="mailto:projectemailh...@gnu.org";><em>projectemailh...@gnu.org</em></a>.
-
-</p>
+the FSF.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:webmast...@gnu.org";><webmast...@gnu.org></a>.</p>
+
+<p>Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p>Copyright © 2007 Free Software Foundation, Inc.</p>
-<p>
-Copyright © 2007 Free Software Foundation, Inc.,
-</p>
-
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
Commons Attribution-NoDerivs 3.0 United States License</a>.
@@ -413,62 +389,10 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/10/02 16:28:20 $
+$Date: 2012/01/29 09:11:49 $
<!-- timestamp end -->
</p>
</div>
-
-<div id="translations">
-<h4>Translations of this page</h4>
-
-<!-- Please keep this list alphabetical. -->
-<!-- Comment what the language is for each type, i.e. de is Deutsch.-->
-<!-- If you add a new language here, please -->
-
-<!-- advise web-translat...@gnu.org and add it to -->
-<!-- - /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
-<!-- - /home/www/html/server/standards/README.translations.html -->
-<!-- - one of the lists under the section "Translations Underway" -->
-<!-- - if there is a translation team, you also have to add an alias -->
-<!-- to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the 2 letter language code right versus -->
-<!-- <URL:http://www.w3.org/WAI/ER/IG/ert/iso639.htm> -->
-<!-- Please use W3C normative character entities -->
-
-<ul class="translations-list">
-
-<!-- Catalan -->
-<li><a href="/people/webmeisters.ca.html">Català</a> [ca]</li>
-
-<!-- Chinese (Traditional) -->
-<li>
-<a href="/people/webmeisters.zh-tw.html">繁體中文</a>
-</li>
-
-<!-- Chinese (Simplified) -->
-<li>
-<a href="/people/webmeisters.zh-cn.html">简体中文</a>
-</li>
-
-<!-- English -->
-<li><a href="/people/webmeisters.html">English</a> [en]</li>
-
-<!-- Spanish -->
-<li><a href="/people/webmeisters.es.html">Español</a> [es]</li>
-
-<!-- French -->
-<li><a href="/people/webmeisters.fr.html">Français</a> [fr]</li>
-
-<!-- Japanese -->
-<li><a href="/people/webmeisters.ja.html">日本語</a></li>
-
-<!-- Polish -->
-<li><a href="/people/webmeisters.pl.html">polski</a> [pl]</li>
-
-</ul>
-
-</div>
-
</div>
</body>
</html>
Index: people.html
===================================================================
RCS file: /web/www/www/people/people.html,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -b -r1.333 -r1.334
--- people.html 28 Nov 2011 18:39:59 -0000 1.333
+++ people.html 29 Jan 2012 09:11:49 -0000 1.334
@@ -1,5 +1,6 @@
<!--#include virtual="/server/header.html" -->
-<title>GNU's Who - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.65 -->
+<title>GNU's Who - GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
<!--#include virtual="/people/po/people.translist" -->
<h2>GNU's Who</h2>
@@ -1922,23 +1923,28 @@
v3 Committee D</a>. He works for eZ systems AS as
their Managing Director for North America and for the
Mozilla Foundation as their Ombudslizard. </p>
-</div>
+<!-- If needed, change the copyright block at the bottom. In general,
+ pages on the GNU web server should be under CC BY-ND 3.0 US.
+ Please do NOT change or remove this without talking
+ with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the document
+ and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:g...@gnu.org";><g...@gnu.org></a>. There are also
-<a href="/contact/">other ways to contact</a> the FSF.<br />
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:g...@gnu.org";><g...@gnu.org></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.<br />
Please send broken links and other corrections or suggestions to
-<a href="mailto:webmast...@gnu.org";><webmast...@gnu.org></a>.
-</p>
+<a href="mailto:webmast...@gnu.org";><webmast...@gnu.org></a>.</p>
-<p>
-Please see the <a href="/server/standards/README.translations.html">
-Translations README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p>Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
<p>
Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2004,
@@ -1951,45 +1957,10 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/11/28 18:39:59 $
+$Date: 2012/01/29 09:11:49 $
<!-- timestamp end -->
</p>
</div>
-<!-- <div id="translations"> -->
-<!-- <h4>Translations of this page</h4> -->
-<!-- -->
-<!-- Please keep this list alphabetical by language code. -->
-<!-- Comment what the language is for each type, i.e. de is German. -->
-<!-- Write the language name in its own language (Deutsch) in the text. -->
-<!-- If you add a new language here, please -->
-<!-- advise web-translat...@gnu.org and add it to -->
-<!-- - /home/www/html/server/standards/README.translations.html -->
-<!-- - one of the lists under the section "Translations Underway" -->
-<!-- - if there is a translation team, you also have to add an alias -->
-<!-- to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the language code right; see: -->
-<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!-- If the 2-letter ISO 639-1 code is not available, -->
-<!-- use the 3-letter ISO 639-2. -->
-<!-- Please use W3C normative character entities. -->
-<!-- -->
-<!-- <ul class="translations-list"> -->
-<!-- Bosnian -->
-<!-- <li><a href="/people/people.bs.html">bosanski</a> [bs]</li> -->
-<!-- Catalan -->
-<!-- <li><a href="/people/people.ca.html">batalà</a> [ca]</li> -->
-<!-- Czech -->
-<!-- <li><a href="/people/people.cs.html">Česky</a> [cs]</li> -->
-<!-- German -->
-<!-- <li><a href="/people/people.de.html">Deutsch</a> [de]</li> -->
-<!-- English -->
-<!-- <li><a href="/people/people.html">English</a> [en]</li> -->
-<!-- Spanish -->
-<!-- <li><a href="/people/people.es.html">español</a> [es]</li> -->
-<!-- Brazilian Portuguese -->
-<!-- <li><a href="/people/people.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
-<!-- </ul> -->
-<!-- </div> -->
</div>
</body>
</html>
Index: speakers.html
===================================================================
RCS file: /web/www/www/people/speakers.html,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- speakers.html 3 Oct 2011 17:16:33 -0000 1.84
+++ speakers.html 29 Jan 2012 09:11:49 -0000 1.85
@@ -1,6 +1,6 @@
<!--#include virtual="/server/header.html" -->
-
-<title>GNU and Free Software Speakers - GNU Project - Free Software Foundation
(FSF)</title>
+<!-- Parent-Version: 1.65 -->
+<title>GNU and Free Software Speakers - GNU Project - Free Software
Foundation</title>
<meta http-equiv="Description" name="Description" content="This page
describes various speakers who can speak or serve on panel discussions
as representatives of the GNU project and the free software movement."
@@ -16,7 +16,8 @@
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" />
<!--#include virtual="/server/banner.html" -->
-
+<!--#set var="article_name" value="/people/speakers" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<h2>GNU and Free Software Speakers</h2>
<p>
@@ -747,44 +748,10 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2011/10/03 17:16:33 $
+$Date: 2012/01/29 09:11:49 $
<!-- timestamp end -->
</p>
</div>
-
-<div id="translations">
-<h4>Translations of this page</h4>
-
-<!-- Please keep this list alphabetical by language code.
- Comment what the language is for each type, i.e. de is German.
- Write the language name in its own language (Deutsch) in the text.
- If you add a new language here, please
- advise web-translat...@gnu.org and add it to
- - /home/www/html/server/standards/README.translations.html
- - one of the lists under the section "Translations Underway"
- - if there is a translation team, you also have to add an alias
- to mail.gnu.org:/com/mailer/aliases
- Please also check you have the language code right; see:
- http://www.loc.gov/standards/iso639-2/php/code_list.php
- If the 2-letter ISO 639-1 code is not available,
- use the 3-letter ISO 639-2.
- Please use W3C normative character entities.
-
- See also '(web-trans)Capitalization':
-
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
- -->
-
-<ul class="translations-list">
-<!-- Catalan -->
-<li><a href="/people/speakers.ca.html">català</a> [ca]</li>
-<!-- English -->
-<li><a href="/people/speakers.html">English</a> [en]</li>
-<!-- Spanish-->
-<li><a href="/people/speakers.es.html">español</a> [es]</li>
-<!-- Brazilian Portugese -->
-<li><a href="/people/speakers.pt-br.html">português do
Brasil</a> [pt-br]</li>
-</ul>
-</div>
</div>
</body>
</html>
Index: webmeisters.html
===================================================================
RCS file: /web/www/www/people/webmeisters.html,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- webmeisters.html 2 Oct 2011 16:28:20 -0000 1.187
+++ webmeisters.html 29 Jan 2012 09:11:49 -0000 1.188
@@ -1,6 +1,9 @@
<!--#include virtual="/server/header.html" -->
-<title>GNU's Webmasters - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.65 -->
+<title>GNU's Webmasters - GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
+<!--#set var="article_name" value="/people/webmeisters" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<h2>We are the GNU Webmasters!</h2>
<h3 class="nocenter">Jason Self, GNU Chief Webmaster</h3>
@@ -90,29 +93,27 @@
<p><a href="/people/past-webmasters.html">An exhaustive list of GNU
webmasters and GNU Web Translators</a> is also available.</p>
+<!-- If needed, change the copyright block at the bottom. In general,
+ pages on the GNU web server should be under CC BY-ND 3.0 US.
+ Please do NOT change or remove this without talking
+ with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the document
+ and that it is like this: "2001, 2002", not this: "2001-2002". -->
</div><!-- for id="content", starts in the include above -->
-
<!--#include virtual="/server/footer.html" -->
-
<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
+<p>Please send general FSF & GNU inquiries to
<a href="mailto:g...@gnu.org";><g...@gnu.org></a>.
There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
+the FSF.<br />
Please send broken links and other corrections or suggestions to
-<a href="mailto:webmast...@gnu.org";><webmast...@gnu.org></a>.
-
-</p>
+<a href="mailto:webmast...@gnu.org";><webmast...@gnu.org></a>.</p>
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p>Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
<p>Copyright © 2007, 2010 Free Software Foundation, Inc.</p>
@@ -124,52 +125,10 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/10/02 16:28:20 $
+$Date: 2012/01/29 09:11:49 $
<!-- timestamp end -->
</p>
</div>
-
-<div id="translations">
-<h4>Translations of this page</h4>
-
-<!-- Please keep this list alphabetical by language code.
- Comment what the language is for each type, i.e. de is German.
- Write the language name in its own language (Deutsch) in the text.
- If you add a new language here, please
- advise web-translat...@gnu.org and add it to
- - /home/www/html/server/standards/README.translations.html
- - one of the lists under the section "Translations Underway"
- - if there is a translation team, you also have to add an alias
- to mail.gnu.org:/com/mailer/aliases
- Please also check you have the language code right; see:
- http://www.loc.gov/standards/iso639-2/php/code_list.php
- If the 2-letter ISO 639-1 code is not available,
- use the 3-letter ISO 639-2.
- Please use W3C normative character entities.
-
- See also '(web-trans)Capitalization':
-
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
- -->
-
-<ul class="translations-list">
-<!-- Catalan -->
-<li><a href="/people/webmeisters.ca.html">català</a> [ca]</li>
-<!-- English -->
-<li><a href="/people/webmeisters.html">English</a> [en]</li>
-<!-- Spanish -->
-<li><a href="/people/webmeisters.es.html">español</a> [es]</li>
-<!-- French -->
-<li><a href="/people/webmeisters.fr.html">français</a> [fr]</li>
-<!-- Japanese -->
-<li><a
href="/people/webmeisters.ja.html">日本語</a> [ja]</li>
-<!-- Polish -->
-<li><a href="/people/webmeisters.pl.html">polski</a> [pl]</li>
-<!-- Chinese (Simplified) -->
-<li><a
href="/people/webmeisters.zh-cn.html">简体中文</a> [zh-cn]</li>
-<!-- Chinese (Traditional) -->
-<li><a
href="/people/webmeisters.zh-tw.html">繁體中文</a> [zh-tw]</li>
-</ul>
-</div>
</div>
</body>
</html>
