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

[Karl Berry]

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

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

Log message:
        start to merge README.html and README.webmastering.html

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/README.html?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/README.webmastering.html?cvsroot=www&r1=1.87&r2=1.88

Patches:
Index: README.html
===================================================================
RCS file: /web/www/www/server/standards/README.html,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- README.html 12 Mar 2009 17:10:01 -0000      1.54
+++ README.html 9 Nov 2009 17:11:49 -0000       1.55
@@ -15,6 +15,10 @@
 </a>
 <hr />
 
+Please see <a
+href="README.webmastering.html">README.webmastering.html</a> instead of
+this file.  Merge in progress.  -karl, nov09.
+
 <h3>Table of Contents</h3>
 
 <ul>
@@ -57,11 +61,6 @@
 <li><a id="TOC15" href="README.html#SEC15">Adding FTP mirrors</a></li>
 <li><a id="TOC16" href="README.html#SEC16">Audio and video files</a></li>
 <li><a id="TOC17" href="README.html#SEC17">Adding an Event</a></li>
-<li><a id="TOC18" href="README.html#SEC18">Creating Pages under
-    www.gnu.org/software</a></li>
-<li>
-  <a name="TOC20" href="README.html#SEC20">Updating ThankGNU pages</a>
-</li>
 </ul>
 
 <hr />
@@ -652,71 +651,6 @@
 responsibility for the event and remove it when it has passed.
 </p>
 
-<h4>
-  <a id="SEC18" href="README.html#TOC18">Creating Pages under
-  www.gnu.org/software</A>
-</H4>
-
-<p>
-Usually a package's maintainer(s) take care of their own web pages.
-Here are some tips, though (maybe for maintainers themselves).
-</p>
-
-<ul>
-  <li><strong>Style guidelines</strong><br />
-  Please read
-      <a href="/server/fsf-html-style-sheet.html">
-      http://www.gnu.org/server/fsf-html-style-sheet.html</a>
-  before writing any HTML for www.gnu.org
-  </li>
-  <li>
-    <strong>Content</strong><br /> When writing a page for a certain
-    program, we want to have some basic information on such a page.
-    See the <a href="boilerplate.html">boilerplate</a>.
-    <ul>    
-      <li>A description on what the program does
-      <li>Where to download the program in question
-      <li>Where to report bugs
-      <li>List of FAQs and documentation if they are available
-    </ul>
-    For example, we think the FAQ ought to be included in the web
-    pages for the program.  Installation instructions would be nice,
-    though not essential.  And we would like to put the program's
-    documentation or manual in the web pages too.
-  </li>
-  <li>
-    Documentation should be available online.  For
-    info about a script to do generate many formats
-    from Texinfo, and other information too, see the 
-    <a href="http://www.gnu.org/prep/maintain/html_node/Web-Pages.html";>
-    maintainer information</a>.
-  </li>
-</ul>  
-   
-<h4>
-  <a id="SEC20" href="README.html#TOC20">Updating ThankGNU pages</a>
-</h4>
-
-<p>
-  You'll will be seeing tickets in the webmaster queue that have
-  `<strong>ThankGNU</strong>' in the title and originate from
-  `sysadmin at gnu.org'.
-</p>
-
-<p>
-  Each ticket will have a name that needs
-  to be added to appropriate year page under 
-  <a href="http://www.gnu.org/thankgnus/";>
-    http://www.gnu.org/thankgnus/
-  </a>.
-  For e.g. if the ThankGNU corresponds to the year 2006, go to
-  <a href="http://www.gnu.org/thankgnus/2006supporters.html";>
-  http://www.gnu.org/thankgnus/2006supporters.html</a> page. Please
-  add the name there, in the appropriate place based on the amount
-  of the contribution and in the alphabetical ordering, and then
-  resolve the ticket.
-</p>
-
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -757,7 +691,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2009/03/12 17:10:01 $
+$Date: 2009/11/09 17:11:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: README.webmastering.html
===================================================================
RCS file: /web/www/www/server/standards/README.webmastering.html,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- README.webmastering.html    6 Nov 2009 19:23:50 -0000       1.87
+++ README.webmastering.html    9 Nov 2009 17:11:49 -0000       1.88
@@ -6,7 +6,7 @@
 
 <!--#include virtual="/server/banner.html" -->
 
-<h2>Webmastering Guidelines</h2>
+<h2>GNU Webmastering Guidelines</h2>
 
 <h3>Information for new webmasters</h3>
 
@@ -51,23 +51,18 @@
 You should have gotten the subscription information when you joined the
 effort.  Please join that too.</p>
 
-<p>
-There are <a href="readme_index.html">several guides</a>
-for webmasters, one of the most important ones is the
-<a href="/server/fsf-html-style-sheet.html">FSF HTML Style Sheet 
Guidelines</a>.
-</p>
+<p>There are <a href="readme_index.html">several guides</a> for
+webmasters, one of the most important ones is the <a
+href="/server/fsf-html-style-sheet.html">FSF HTML Style Sheet
+Guidelines</a>.</p>
+
+<p>If you find a message to address@hidden that you don't know how
+to handle, it's probably best to ignore the message for a while.
+However, if you noticed that something has been pending for more than a
+few days, it is good to ask the www-discuss list: "Can someone teach me
+how to handle messages like this?"</p>
 
