r209 - /web/deps/dep5.mdwn

[plessy at users.alioth.debian.org]

Author: plessy
Date: Mon Nov 28 23:30:56 2011
New Revision: 209

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=209
Log:
Sync with http://anonscm.debian.org/gitweb/?p=dbnpolicy/policy.git;a=blob;f=copyright-format/copyright-format.xml;hb=21b04a5dd8f510f167198836d0e8c0acd3d17b3f

This implements r208 in the DocBook source.

Modified:
    web/deps/dep5.mdwn

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=209&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Mon Nov 28 23:30:56 2011
@@ -6,7 +6,7 @@
     Drivers: Steve Langasek <vorlon at debian.org>
     Date: 2011-10-10
     URL: http://dep.debian.net/deps/dep5 (this page)
-         http://anonscm.debian.org/gitweb/?p=dbnpolicy/policy.git;a=blob;f=copyright-format/copyright-format.xml;hb=b4d036bab75ac794c3500563768d60ad994ae4f1 (the source)
+         http://anonscm.debian.org/gitweb/?p=dbnpolicy/policy.git;a=blob;f=copyright-format/copyright-format.xml;hb=21b04a5dd8f510f167198836d0e8c0acd3d17b3f (the source)
     License:
      Copying and distribution of this file, with or without modification,
      are permitted in any medium without royalty provided the copyright
@@ -1037,24 +1037,23 @@
         use Expat instead, when it matches.</p>
 
         <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>keyword</i></tt></code> exception</tt> to
+        in plain text, by appending <tt class="literal">with
+        <code class="varname"><tt class=
+        "replaceable"><i>keywords</i></tt></code> exception</tt> to
         the short name. This document provides a list of keywords
         that must be used when referring to the most frequent
-        exceptions.  When exceptions other than these are in effect
+        exceptions. When exceptions other than these are in effect
         that modify a common license by granting additional
         permissions, you may use an arbitrary keyword not taken
-        from the below list of keywords.  When a license differs
+        from the below list of keywords. When a license differs
         from a common license because of added restrictions rather
         than because of added permissions, a distinct short name
-        should be used instead of <tt class="literal">with <code
-        class="varname"><tt class=
-        "replaceable"><i>keyword</i></tt></code> exception</tt>.
-        </p>
+        should be used instead of <tt class="literal">with
+        <code class="varname"><tt class=
+        "replaceable"><i>keywords</i></tt></code>exception</tt>.</p>
 
         <p>Only one exception may be specified for each license
-        within a given license specification.  If more than one
+        within a given license specification. If more than one
         exception applies to a single license, an arbitrary short
         name must be used instead.</p>
 
@@ -1249,7 +1248,7 @@
       "examples">Examples</a></h2>
 
       <div class="example">
-        <a name="AEN462" id="AEN462"></a>
+        <a name="AEN466" id="AEN466"></a>
 
         <p><b>Example 3. Simple</b></p>
 
@@ -1294,7 +1293,7 @@
       </div>
 
       <div class="example">
-        <a name="AEN469" id="AEN469"></a>
+        <a name="AEN473" id="AEN473"></a>
 
         <p><b>Example 4. Complex</b></p>