r235 - in /web/deps: ./ dep5/copyright-format.xml dep5/index.html
vorlon at users.alioth.debian.org
vorlon at users.alioth.debian.org
Wed Dec 14 07:39:16 UTC 2011
Author: vorlon
Date: Wed Dec 14 07:39:16 2011
New Revision: 235
URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=235
Log:
Consistent spelling of our terms:
- line based -> line-based
- standalone -> stand-alone
- single line -> single-line
Consistent links when talking about paragraphs (always include "paragraph"
as part of the link name)
Modified:
web/deps/ (props changed)
web/deps/dep5/copyright-format.xml
web/deps/dep5/index.html
Modified: web/deps/dep5/copyright-format.xml
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/copyright-format.xml?rev=235&op=diff
==============================================================================
--- web/deps/dep5/copyright-format.xml (original)
+++ web/deps/dep5/copyright-format.xml Wed Dec 14 07:39:16 2011
@@ -151,7 +151,7 @@
</section>
<section id="line-based-lists">
- <title>Line based lists</title>
+ <title>Line-based lists</title>
<para>
Another kind of list value has one value per line. For example,
<varname>Copyright</varname> can list many copyright statements, one per
@@ -179,10 +179,10 @@
There are three kinds of paragraphs. The first paragraph in the file
is called the <link linkend="header-paragraph">header paragraph</link>.
Every other paragraph is either a <link
- linkend="files-paragraph">Files</link> paragraph or a <link
- linkend="stand-alone-license-paragraph">stand-alone license</link>
- paragraph. This is similar to source and binary package paragraphs in
- <filename>debian/control</filename> files.
+ linkend="files-paragraph">Files paragraph</link> or a <link
+ 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">
@@ -321,15 +321,15 @@
</section>
<section id="stand-alone-license-paragraph">
- <title>Standalone License Paragraph (Optional, Repeatable)</title>
+ <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 standalone
+ 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 standalone license
+ The following fields may be present in a stand-alone license
paragraph.
</para>
@@ -470,7 +470,7 @@
<emphasis>must</emphasis> include a stand-alone
<varname>License</varname> paragraph matching each license short
name listed on the first line (see the <link
- linkend="stand-alone-license-paragraph">Standalone License
+ linkend="stand-alone-license-paragraph">Stand-alone License
Paragraph</link> section). 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>.
Modified: web/deps/dep5/index.html
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/index.html?rev=235&op=diff
==============================================================================
--- web/deps/dep5/index.html (original)
+++ web/deps/dep5/index.html Wed Dec 14 07:39:16 2011
@@ -197,7 +197,7 @@
<hr>
<h3 class="section"><a name="line-based-lists" id=
- "line-based-lists">Line based lists</a></h3>
+ "line-based-lists">Line-based lists</a></h3>
<p>Another kind of list value has one value per line. For
example, <code class="varname">Copyright</code> can list
@@ -234,9 +234,9 @@
<p>There are three kinds of paragraphs. The first paragraph
in the file is called the <a href="#header-paragraph">header
paragraph</a>. Every other paragraph is either a <a href=
- "#files-paragraph">Files</a> paragraph or a <a href=
- "#stand-alone-license-paragraph">stand-alone license</a>
- paragraph. This is similar to source and binary package
+ "#files-paragraph">Files paragraph</a> or a <a href=
+ "#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>
@@ -389,16 +389,16 @@
<hr>
<h3 class="section"><a name="stand-alone-license-paragraph"
- id="stand-alone-license-paragraph">Standalone License
+ id="stand-alone-license-paragraph">Stand-alone License
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
- standalone <code class="varname">License</code> paragraphs
+ 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 standalone
+ <p>The following fields may be present in a stand-alone
license paragraph.</p>
<ul>
@@ -574,7 +574,7 @@
include a stand-alone <code class="varname">License</code>
paragraph matching each license short name listed on the
first line (see the <a href=
- "#stand-alone-license-paragraph">Standalone License
+ "#stand-alone-license-paragraph">Stand-alone License
Paragraph</a> section). Otherwise, this field should either
include the full text of the license(s) or include a
pointer to the license file under <tt class=
More information about the dep-commits
mailing list