Patchwork [wwwdocs] Shorten and fix cvs.html

login
register
mail settings
Submitter Gerald Pfeifer
Date Jan. 5, 2011, 8:40 a.m.
Message ID <alpine.LNX.2.00.1101050938330.4999@gerinyyl.fvgr>
Download mbox | patch
Permalink /patch/77576/
State New
Headers show

Comments

Gerald Pfeifer - Jan. 5, 2011, 8:40 a.m.
As I had promised to Mingjie in December, this shortens shortens
cvs.html and makes it more specific to the web pages only.

(This will also make it easier to merge things again when we move
this away from CVS finally.)

Installed.

Gerald
Mingjie Xing - Jan. 5, 2011, 9:24 a.m.
2011/1/5 Gerald Pfeifer <gerald@pfeifer.com>:
> As I had promised to Mingjie in December, this shortens shortens
> cvs.html and makes it more specific to the web pages only.
>
> (This will also make it easier to merge things again when we move
> this away from CVS finally.)
>
> Installed.
>

Great!

Thanks,
Mingjie

Patch

Index: cvs.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/cvs.html,v
retrieving revision 1.216
diff -u -r1.216 cvs.html
--- cvs.html	31 Dec 2010 12:06:20 -0000	1.216
+++ cvs.html	5 Jan 2011 08:36:55 -0000
@@ -7,24 +7,17 @@ 
 </head>
 
 <body>
-<h1>GCC: CVS access to the GCC web pages</h1>
-
-<p>Note: the GCC sources are maintained in <a href="svn.html">our SVN
-repository</a> now.</p>
-
-<a name="wwwdocs" />
-<p>Our web pages and related scripts are available to the public at large
-via our CVS source repository.</p>
-
-<p>In addition, you can browse the CVS history <a
-href="http://gcc.gnu.org/cgi-bin/cvsweb.cgi/wwwdocs/">gcc.gnu.org</a>
-using cvsweb.</p>
+<h1>GCC: CVS access to our web pages</h1>
 
+<p>Our web pages and related scripts are available via our CVS
+repository.  You can also <a
+href="http://gcc.gnu.org/cgi-bin/cvsweb.cgi/wwwdocs/">browse them
+online</a> using cvsweb.</p>
 
 <h2>Using the CVS repository</h2>
 
 <p>Assuming you have both CVS 
-and SSH installed, you can check out the GCC sources as follows:</p>
+and SSH installed, you can check out the web pages as follows:</p>
 
 <ol type="i">
  <li>Set CVS_RSH in your environment to <code>ssh</code>.</li>
@@ -33,8 +26,7 @@ 
      Alternately add 
      <code>-d :pserver:cvs@gcc.gnu.org:/cvs/gcc</code>
      immediately after <code>cvs</code> in the commands below.</li>
- <li>The command <code>cvs -qz9 checkout -P wwwdocs</code>, 
-     will check out the web.</li>
+ <li><code>cvs -qz9 checkout -P wwwdocs</code></li>
 </ol>
 
 <p>Patches should be marked with the tag [wwwdocs] in the subject line.</p>
@@ -42,9 +34,8 @@ 
 <hr />
 <h2><a name="write">Read-write CVS access</a></h2>
 
-<p>Check out the GCC sources by setting
-<code>CVS_RSH</code> in your environment to "<code>ssh</code>" and issuing
-the command</p>
+<p>Check out things by setting environment variables as above and
+and issuing the command</p>
 
 <blockquote><p><code>
 cvs -z 9 -d :ext:<i>username</i>@gcc.gnu.org:/cvs/gcc co wwwdocs
@@ -64,9 +55,8 @@ 
 
 <p>In all the commands listed below, you can give an explicit list of
 filenames to the cvs command.  We recommend you list files explicitly
-when performing checkins to avoid accidental checkins and prefer that
-each CVS checkin be of a complete, single logical change, which may
-affect multiple files.</p>
+to avoid accidental checkins and prefer that each checkin be of a
+complete, single logical change, which may affect multiple files.</p>
 
 <ol>
 <li>Sync your sources with the master repository via "<code>cvs
@@ -84,11 +74,8 @@ 
 the editor window to appear and enter the log message in the editor
 window.</li>
 
-<li>After exiting the editor, CVS will connect to the GCC cvs server
-and check in your changes.  When your prompt returns the checkin is
-finished.  A message will be sent to the gcc-cvs-wwwdocs mailing
-list indicating that a change was made.  CVS will provide a message if
-an error occurs and it will not check in any files.</li>
+<li>Upon successfull checkin a message will be sent to the
+gcc-cvs-wwwdocs mailing list.</li>
 </ol>
 
 <hr />