aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Carlavilla Delgado <carlavilla@FreeBSD.org>2020-03-01 12:23:40 +0000
committerSergio Carlavilla Delgado <carlavilla@FreeBSD.org>2020-03-01 12:23:40 +0000
commitd11c97874354a903c53f478bf12137ebea532f3f (patch)
tree90500ea762bbe1c0a467c04a5ce7f8a09938a0d0
parent6a410a8bbfc17711c9c6189f262fe747b2845b7a (diff)
downloaddoc-d11c978743.tar.gz
doc-d11c978743.zip
Fixes a few things in the bsdl-gpl article:
inconsistency regarding AT&T at the beginning of the text, which later becomes ATT: I choosed to always use AT&T; style improvement: change "adds additional" into "adds more"; change "Addenda" into "Bibliographical References", since that is what is in the section; fix typos. Submitted by: salvadore@ Reviewed by: carlavilla@ Approved by: bcr@(mentor) Differential Revision: https://reviews.freebsd.org/D23588
Notes
Notes: svn path=/head/; revision=53942
-rw-r--r--en_US.ISO8859-1/articles/bsdl-gpl/article.xml32
1 files changed, 16 insertions, 16 deletions
diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
index 5e19b37022..acf35dd6ab 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
@@ -97,19 +97,19 @@
under what became known as <quote>the BSD license</quote>. A customer purchased
Unix from AT&amp;T and then ordered a BSD tape from UCB.</para>
- <para>In the mid-1980s a government anti-trust case against ATT
- ended with the break-up of ATT. ATT still owned Unix and was now
- able to sell it. ATT embarked on an aggressive licensing effort
- and most commercial Unixes of the day became ATT-derived.</para>
-
- <para>In the early 1990's ATT sued UCB over license violations
- related to BSD. UCB discovered that ATT had incorporated, without
- acknowledgment or payment, many improvements due to BSD into ATT's
- products, and a lengthy court case, primarily between ATT and UCB,
+ <para>In the mid-1980s a government anti-trust case against AT&amp;T
+ ended with the break-up of AT&amp;T. AT&amp;T still owned Unix and was now
+ able to sell it. AT&amp;T embarked on an aggressive licensing effort
+ and most commercial Unixes of the day became AT&amp;T-derived.</para>
+
+ <para>In the early 1990's AT&amp;T sued UCB over license violations
+ related to BSD. UCB discovered that AT&amp;T had incorporated, without
+ acknowledgment or payment, many improvements due to BSD into AT&amp;T's
+ products, and a lengthy court case, primarily between AT&amp;T and UCB,
ensued. During this period some UCB programmers embarked on a
- project to rewrite any ATT code associated with BSD. This project
+ project to rewrite any AT&amp;T code associated with BSD. This project
resulted in a system called BSD 4.4-lite (lite because it was not
- a complete system; it lacked 6 key ATT files).</para>
+ a complete system; it lacked 6 key AT&amp;T files).</para>
<para>A lengthy series of articles published slightly later in
Dr. Dobbs magazine described a BSD-derived 386 PC version of Unix,
@@ -118,7 +118,7 @@
William Jolitz. It became the original basis of all the PC BSDs in
use today.</para>
- <para>In the mid 1990s, Novell purchased ATT's Unix rights and a
+ <para>In the mid 1990s, Novell purchased AT&amp;T's Unix rights and a
(then secret) agreement was reached to terminate the lawsuit. UCB
soon terminated its support for BSD.</para>
</sect1>
@@ -238,7 +238,7 @@
the <link xlink:href="http://www.opensource.org/licenses/lgpl-license.php">LGPL</link>
("Library", since renamed to "Lesser", GPL). The LGPL allows
proprietary code to be linked to the GNU C library, glibc. You do
- not have to release the source to code which has been dynamically
+ not have to release the source code which has been dynamically
linked to an LGPLed library.</para>
<para>If you statically link an application with glibc, such as is
@@ -462,7 +462,7 @@
<listitem><para>In many cases, the long-term results of a BSD
style license more accurately reflect the goals proclaimed in
- the research charter of universities then what occurs when
+ the research charter of universities than what occurs when
results are copyrighted or patented and subject to proprietary
university licensing. Anecdotal evidence exists that
universities are financially better rewarded in the long run by
@@ -491,7 +491,7 @@
used, the resulting software will usually devolve to whoever
actually makes the majority of the engineering changes and most
understands the state of the system. The GPL simply adds
- additional legal friction to the result.</para></listitem>
+ more legal friction to the result.</para></listitem>
<listitem><para>Large companies, in which Open Source code is
developed, should be aware that programmers appreciate Open Source
@@ -544,7 +544,7 @@
</sect1>
<sect1 xml:id="addenda">
- <title>Addenda</title>
+ <title>Bibliographical References</title>
<programlisting>
[1] http://www.gnu.org/licenses/gpl.html