Attachment 46772 Details for Bug 71712 – file.diff

[patch] file.diff

file.diff (text/plain), 3.58 KB, created by Gavin Atkinson on 2004-09-13 23:40:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gavin Atkinson

Created: 2004-09-13 23:40:29 UTC

Size: 3.58 KB

patch

obsolete

>Index: article.sgml
>===================================================================
>RCS file: /usr/cvs/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml,v
>retrieving revision 1.14
>diff -u -r1.14 article.sgml
>--- article.sgml	31 Aug 2004 06:51:40 -0000	1.14
>+++ article.sgml	13 Sep 2004 22:18:23 -0000
>@@ -21,6 +21,7 @@
> 
>     <legalnotice id="trademarks" role="trademarks">
>       &tm-attrib.freebsd;
>+      &tm-attrib.amd;
>       &tm-attrib.apple;
>       &tm-attrib.linux;
>       &tm-attrib.opengroup;
>@@ -39,8 +40,8 @@
> 	world's network connected machines run Linux.  14.6% run BSD &unix;.
> 	Some of the world's largest web operations, such as <ulink
>           url="http://www.yahoo.com/">Yahoo!</ulink>, run BSD.  The world's
>-	busiest FTP server, <ulink
>-          url="ftp://ftp.cdrom.com/">ftp.cdrom.com</ulink>, uses BSD to
>+	busiest FTP server of 1999 (now defunct), <ulink
>+          url="ftp://ftp.cdrom.com/">ftp.cdrom.com</ulink>, used BSD to
> 	transfer 1.4 TB of data a day.    Clearly this is not a niche
> 	market: BSD is a well-kept secret.</para>
> 
>@@ -93,8 +94,9 @@
> 	<para>The X Window system, which handles graphical display.</para>
> 
> 	<para>The X Window system used in most versions of BSD is maintained
>-	  by a separate project, the
>-	  <ulink url="http://www.XFree86.org/">&xfree86; project</ulink>.
>+	  by one of two separate projects, either the
>+	  <ulink url="http://www.XFree86.org/">&xfree86; project</ulink> or the
>+	  <ulink url="http://www.X.org/">X.Org project</ulink>.
> 	  This is the same code as Linux uses.  BSD does not normally
> 	  specify a <quote>graphical desktop</quote> such as GNOME or KDE,
> 	  though these are available.</para>
>@@ -246,7 +248,8 @@
>       <para>No one person or corporation owns BSD. It is created and
> 	distributed by a community of highly technical and committed
> 	contributors all over the world. Some of the components of BSD are
>-	Open Source projects managed by a different project maintainer.</para>
>+	Open Source projects in their own right and managed by different
>+	project maintainers.</para>
>     </sect2>
> 
>     <sect2>
>@@ -255,7 +258,7 @@
>       <para>The BSD kernels are developed and updated following the Open
> 	Source development model.  Each project maintains a publicly
> 	accessible <emphasis>source tree</emphasis> under the
>-	<ulink url="http://www.sourcegear.com/CVS/">Concurrent Versions
>+	<ulink url="http://www.cvshome.org/">Concurrent Versions
> 	  System</ulink> (CVS), which contains all source files for the
> 	project, including documentation and other incidental files.  CVS
> 	allows users to <quote>check out</quote> (in other words, to
>@@ -312,7 +315,7 @@
>       <orderedlist>
> 	<listitem>
> 	  <para>No one person controls the content of the system.  In
>-	    practice, this difference is overrated, since the Chief Architect
>+	    practice, this difference is overrated, since the Principal Architect
> 	    can require that code be backed out, and even in the Linux project
> 	    several people are permitted to make changes.</para>
> 	</listitem>
>@@ -411,7 +414,10 @@
> 	<listitem>
> 	  <para>FreeBSD aims for high performance and ease of use by
> 	    end users, and is a favourite of web content providers.  It runs
>-	    on PCs and Compaq's Alpha processors.  The FreeBSD project has
>+	    on a number of platforms, including i386 based systems (<quote>PCs</quote>),
>+	    systems based on the AMD 64-bit processors, &ultrasparc; based systems,
>+	    systems based on Compaq's Alpha processors and systems based around
>+	    the NEC PC-98 specification.  The FreeBSD project has
> 	    significantly more users than the other projects.</para>
> 	</listitem>

Actions: View | Diff

Attachments on bug 71712: 46771 | 46772