-<p>
-If you find a message to address@hidden that you don't know
-how to handle, it's probably best to ignore the message for
-a while.  However, if you noticed that something
-has been pending for more than a few days, it is good to ask the
-www-discuss list: "Can someone teach me how to handle messages like this?"
-</p>
-
-<p>
-As a general rule, things like this are always okay to do:
-</p>
+<p>As a general rule, things like this are always okay to do:</p>
 
 <ul>
   <li>Fix typos, mis-spellings, broken links, and the like.</li>
@@ -534,6 +529,17 @@
 <li>Anything else not related to webmastering&mdash;including questions about
     FSF opinions, requests for support, and the like&mdash;can be moved to the
     info queue.</li>
+
+<li>If the ticket is about the web pages for a <a
+    href="#gnupackages">specific GNU software package</a>, generally it
+    is best to send it in private email to the maintainers of that
+    package (they are recorded in the file
+    <tt>/gd/gnuorg/maintainers.bypkg</tt> on fencepost), and reply to
+    the OP saying that you did so, resolving the ticket.
+    Exception: for tickets about the GNU libc web pages, point the OP
+    to http://www.gnu.org/software/libc/bugs.html.  That is the best way
+    to get the glibc maintainers' attention.</li>
+
 </ul>
 
 <p>It's nice to notify a queue's watchers when a ticket is moved; RT
@@ -1080,43 +1086,21 @@
     adding an entry to the /server/whatsnew.txt file (see <a href="#polnews" 
>Adding news</a>)</li>
 </ul>
 
-<h4>Uploading Pages for a Software Project</h4>
 
-<p>
-Software maintainers will provide us with pages about their project to
-upload to the site.  This is the common way pages were maintained earlier
-in the site's history.  Now, maintainers can gain CVS write access to a
-/software subdirectory by registering their project with Savannah.
-</p>
+<a id="gnupackages"></a>
+<h4>Web Pages for GNU Software Packages</h4>
 
-<p>
-If the page is new, or updated infrequently, ask the developer if they plan
-to register their project on Savannah (http://savannah.gnu.org/), since
-that will give them direct control over their site.  Point out that, if
-they currently host development elsewhere, they can register as a
-"web-only" project, which will give them nothing more than write access to
-the web page.
-</p>
+<p>GNU software maintainers usually gain CVS write access to their
+/software subdirectory by registering their project with Savannah.  (In
+the past, they provide webmasters with pages about their project to
+upload to the site.)</p>
+
+<p>In general, package maintainer are responsible for their own
+content.  In general, webmasters should not make changes to
+package-specific web pages unless we're asked to.  We do have the
+technical permission to check out any GNU (or non-GNU) web repository
+from savannah and commit changes.</p>
 
-<p>
-If they indicate that they will register with Savannah, you can close the
-ticket; if you would like to upload the content in the interim, you may do
-that.  If they indicate that they do not want to register with Savannah,
-you may want to escalate the ticket to the chief webmaster for further
-action.  We would like to see all software maintainers using Savannah, and
-so are reluctant to allow for new special cases.
-</p>
-
-<p>
-If the page is old and frequently updated this way, check the content
-against our linking policies and style guidelines, and upload it if it
-passes.  If it does not, inform the maintainer of what problems we see with
-it, and ask them if they would be willing to make changes to amend them.
-Note that we're pretty lenient on HTML style guidelines with software
-maintainers, so unless they're using JavaScript, excessive frames,
-browser-specific tags, or something similarly egregious, don't worry about
-those too much.
-</p>
 
 <h4>Adding Translations</h4>
 
@@ -1217,51 +1201,65 @@
 unless you have a specific reason to do so.</p>
 
 
-</div>
+<!-- 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." -->
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<!-- BEGIN copyleft -->
 <div id="footer">
-  <!--
-    this anchor is referred to from the default
-    gendocs_template (available as part of Texinfo) used for
-    generating GNU manuals online, so please don't remove it.
-  -->
-  <p><a name="ContactInfo"></a>
-     Please inquire about GNU by Email:
-     <a href="mailto:address@hidden";>address@hidden</a>,
-     Voice: +1-617-542-5942, or Fax: +1-617-542-2652.
-  </p>
-
-  <p>Please send broken links and other web page suggestions to
-     <a href="/people/webmeisters.html">The GNU Webmasters</a> at
-     <a href="mailto:address@hidden";>address@hidden</a>, Thank you.
-  </p>
-
-  <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006, 2007, 2008, 2009
-     <a href="http://www.fsf.org";>Free Software Foundation</a>, Inc.,
-     51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA<br />
-     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/06 19:23:50 $
-     <!-- timestamp end -->
-  </p>
-  </div>
-  <!-- END copyleft -->
-
-    <div id="translations">
-
-      <h3>Translations of this page</h3>
-
-      <p>There are currently no translations of this page. Can you help out? 
Please review our <a 
href="/server/standards/README.translations.html">translation 
information</a>.</p>
-
-    </div>
-    </div>
-    </body>
-    </html>
-    <!-- END layout -->
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</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:address@hidden";>&lt;address@hidden&gt;</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; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.</p>
+
+<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/09 17: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 address@hidden 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">
+<!-- English -->
+<li><a href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
+</ul>
+</div>
+</div>
+</body>
+</html>