www/server/standards README.html README.webmast...

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       09/11/22 17:55:57

Modified files:
        server/standards: README.html README.webmastering.html 

Log message:
        finish merge: events are on fsf.org now

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/README.html?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/README.webmastering.html?cvsroot=www&r1=1.98&r2=1.99

Patches:
Index: README.html
===================================================================
RCS file: /web/www/www/server/standards/README.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- README.html 21 Nov 2009 17:48:53 -0000      1.64
+++ README.html 22 Nov 2009 17:55:11 -0000      1.65
@@ -1,149 +1 @@
-<!--#include virtual="/server/header.html" -->
-<title>
-  GNU Webmaster Guidelines - GNU Project - Free Software Foundation
-</title>
-<!--#include virtual="/server/banner.html" -->
-<h2>GNU Webmaster Guidelines</h2>
-
-<!-- when you replace this graphics, make sure you change the link
-     to also point to the correct html page.  If you make a new
-     graphics for this page, make sure it has a corresponding
-     entry in /graphics/graphics.html                     -->
-<a href="/graphics/atypinggnu.html">
-  <img src="/graphics/gnu-type-sm.jpg"
-       alt=" [image of the typing GNU] "
-</a>
-<hr />
-
-Please see <a
-href="README.webmastering.html">README.webmastering.html</a> instead of
-this file.  Merge in progress.  -karl, nov09.
-
-<ul>
-<li><a id="TOC17" href="README.html#SEC17">Adding an Event</a></li>
-</ul>
-
-<hr />
-
-<h4>
-  <a id="SEC17" href="README.html#TOC17">Adding an event</a>
-</h4>
-
-<p>
-For now, edit the 
-<a href="/events.tmp.html"><code>/events.tmp.html</code></a> file.
-When replication works again, follow the instructions below.
-</p>
-
-<p>
-Webmasters should not usually add and remove events to our 
-<a href="/events.html">events page</a>, they should only update
-the <code>events.input-html</code> file for formatting changes,
-etc.  The actual addition and removal of events is handled by
-<code>fp:/gd/gnuorg/EventAndTravelInfo/announce-events.plx</code>
-and <code>gnudist:~www/bin/auto-event-handle</code>.
-</p>
- 
-<p>
-However, from time to time, the webmasters might get an email to
-add an event in error.  There are two types of events webmasters
-might get:
-</p>
- 
-<ul>
-  <li>
-    Events of a type that
-    <code>fp:/gd/gnuorg/EventAndTravelInfo/announce-events.plx</code>
-    can already handle.  Check the POD of the script itself
-    for information on whom to forward messages to.  The short
-    version: you should normally forward a message to the person
-    who is speaking, except in the case of RMS---those go to 
-    <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-  </li>
-  <li>
-    Events of a type that are not supported yet.  In that case,
-    you should always ask webmaster-escalate.
-  </li> 
-</ul>
-
-<p>
-In a pinch, someone from the FSF staff might ask the
-webmasters to add an event in a hurry.  In these cases, you
-can, if you want, figure out how to edit the relevant file in
-<code>fp:/gd/gnuorg/EventAndTravelInfo/</code>.  If you can't figure
-that out, you can add the event to <code>events.input-html</code>
-above the AUTO section.  However, if you do the latter, please take
-responsibility for the event and remove it when it has passed.
-</p>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
-<div id="footer">
-
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></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:address@hidden";>
-  <em>address@hidden</em>
-</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>
-Copyright &copy; 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-Free Software Foundation, Inc.,
-</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
-<p>
-Verbatim copying and distribution of this entire article are
-permitted worldwide, without royalty, in any medium, provided this
-notice, and the copyright notice, are preserved.
-</p>
-
-<p>
-Updated:
-<!-- timestamp start -->
-$Date: 2009/11/21 17:48:53 $
-<!-- 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 German. -->
-<!-- If you add a new language here, please -->
-<!-- advise address@hidden 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, add an alias -->
-<!--  to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please check you have the 2 letter language code right, cf. -->
-<!-- <URL:http://www.w3.org/WAI/ER/IG/ert/iso639.htm> -->
-<!-- Please use W3C normative character entities. -->
-
-<ul class="translations-list">
-<!-- English -->
-<li>
-  <a href="/server/standards/boilerplate.html">English</a>&nbsp;[en]
-</li>
-</ul>
-</div>
-</div>
-</body>
-</html>
+<meta http-equiv="refresh" content="0; url=README.webmastering.html">

Index: README.webmastering.html
===================================================================
RCS file: /web/www/www/server/standards/README.webmastering.html,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- README.webmastering.html    21 Nov 2009 17:48:53 -0000      1.98
+++ README.webmastering.html    22 Nov 2009 17:55:12 -0000      1.99
@@ -1033,45 +1033,29 @@
 
 <h4>Deleting translations</h4>
 
-<p>
-Here and there you might find a translated page which is actually a copy of
-the original page (i.e., not a translation at all), or translations which
-seem like they should not exist in their current form for whatever reason.
-In such a case the best thing to do is to ask the relevant translation team
-for the reasons they put the page there (please, make sure to CC
address@hidden on such cases). They might have reasons you are not aware
-of. In case you do not get <b>within two weeks</b> a satisfactory reason for
-the page to be left alone, you can handle it as you see fit.
-</p>
-
-<h4>Adding an event to the events page</h4>
-
-<p>
-Sometimes we will be asked to add an event to the events page.  If the
-request is not urgent, redirect such requests to the person who would
-normally manage the given event.  If RMS is to appear at the event, that
-person is address@hidden; otherwise, it's the speaker themselves.
-</p>
-
-<p>If the request is urgent, and the request is coming from FSF staff, you can
-add the event to /events/events.input-html, above the AUTO
-section. However, if you do so, please take responsibility for the event
-and remove it when it has passed.</p>
-
+<p>Here and there you might find a translated page which is actually a
+copy of the original page (i.e., not a translation at all), or
+translations which seem like they should not exist in their current form
+for whatever reason.  In such a case the best thing to do is to ask the
+relevant translation team for the reasons they put the page there
+(please, make sure to CC address@hidden on such cases). They
+might have reasons you are not aware of. In case you do not get
+<b>within two weeks</b> a satisfactory reason for the page to be left
+alone, you can handle it as you see fit.</p>
 
 <h4>Requests for permission to use an image</h4>
 
-<p>When someone emails requesting permission to use an 
-image from the Art section of the site, the first thing to do is to check the
-web page that the image is on. Most of the images have a clear license on the
+<p>When someone emails requesting permission to use an image from the
+Art section of the site, the first thing to do is to check the web page
+that the image is on. Most of the images have a clear license on the
 page with them. If the permission being requested are reasonable but are 
-incompatible with that license, forward the requestor to Brett. Otherwise 
-draw their attention to the license.</p>
+incompatible with that license, forward the ticket to the licensing
+queue. Otherwise draw their attention to the license.</p>
 
-<p>If the web page with the image on does not have a clear license and the 
-request is a clear-cut "yes" or "no", respond to the requestor directly and
-explain the decision with reference to GNU policy. For more difficult cases
-forward them to Brett.</p> 
+<p>If the web page with the image on does not have a clear license and
+the request is a clear-cut "yes" or "no", respond to the requestor
+directly and explain the decision with reference to GNU policy.  For
+more difficult cases forward to licensing.</p>
 
 <p>When considering a request, err on the side of caution. If the use of
 an image isn't something we'd link to, for example, then it isn't
@@ -1225,7 +1209,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2009/11/21 17:48:53 $
+$Date: 2009/11/22 17:55:12 $
 <!-- timestamp end -->
 </p>
 </div>