r275 - // /web/deps/dep5/Makefile /web/deps/dep5/copyright-format.xml /web/deps/dep5/index.html
vorlon at users.alioth.debian.org
vorlon at users.alioth.debian.org
Wed Feb 15 21:54:04 UTC 2012
Author: vorlon
Date: Wed Feb 15 21:54:03 2012
New Revision: 275
URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=275
Log:
revert uncoordinated and unapproved changes, resetting to last known-good state.
Modified:
/ (props changed)
web/deps/dep5/Makefile
web/deps/dep5/copyright-format.xml
web/deps/dep5/index.html
Modified: web/deps/dep5/Makefile
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/Makefile?rev=275&op=diff
==============================================================================
--- web/deps/dep5/Makefile (original)
+++ web/deps/dep5/Makefile Wed Feb 15 21:54:03 2012
@@ -17,10 +17,9 @@
DEP: 5\
State: CANDIDATE\
Drivers: Steve Langasek <vorlon at debian.org>\
- Charles Plessy <plessy at debian.org>\
-Date: 2012-02-02\
+Date: 2011-10-10\
URL: http://dep.debian.net/deps/dep5 (this page)\
- http://anonscm.debian.org/viewvc/dep/web/deps/dep5/copyright-format.xml (the source)\
+ http://anonscm.debian.org/loggerhead/dep/dep5/trunk/annotate/head:/dep5/copyright-format.xml (the source)\
License:\
Copying and distribution of this file, with or without modification,\
are permitted in any medium without royalty provided the copyright\
Modified: web/deps/dep5/copyright-format.xml
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/copyright-format.xml?rev=275&op=diff
==============================================================================
--- web/deps/dep5/copyright-format.xml (original)
+++ web/deps/dep5/copyright-format.xml Wed Feb 15 21:54:03 2012
@@ -42,11 +42,8 @@
automatically extract licensing information.
</para>
<para>
- This specification is not part of the Debian Policy, and its use is
- optional.
- </para>
- <para>
- Nothing in this proposal supersedes or modifies any of the
+ This is not a proposal to change the policy in the short term. In
+ particular, nothing in this proposal supersedes or modifies any of the
requirements specified in Debian Policy regarding the appropriate detail
or granularity to use when documenting copyright and license status in
<filename>debian/copyright</filename>.
@@ -81,9 +78,9 @@
no way to know how much of Debian should be stripped from such a system.
</para>
<para>
- Even where licenses are DFSG-free and mutually compatible, users might want
- a way to avoid software with certain licenses, for example if they have a
- problem with the Affero GPL.
+ A user might want to have a way to avoid software with certain licenses
+ they have a problem with, even if the licenses are DFSG-free. For example,
+ the Affero GPL.
</para>
</section>
@@ -127,15 +124,16 @@
paragraph</link>.
</para>
<para>
- There are four types of fields. The definition for each field in this
- document indicates which type of value it takes.
+ The value of each field is of one of the four types listed below. The
+ definition for each field in this document indicates which type of
+ value it takes.
</para>
<section id="single-line">
<title>Single-line values</title>
<para>
- This means that the whole value of a field must fit on a single line.
- For example, the <varname>Format</varname> field
+ A single-line value means that the whole value of a field must fit
+ on a single line. For example, the <varname>Format</varname> field
has a single-line value specifying the version of the
machine-readable format that is used.
</para>
@@ -144,18 +142,19 @@
<section id="white-space-lists">
<title>Whitespace-separated lists</title>
<para>
- This means that the field value may be on one line or many, but values
- in the list are separated by one or more whitespace characters
- (including space, TAB, and newline). For example, the
- <varname>Files</varname> field has a list of filename patterns.
+ A whitespace-separated list means that the field value may be on one
+ line or many, but values in the list are separated by one or more
+ whitespace characters (including space, TAB, and newline). For
+ example, the <varname>Files</varname> field has a list of filename
+ patterns.
</para>
</section>
<section id="line-based-lists">
<title>Line-based lists</title>
<para>
- This means that the field has one value per line. For example,
- <varname>Upstream-Contact</varname> can list contact addresses, one per
+ Another kind of list value has one value per line. For example,
+ <varname>Copyright</varname> can list many copyright statements, one per
line.
</para>
</section>
@@ -165,7 +164,7 @@
<para>
Formatted text fields use the same rules as the long description in a
package's <varname>Description</varname> field, possibly also using the
- first line as a synopsis, just as <varname>Description</varname> uses it
+ first line as a synopsis, like <varname>Description</varname> uses it
for the short description. See Debian Policy's section 5.6.13, <ulink
url="http://www.debian.org/doc/debian-policy/ch-controlfields#s-f-Description"><quote>Description</quote></ulink>,
for details. For example, <varname>Disclaimer</varname> has no special
@@ -181,13 +180,13 @@
is called the <link linkend="header-paragraph">header paragraph</link>.
Every other paragraph is either a <link
linkend="files-paragraph">Files paragraph</link> or a <link
- linkend="stand-alone-license-paragraph">standalone License
+ linkend="stand-alone-license-paragraph">stand-alone License
paragraph</link>. This is similar to source and binary package
paragraphs in <filename>debian/control</filename> files.
</para>
<section id="header-paragraph">
- <title>Header paragraph (once)</title>
+ <title>Header paragraph (Once)</title>
<para>
The following fields may be present in a header paragraph.
</para>
@@ -259,13 +258,12 @@
</section>
<section id="files-paragraph">
- <title>Files paragraph (repeatable)</title>
- <para>
- The declaration of copyright and license for files may consist of one or
+ <title>Files paragraph (Repeatable)</title>
+ <para>
+ The declaration of copyright and license for files is done in one or
more paragraphs. In the simplest case, a single paragraph can be used
- which applies to the whole package. Only the license and copyright
- information required by the Debian archive is required to be listed
- here.
+ which applies to all files and lists all applicable copyrights and
+ licenses.
</para>
<para>
The following fields may be present in a Files paragraph.
@@ -323,17 +321,15 @@
</section>
<section id="stand-alone-license-paragraph">
- <title>Stand-alone License Paragraph (optional, repeatable)</title>
- <para>
- Stand-alone <varname>License</varname> paragraphs can be used to
- provide the full license text for a given license once, instead of
- repeating it in each <varname>Files</varname> paragraph that refers to
- it. The first line of the <varname>License</varname> field must be a
- single license short name or a short name followed by a license
- exception.
- </para>
- <para>
- The following fields may be present in a standalone License
+ <title>Stand-alone License Paragraph (Optional, Repeatable)</title>
+ <para>
+ Where a set of files are dual (tri, etc) licensed, or when the same
+ license occurs multiple times, you can use a single-line
+ <varname>License</varname> field and stand-alone
+ <varname>License</varname> paragraphs to expand the license short names.
+ </para>
+ <para>
+ The following fields may be present in a stand-alone License
paragraph.
</para>
@@ -417,7 +413,7 @@
<section id="source-field">
<title><varname>Source</varname></title>
<para>
- Formatted text, no synopsis: an explanation of where the upstream
+ Formatted text, no synopsis: an explanation from where the upstream
source came from. Typically this would be a URL, but it might be a
free-form explanation. The Debian Policy section <ulink
url="http://www.debian.org/doc/debian-policy/ch-docs#s-copyrightfile">12.5</ulink>
@@ -457,7 +453,7 @@
be different or simplified from a combination of all the per-file
license information. In a Files paragraph, this field gives the
licensing terms for the files listed in the <varname>Files</varname>
- field for this paragraph. In a standalone License paragraph, it
+ field for this paragraph. In a stand-alone License paragraph, it
gives the licensing terms for those paragraphs which reference it.
</para>
<para>
@@ -470,11 +466,12 @@
single copyright file.
</para>
<para>
- If there are no remaining lines, then all of the short names
- or short names followed by license exceptions making up the
- first line must be described in <link
- linkend="stand-alone-license-paragraph">standalone License
- paragraphs</link>. Otherwise, this field should either
+ Remaining lines: if left blank here, the file
+ <emphasis>must</emphasis> include a <link
+ linkend="stand-alone-license-paragraph">stand-alone License
+ paragraph</link> matching each license short
+ name listed on the first line.
+ Otherwise, this field should either
include the full text of the license(s) or include a pointer to the
license file under <filename>/usr/share/common-licenses</filename>.
This field should include all text needed in order to fulfill both
@@ -511,8 +508,8 @@
Copyright 2009 Angela Watts</programlisting>
and file B has:
<programlisting>Copyright 2010 Angela Watts</programlisting>
- then the <varname>Copyright</varname> field for a paragraph covering both
- file A and file B only needs to contain:
+ the <varname>Copyright</varname> field for a stanza covering both
+ file A and file B need contain only:
<programlisting>Copyright 2008 John Smith
Copyright 2009, 2010 Angela Watts</programlisting>
</para>
@@ -591,8 +588,8 @@
paragraph that matches a particular file applies to it.
</para>
<para>
- Exclusions are only supported by adding <varname>Files</varname>
- paragraphs to override the previous match.
+ Exclusions are done by having multiple <varname>Files</varname>
+ paragraphs.
</para>
</section>
@@ -630,7 +627,7 @@
<filename>debian/copyright</filename>, nor any requirements in the
license of the work regarding reproduction of legal notices. This
information must still be included in the <varname>License</varname>
- field, either in a standalone License paragraph or in the relevant
+ field, either in a stand-alone License paragraph or in the relevant
files paragraph.
</para>
<para>
@@ -638,9 +635,9 @@
added, using a dash as a separator. If omitted, the lowest version
number is implied. When the license grant permits using the terms of any
later version of that license, the short name is finished with a plus
- sign. For <link linkend="spdx">SPDX</link> compatibility, versions with trailing
- <emphasis>dot-zeroes</emphasis> are considered to be equivalent to
- versions without (e.g., <quote>2.0.0</quote> is considered equal to
+ sign. For <link linkend="spdx">SPDX</link> compatibility, trailing
+ <emphasis>dot-zeroes</emphasis> are considered to be equal to plainer
+ version (e.g., <quote>2.0.0</quote> is considered equal to
<quote>2.0</quote> and <quote>2</quote>).
</para>
<para>
@@ -973,7 +970,7 @@
matches.
</para>
<para>
- An exception or clarification to a license is signalled in plain text, by appending
+ An exception or clarification to a license is signaled in plain text, by appending
<literal>with <varname><replaceable>keywords</replaceable></varname>
exception</literal> to the short name. This document provides a list of
keywords that must be used when referring to the most frequent
@@ -1080,11 +1077,11 @@
This is a dual-licensed GPL/Artistic work such as Perl:
<programlisting>License: GPL-1+ or Artistic</programlisting>
This is for a file that has both GPL and classic BSD code in it:
-<programlisting>License: GPL-2+ and BSD-3-clause</programlisting>
- For the most complex cases, commas are used to disambiguate.
- The conjunction <quote><literal>and</literal></quote> has priority over
- <quote><literal>or</literal></quote> unless preceded by a comma. For
- instance:
+<programlisting>License: GPL-2+ and BSD</programlisting>
+ For the most complex cases, the comma is used to disambiguate the
+ priority of <literal>or</literal>s and <literal>and</literal>s
+ <literal>and</literal> has the priority over <literal>or</literal>,
+ unless preceded by a comma. For instance:
</para>
<simpara>
<literal>A or B and C</literal> means <literal>A or (B and C)</literal>.
@@ -1095,7 +1092,7 @@
</simpara>
<para>
This is for a file that has Perl code and classic BSD code in it:
-<programlisting>License: GPL-2+ or Artistic-2.0, and BSD-3-clause</programlisting>
+<programlisting>License: GPL-2+ or Artistic-2.0, and BSD</programlisting>
A <literal>GPL-2+</literal> work with the <literal>OpenSSL</literal>
exception is in effect a dual-licensed work that can be redistributed
either under the <literal>GPL-2+</literal>, or under the
Modified: web/deps/dep5/index.html
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/index.html?rev=275&op=diff
==============================================================================
--- web/deps/dep5/index.html (original)
+++ web/deps/dep5/index.html Wed Feb 15 21:54:03 2012
@@ -20,10 +20,9 @@
DEP: 5
State: CANDIDATE
Drivers: Steve Langasek <vorlon at debian.org>
- Charles Plessy <plessy at debian.org>
-Date: 2012-02-02
+Date: 2011-10-10
URL: http://dep.debian.net/deps/dep5 (this page)
- http://anonscm.debian.org/viewvc/dep/web/deps/dep5/copyright-format.xml (the source)
+ http://anonscm.debian.org/loggerhead/dep/dep5/trunk/annotate/head:/dep5/copyright-format.xml (the source)
License:
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -78,13 +77,11 @@
its contents vary tremendously across packages, making it
difficult to automatically extract licensing information.</p>
- <p>This specification is not part of the Debian Policy, and
- its use is optional.</p>
-
- <p>Nothing in this proposal supersedes or modifies any of the
- requirements specified in Debian Policy regarding the
- appropriate detail or granularity to use when documenting
- copyright and license status in <tt class=
+ <p>This is not a proposal to change the policy in the short
+ term. In particular, nothing in this proposal supersedes or
+ modifies any of the requirements specified in Debian Policy
+ regarding the appropriate detail or granularity to use when
+ documenting copyright and license status in <tt class=
"filename">debian/copyright</tt>.</p>
</div>
@@ -119,10 +116,9 @@
software can switch to it and we have no way to know how much
of Debian should be stripped from such a system.</p>
- <p>Even where licenses are DFSG-free and mutually compatible,
- users might want a way to avoid software with certain
- licenses, for example if they have a problem with the Affero
- GPL.</p>
+ <p>A user might want to have a way to avoid software with
+ certain licenses they have a problem with, even if the
+ licenses are DFSG-free. For example, the Affero GPL.</p>
</div>
<div class="section">
@@ -166,9 +162,9 @@
paragraph</a> and one <a href="#files-paragraph">Files
paragraph</a>.</p>
- <p>There are four types of fields. The definition for each
- field in this document indicates which type of value it
- takes.</p>
+ <p>The value of each field is of one of the four types listed
+ below. The definition for each field in this document
+ indicates which type of value it takes.</p>
<div class="section">
<hr>
@@ -176,11 +172,11 @@
<h3 class="section"><a name="single-line" id=
"single-line">Single-line values</a></h3>
- <p>This means that the whole value of a field must fit on a
- single line. For example, the <code class=
- "varname">Format</code> field has a single-line value
- specifying the version of the machine-readable format that
- is used.</p>
+ <p>A single-line value means that the whole value of a
+ field must fit on a single line. For example, the
+ <code class="varname">Format</code> field has a single-line
+ value specifying the version of the machine-readable format
+ that is used.</p>
</div>
<div class="section">
@@ -189,11 +185,12 @@
<h3 class="section"><a name="white-space-lists" id=
"white-space-lists">Whitespace-separated lists</a></h3>
- <p>This means that the field value may be on one line or
- many, but values in the list are separated by one or more
- whitespace characters (including space, TAB, and newline).
- For example, the <code class="varname">Files</code> field
- has a list of filename patterns.</p>
+ <p>A whitespace-separated list means that the field value
+ may be on one line or many, but values in the list are
+ separated by one or more whitespace characters (including
+ space, TAB, and newline). For example, the <code class=
+ "varname">Files</code> field has a list of filename
+ patterns.</p>
</div>
<div class="section">
@@ -202,9 +199,9 @@
<h3 class="section"><a name="line-based-lists" id=
"line-based-lists">Line-based lists</a></h3>
- <p>This means that the field has one value per line. For
- example, <code class="varname">Upstream-Contact</code> can
- list contact addresses, one per line.</p>
+ <p>Another kind of list value has one value per line. For
+ example, <code class="varname">Copyright</code> can list
+ many copyright statements, one per line.</p>
</div>
<div class="section">
@@ -217,7 +214,7 @@
<p>Formatted text fields use the same rules as the long
description in a package's <code class=
"varname">Description</code> field, possibly also using the
- first line as a synopsis, just as <code class=
+ first line as a synopsis, like <code class=
"varname">Description</code> uses it for the short
description. See Debian Policy's section 5.6.13, <a href=
"http://www.debian.org/doc/debian-policy/ch-controlfields#s-f-Description"
@@ -238,7 +235,7 @@
in the file is called the <a href="#header-paragraph">header
paragraph</a>. Every other paragraph is either a <a href=
"#files-paragraph">Files paragraph</a> or a <a href=
- "#stand-alone-license-paragraph">standalone License
+ "#stand-alone-license-paragraph">stand-alone License
paragraph</a>. This is similar to source and binary package
paragraphs in <tt class="filename">debian/control</tt>
files.</p>
@@ -247,7 +244,7 @@
<hr>
<h3 class="section"><a name="header-paragraph" id=
- "header-paragraph">Header paragraph (once)</a></h3>
+ "header-paragraph">Header paragraph (Once)</a></h3>
<p>The following fields may be present in a header
paragraph.</p>
@@ -325,14 +322,12 @@
<hr>
<h3 class="section"><a name="files-paragraph" id=
- "files-paragraph">Files paragraph (repeatable)</a></h3>
-
- <p>The declaration of copyright and license for files may
- consist of one or more paragraphs. In the simplest case, a
- single paragraph can be used which applies to the whole
- package. Only the license and copyright information
- required by the Debian archive is required to be listed
- here.</p>
+ "files-paragraph">Files paragraph (Repeatable)</a></h3>
+
+ <p>The declaration of copyright and license for files is
+ done in one or more paragraphs. In the simplest case, a
+ single paragraph can be used which applies to all files and
+ lists all applicable copyrights and licenses.</p>
<p>The following fields may be present in a Files
paragraph.</p>
@@ -395,18 +390,15 @@
<h3 class="section"><a name="stand-alone-license-paragraph"
id="stand-alone-license-paragraph">Stand-alone License
- Paragraph (optional, repeatable)</a></h3>
-
- <p>Stand-alone <code class="varname">License</code>
- paragraphs can be used to provide the full license text for
- a given license once, instead of repeating it in each
- <code class="varname">Files</code> paragraph that refers to
- it. The first line of the <code class=
- "varname">License</code> field must be a single license
- short name or a short name followed by a license
- exception.</p>
-
- <p>The following fields may be present in a standalone
+ Paragraph (Optional, Repeatable)</a></h3>
+
+ <p>Where a set of files are dual (tri, etc) licensed, or
+ when the same license occurs multiple times, you can use a
+ single-line <code class="varname">License</code> field and
+ stand-alone <code class="varname">License</code> paragraphs
+ to expand the license short names.</p>
+
+ <p>The following fields may be present in a stand-alone
License paragraph.</p>
<ul>
@@ -420,7 +412,7 @@
</ul>
<div class="example">
- <a name="AEN142" id="AEN142"></a>
+ <a name="AEN140" id="AEN140"></a>
<p><b>Example 1. tri-licensed files</b></p>
<pre class="programlisting">
@@ -441,7 +433,7 @@
</div>
<div class="example">
- <a name="AEN145" id="AEN145"></a>
+ <a name="AEN143" id="AEN143"></a>
<p><b>Example 2. recurrent license</b></p>
<pre class="programlisting">
@@ -510,10 +502,10 @@
<h3 class="section"><a name="source-field" id=
"source-field"><code class="varname">Source</code></a></h3>
- <p>Formatted text, no synopsis: an explanation of where the
- upstream source came from. Typically this would be a URL,
- but it might be a free-form explanation. The Debian Policy
- section <a href=
+ <p>Formatted text, no synopsis: an explanation from where
+ the upstream source came from. Typically this would be a
+ URL, but it might be a free-form explanation. The Debian
+ Policy section <a href=
"http://www.debian.org/doc/debian-policy/ch-docs#s-copyrightfile"
target="_top">12.5</a> requires this information unless
there are no upstream sources, which is mainly the case for
@@ -564,7 +556,7 @@
combination of all the per-file license information. In a
Files paragraph, this field gives the licensing terms for
the files listed in the <code class="varname">Files</code>
- field for this paragraph. In a standalone License
+ field for this paragraph. In a stand-alone License
paragraph, it gives the licensing terms for those
paragraphs which reference it.</p>
@@ -577,11 +569,12 @@
arbitrary names are only guaranteed to be unique within a
single copyright file.</p>
- <p>If there are no remaining lines, then all of the short
- names or short names followed by license exceptions making
- up the first line must be described in <a href=
- "#stand-alone-license-paragraph">standalone License
- paragraphs</a>. Otherwise, this field should either include
+ <p>Remaining lines: if left blank here, the file
+ <span class="emphasis"><i class="emphasis">must</i></span>
+ include a <a href=
+ "#stand-alone-license-paragraph">stand-alone License
+ paragraph</a> matching each license short name listed on
+ the first line. Otherwise, this field should either include
the full text of the license(s) or include a pointer to the
license file under <tt class=
"filename">/usr/share/common-licenses</tt>. This field
@@ -626,8 +619,8 @@
</pre>and file B has:
<pre class="programlisting">
Copyright 2010 Angela Watts
-</pre>then the <code class="varname">Copyright</code> field for a
-paragraph covering both file A and file B only needs to contain:
+</pre>the <code class="varname">Copyright</code> field for a stanza
+covering both file A and file B need contain only:
<pre class="programlisting">
Copyright 2008 John Smith
Copyright 2009, 2010 Angela Watts
@@ -683,7 +676,7 @@
</ul>
<div class="informaltable">
- <a name="AEN225" id="AEN225"></a>
+ <a name="AEN224" id="AEN224"></a>
<table border="1" class="CALSTABLE">
<col>
@@ -724,9 +717,8 @@
are allowed. The last paragraph that matches a particular
file applies to it.</p>
- <p>Exclusions are only supported by adding <code class=
- "varname">Files</code> paragraphs to override the previous
- match.</p>
+ <p>Exclusions are done by having multiple <code class=
+ "varname">Files</code> paragraphs.</p>
</div>
</div>
@@ -770,7 +762,7 @@
requirements in the license of the work regarding
reproduction of legal notices. This information must still
be included in the <code class="varname">License</code>
- field, either in a standalone License paragraph or in the
+ field, either in a stand-alone License paragraph or in the
relevant files paragraph.</p>
<p>For licenses which have multiple versions in use, the
@@ -778,10 +770,10 @@
omitted, the lowest version number is implied. When the
license grant permits using the terms of any later version
of that license, the short name is finished with a plus
- sign. For <a href="#spdx">SPDX</a> compatibility, versions
- with trailing <span class="emphasis"><i class=
- "emphasis">dot-zeroes</i></span> are considered to be
- equivalent to versions without (e.g., <span class=
+ sign. For <a href="#spdx">SPDX</a> compatibility, trailing
+ <span class="emphasis"><i class=
+ "emphasis">dot-zeroes</i></span> are considered to be equal
+ to plainer version (e.g., <span class=
"QUOTE">"2.0.0"</span> is considered equal to <span class=
"QUOTE">"2.0"</span> and <span class=
"QUOTE">"2"</span>).</p>
@@ -791,7 +783,7 @@
"_top">SPDX Open Source License Registry</a>.</p>
<div class="informaltable">
- <a name="AEN270" id="AEN270"></a>
+ <a name="AEN269" id="AEN269"></a>
<table border="1" class="CALSTABLE">
<col>
@@ -1120,7 +1112,7 @@
target="_top">many versions of the MIT license</a>. Please
use Expat instead, when it matches.</p>
- <p>An exception or clarification to a license is signalled
+ <p>An exception or clarification to a license is signaled
in plain text, by appending <tt class="literal">with
<code class="varname"><tt class=
"replaceable"><i>keywords</i></tt></code> exception</tt> to
@@ -1247,12 +1239,12 @@
</pre>This is for a file that has both GPL and classic BSD code in
it:
<pre class="programlisting">
-License: GPL-2+ and BSD-3-clause
-</pre>For the most complex cases, commas are used to disambiguate.
-The conjunction <span class="QUOTE">"<tt class=
-"literal">and</tt>"</span> has priority over <span class="QUOTE">
- "<tt class="literal">or</tt>"</span> unless preceded by a
- comma. For instance:
+License: GPL-2+ and BSD
+</pre>For the most complex cases, the comma is used to disambiguate
+the priority of <tt class="literal">or</tt>s and <tt class=
+"literal">and</tt>s <tt class="literal">and</tt> has the priority
+over <tt class="literal">or</tt>, unless preceded by a comma. For
+instance:
<p><tt class="literal">A or B and C</tt> means <tt class=
"literal">A or (B and C)</tt>.</p>
@@ -1263,7 +1255,7 @@
<p>This is for a file that has Perl code and classic BSD
code in it:</p>
<pre class="programlisting">
-License: GPL-2+ or Artistic-2.0, and BSD-3-clause
+License: GPL-2+ or Artistic-2.0, and BSD
</pre>A <tt class="literal">GPL-2+</tt> work with the
<tt class="literal">OpenSSL</tt> exception is in effect a
dual-licensed work that can be redistributed either under
@@ -1333,7 +1325,7 @@
"examples">Examples</a></h2>
<div class="example">
- <a name="AEN499" id="AEN499"></a>
+ <a name="AEN498" id="AEN498"></a>
<p><b>Example 3. Simple</b></p>
@@ -1378,7 +1370,7 @@
</div>
<div class="example">
- <a name="AEN506" id="AEN506"></a>
+ <a name="AEN505" id="AEN505"></a>
<p><b>Example 4. Complex</b></p>
More information about the dep-commits
mailing list