View | Details | Raw Unified | Return to bug 71712 | Differences between
and this patch

Collapse All | Expand All

(-)article.sgml (-8 / +14 lines)
Lines 21-26 Link Here
21
21
22
    <legalnotice id="trademarks" role="trademarks">
22
    <legalnotice id="trademarks" role="trademarks">
23
      &tm-attrib.freebsd;
23
      &tm-attrib.freebsd;
24
      &tm-attrib.amd;
24
      &tm-attrib.apple;
25
      &tm-attrib.apple;
25
      &tm-attrib.linux;
26
      &tm-attrib.linux;
26
      &tm-attrib.opengroup;
27
      &tm-attrib.opengroup;
Lines 39-46 Link Here
39
	world's network connected machines run Linux.  14.6% run BSD &unix;.
40
	world's network connected machines run Linux.  14.6% run BSD &unix;.
40
	Some of the world's largest web operations, such as <ulink
41
	Some of the world's largest web operations, such as <ulink
41
          url="http://www.yahoo.com/">Yahoo!</ulink>, run BSD.  The world's
42
          url="http://www.yahoo.com/">Yahoo!</ulink>, run BSD.  The world's
42
	busiest FTP server, <ulink
43
	busiest FTP server of 1999 (now defunct), <ulink
43
          url="ftp://ftp.cdrom.com/">ftp.cdrom.com</ulink>, uses BSD to
44
          url="ftp://ftp.cdrom.com/">ftp.cdrom.com</ulink>, used BSD to
44
	transfer 1.4 TB of data a day.    Clearly this is not a niche
45
	transfer 1.4 TB of data a day.    Clearly this is not a niche
45
	market: BSD is a well-kept secret.</para>
46
	market: BSD is a well-kept secret.</para>
46
47
Lines 93-100 Link Here
93
	<para>The X Window system, which handles graphical display.</para>
94
	<para>The X Window system, which handles graphical display.</para>
94
95
95
	<para>The X Window system used in most versions of BSD is maintained
96
	<para>The X Window system used in most versions of BSD is maintained
96
	  by a separate project, the
97
	  by one of two separate projects, either the
97
	  <ulink url="http://www.XFree86.org/">&xfree86; project</ulink>.
98
	  <ulink url="http://www.XFree86.org/">&xfree86; project</ulink> or the
99
	  <ulink url="http://www.X.org/">X.Org project</ulink>.
98
	  This is the same code as Linux uses.  BSD does not normally
100
	  This is the same code as Linux uses.  BSD does not normally
99
	  specify a <quote>graphical desktop</quote> such as GNOME or KDE,
101
	  specify a <quote>graphical desktop</quote> such as GNOME or KDE,
100
	  though these are available.</para>
102
	  though these are available.</para>
Lines 246-252 Link Here
246
      <para>No one person or corporation owns BSD. It is created and
248
      <para>No one person or corporation owns BSD. It is created and
247
	distributed by a community of highly technical and committed
249
	distributed by a community of highly technical and committed
248
	contributors all over the world. Some of the components of BSD are
250
	contributors all over the world. Some of the components of BSD are
249
	Open Source projects managed by a different project maintainer.</para>
251
	Open Source projects in their own right and managed by different
252
	project maintainers.</para>
250
    </sect2>
253
    </sect2>
251
254
252
    <sect2>
255
    <sect2>
Lines 255-261 Link Here
255
      <para>The BSD kernels are developed and updated following the Open
258
      <para>The BSD kernels are developed and updated following the Open
256
	Source development model.  Each project maintains a publicly
259
	Source development model.  Each project maintains a publicly
257
	accessible <emphasis>source tree</emphasis> under the
260
	accessible <emphasis>source tree</emphasis> under the
258
	<ulink url="http://www.sourcegear.com/CVS/">Concurrent Versions
261
	<ulink url="http://www.cvshome.org/">Concurrent Versions
259
	  System</ulink> (CVS), which contains all source files for the
262
	  System</ulink> (CVS), which contains all source files for the
260
	project, including documentation and other incidental files.  CVS
263
	project, including documentation and other incidental files.  CVS
261
	allows users to <quote>check out</quote> (in other words, to
264
	allows users to <quote>check out</quote> (in other words, to
Lines 312-318 Link Here
312
      <orderedlist>
315
      <orderedlist>
313
	<listitem>
316
	<listitem>
314
	  <para>No one person controls the content of the system.  In
317
	  <para>No one person controls the content of the system.  In
315
	    practice, this difference is overrated, since the Chief Architect
318
	    practice, this difference is overrated, since the Principal Architect
316
	    can require that code be backed out, and even in the Linux project
319
	    can require that code be backed out, and even in the Linux project
317
	    several people are permitted to make changes.</para>
320
	    several people are permitted to make changes.</para>
318
	</listitem>
321
	</listitem>
Lines 411-417 Link Here
411
	<listitem>
414
	<listitem>
412
	  <para>FreeBSD aims for high performance and ease of use by
415
	  <para>FreeBSD aims for high performance and ease of use by
413
	    end users, and is a favourite of web content providers.  It runs
416
	    end users, and is a favourite of web content providers.  It runs
414
	    on PCs and Compaq's Alpha processors.  The FreeBSD project has
417
	    on a number of platforms, including i386 based systems (<quote>PCs</quote>),
418
	    systems based on the AMD 64-bit processors, &ultrasparc; based systems,
419
	    systems based on Compaq's Alpha processors and systems based around
420
	    the NEC PC-98 specification.  The FreeBSD project has
415
	    significantly more users than the other projects.</para>
421
	    significantly more users than the other projects.</para>
416
	</listitem>
422
	</listitem>

Return to bug 71712