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

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       09/11/19 18:27:35

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

Log message:
        README merge: audio-video

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/README.html?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/README.webmastering.html?cvsroot=www&r1=1.95&r2=1.96

Patches:
Index: README.html
===================================================================
RCS file: /web/www/www/server/standards/README.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- README.html 18 Nov 2009 17:07:54 -0000      1.61
+++ README.html 19 Nov 2009 18:27:24 -0000      1.62
@@ -19,8 +19,6 @@
 href="README.webmastering.html">README.webmastering.html</a> instead of
 this file.  Merge in progress.  -karl, nov09.
 
-<h3>Table of Contents</h3>
-
 <ul>
 <li>
   <a id="TOC7" href="README.html#SEC7">Update the What's New page!</a>
@@ -32,7 +30,6 @@
   <a id="TOC9" href="README.html#SEC9">Update GNUs Flashes on the
   home page http://www.gnu.org/</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>
 </ul>
 
@@ -131,44 +128,6 @@
 </p>
 
 <h4>
-  <a id="SEC16" href="README.html#TOC16">Audio and video files</a>
-</h4>
-
-<p>
-A 22Gb disk partition was allocated to audio and video files on
-the machine audio-video.gnu.org. In order to add new files in
-this repository, one should be registered as a member of the
-<a href="http://savannah.gnu.org/projects/audio-video/";>GNU and
-FSF audio video</a> project.
-</p>
-
-<p>
-Uploading a file can be done using rsync over ssh:
-</p>
-<pre>
-rsync --rsh=ssh file.vob audio-video.gnu.org:/audio-video/video
-</pre>
-
-<p>
-The access methods offered to users are:
-</p>
-
-<ul>
- <li>
-   rsync
-   <pre>
-         rsync -av audio-video.gnu.org::audio-video .
-   </pre>
- </li>
- <li>
-   http
-   <pre>
-         <a href="http://audio-video.gnu.org/";>http://audio-video.gnu.org/</a>
-   </pre>
- </li>
-</ul>
-
-<h4>
   <a id="SEC17" href="README.html#TOC17">Adding an event</a>
 </h4>
 
@@ -259,7 +218,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2009/11/18 17:07:54 $
+$Date: 2009/11/19 18:27:24 $
 <!-- timestamp end -->
 </p>
 </div>

Index: README.webmastering.html
===================================================================
RCS file: /web/www/www/server/standards/README.webmastering.html,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- README.webmastering.html    18 Nov 2009 18:08:57 -0000      1.95
+++ README.webmastering.html    19 Nov 2009 18:27:24 -0000      1.96
@@ -1107,10 +1107,10 @@
 writing any scripts, and also update it as needed.</p>
 
 
-<h4>Checking out the repository</h4>
+<h4>Working with webmaster-related CVS repositories</h4>
 
-<p>To make an initial checkout of our repository, set the environment
-variable CVS_RSH=ssh, and run</p>
+<p><b>Main www repository:</b>To make an initial checkout, set the
+environment variable CVS_RSH=ssh, and run</p>
 
 <pre>
 cvs -d &lt;username&gt;@cvs.savannah.gnu.org:/web/www co www
@@ -1119,16 +1119,25 @@
 <p>You should end up with a directory <tt>www</tt> with the CVS checkout
 of our web site.</p>
 
-<p>Use "cvs add foo" to add a file or directory.  Use "cvs update
--P foo" before you commit a file, and "cvs commit foo" to perform the
-commit.  Changes (except to <a href="#symlinks">.symlinks files</a>)
-should be instantly visible on www.gnu.org.  Use "cvs log foo" to review
-its log history.  For further details on cvs, such as reverting to a
-previous version, or see diff output of particular changes, see the cvs
-documentation.</p>
-
-<p>Many software packages have their own projects on savannah and hence
-their own www/software directory.  If the maintainer needs your help
+<p>CVS cheatsheet: use <tt>cvs add foo</tt> to add a file or directory.
+Use <tt>cvs&nbsp;update&nbsp;-P&nbsp;foo</tt> before you commit a file,
+and <tt>cvs&nbsp;commit&nbsp;foo</tt> to perform the commit.  Changes
+(except to <a href="#symlinks">.symlinks files</a>) should be instantly
+visible on www.gnu.org.  For further details on cvs, such as reverting
+to a previous version, or see diff output of particular changes, see the
+<a href="http://cvs.nongnu.org/";>CVS documentation</a>.</p>
+
+
+<p><b>audio-video repository:</b> Use <tt>audio-video</tt> instead of
+<tt>www</tt> in the author, and you will get the repository
+corresponding to <a
+href="http://audio-video.gnu.org";>audio-video.gnu.org</a>.  Discuss
+any changes to audio-video with address@hidden
+
+
+<p><b>Other packages:</b> Many software packages have their own projects
+on savannah and hence their own web repository corresponding to their
+www/software/fooproject directory.  If the maintainer needs your help
 with one of their web pages, you can get to it like this:</p>
 
 <pre>
@@ -1237,7 +1246,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2009/11/18 18:08:57 $
+$Date: 2009/11/19 18:27:24 $
 <!-- timestamp end -->
 </p>
 </div>