From 96b397ae50bee5c08a23420fc76c48871dc62aab Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 25 Aug 2011 14:02:07 +0000
Subject: [PATCH] - Replace addenda with footnotes so that additional
references appear near the related section
PR: docs/131684
Submitted by: Fabian Ruch <fabianruch@bsdgroup.de>
---
.../articles/linux-comparison/article.sgml | 79 +++++++++++--------
1 file changed, 45 insertions(+), 34 deletions(-)
diff --git a/en_US.ISO8859-1/articles/linux-comparison/article.sgml b/en_US.ISO8859-1/articles/linux-comparison/article.sgml
index 1ef6a433cb..fc448cbbf5 100644
--- a/en_US.ISO8859-1/articles/linux-comparison/article.sgml
+++ b/en_US.ISO8859-1/articles/linux-comparison/article.sgml
@@ -99,7 +99,15 @@ Copyright (c) 2005 Dru Lavigne
<para>&os; is a complete operating system (kernel and
userland) with a well-respected heritage grounded in the
- roots of Unix development.[1] Since both the kernel and the
+ roots of Unix development.
+
+ <footnote>
+ <para>See also <ulink
+ url="http://www.oreilly.com/catalog/opensources/book/kirkmck.html"></ulink>
+ for a brief history.</para>
+ </footnote>
+
+ Since both the kernel and the
provided utilities are under the control of the same release
engineering team, there is less likelihood of library
incompatibilities. Security vulnerabilities can also be
@@ -145,7 +153,15 @@ Copyright (c) 2005 Dru Lavigne
restrictions on the distribution of GPLd code. In contrast,
the BSD license places no such restrictions, which gives you
the flexibility of keeping the code Open Source or closing
- the code for a proprietary commercial product.[2] Having
+ the code for a proprietary commercial product.
+
+ <footnote>
+ <para>For a fairly unbiased view of the merits of each
+ license, see <ulink
+ url="http://en.wikipedia.org/wiki/BSD_and_GPL_licensing"></ulink>.</para>
+ </footnote>
+
+ Having
stable and reliable code under the attractive BSD license
means that many operating systems, such as <ulink url="http://developer.apple.com/darwin/projects/darwin/faq.html">Apple OS X</ulink>
are based on FreeBSD code. It also means that if you choose
@@ -192,7 +208,15 @@ Copyright (c) 2005 Dru Lavigne
operating system! It supports the X Window System, the same
one used in &linux; distributions to provide a desktop user
interface. It also supports over 13,000 easy to install
- third-party applications,[3] including KDE, Gnome, and
+ third-party applications,
+
+ <footnote>
+ <para>Using <ulink url="&url.base;/ports">FreeBSD's ports
+ collection</ulink>: software installation is as easy as
+ <command>pkg_add -r application_name</command>.</para>
+ </footnote>
+
+ including KDE, Gnome, and
OpenOffice.</para>
<para>Several projects are available to ease the installation of
@@ -483,14 +507,30 @@ Release
and Unix skillsets to FreeBSD administration.</para></listitem>
<listitem><para>In-house developers have full access to all
- FreeBSD code[4] for all releases going back to the original
+ FreeBSD code
+
+ <footnote>
+ <para>In addition, all code is browsable through a
+ web-interface: <ulink
+ url="http://www.FreeBSD.org/cgi/cvsweb.cgi/"></ulink>.</para>
+ </footnote>
+
+ for all releases going back to the original
&os; release. Included with the code are all of the log
messages which provide context to changes and
bug fixes. Additionally, a developer can easily replicate any
release by simply checking out the code with the desired
label. In contrast, &linux; traditionally didn't follow this
model, but has recently adopted a more mature development
- model. [5]</para></listitem>
+ model.
+
+ <footnote>
+ <para>An interesting overview of the evolving Linux
+ development model can be found at <ulink
+ url="http://linuxdevices.com/articles/AT4155251624.html"></ulink>.</para>
+ </footnote>
+
+ </para></listitem>
<listitem><para>In-house developers also have full access to
FreeBSD's <ulink
@@ -516,33 +556,4 @@ Release
in their existing infrastructure, &os; is an excellent choice
indeed.</para>
</sect1>
-
- <sect1 id="freebsd-addenda">
- <title>Addenda</title>
-
- <orderedlist>
-
- <listitem><para>See also <ulink
- url="http://www.oreilly.com/catalog/opensources/book/kirkmck.html"></ulink>
- for a brief history.</para></listitem>
-
- <listitem><para>For a fairly unbiased view of the merits of each
- license, see <ulink
- url="http://en.wikipedia.org/wiki/BSD_and_GPL_licensing"></ulink>.</para></listitem>
-
- <listitem><para>Using <ulink
- url="&url.base;/ports">FreeBSD's ports
- collection</ulink>: software installation is as easy as
- <command>pkg_add -r application_name</command>.</para></listitem>
-
- <listitem><para>In addition, all code is browsable through a
- web-interface: <ulink
- url="http://www.FreeBSD.org/cgi/cvsweb.cgi/"></ulink>.</para></listitem>
-
- <listitem><para>An interesting overview of the evolving Linux
- development model can be found at <ulink
- url="http://linuxdevices.com/articles/AT4155251624.html"></ulink>.</para></listitem>
-
- </orderedlist>
- </sect1>
</article>