r25 - in /web: ./ deps/dep5.mdwn

[vorlon at users.alioth.debian.org]

Author: vorlon
Date: Thu Mar 19 18:32:29 2009
New Revision: 25

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=25
Log:
partial proofreading

Modified:
    web/   (props changed)
    web/deps/dep5.mdwn

Propchange: web/
------------------------------------------------------------------------------
--- bzr:revision-id:v4 (original)
+++ bzr:revision-id:v4 Thu Mar 19 18:32:29 2009
@@ -3,3 +3,4 @@
 16 vorlon at debian.org-20090319053056-edqc5akh7sbyrdhq
 17 vorlon at debian.org-20090319071405-8j3mqxmv8hjywcqh
 18 vorlon at debian.org-20090319074758-rdfjw6qngcltzv8n
+21 vorlon at debian.org-20090319183222-ictvflsq2pstu25w

Propchange: web/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Thu Mar 19 18:32:29 2009
@@ -1,4 +1,4 @@
-timestamp: 2009-03-19 00:47:58.700000048 -0700
+timestamp: 2009-03-19 11:32:22.842999935 -0700
 committer: Steve Langasek <vorlon at debian.org>
 properties: 
 	branch-nick: web

Propchange: web/
------------------------------------------------------------------------------
--- bzr:text-parents (original)
+++ bzr:text-parents Thu Mar 19 18:32:29 2009
@@ -1,1 +1,1 @@
-deps/dep5.mdwn	vorlon at debian.org-20090319053056-edqc5akh7sbyrdhq
+deps/dep5.mdwn	vorlon at debian.org-20090319074758-rdfjw6qngcltzv8n

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=25&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Thu Mar 19 18:32:29 2009
@@ -68,12 +68,11 @@
    * Suggested format: URI of the format specification, such as:
      * http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
      * Note that the unwieldy length of the URL should be solved in 
-future by hosting the specification at a shorter URL (including
+future by hosting the specification at a shorter URL (including the
 specification version).
      * Currently (2008-07-25) this field can trigger a lintian warning
-about excessive line length; an exception for the
-`Format-Specification` line is pending in
-[bug 491302](http://bugs.debian.org/491302).
+about excessive line length; an exception for the `Format-Specification`
+line is pending in [bug 491302](http://bugs.debian.org/491302).
 
  * name of the software as spelled upstream
    * only once
@@ -194,9 +193,11 @@
 	Copyright: Copyright 1993, John Doe
 	Copyright: Copyright 1993, Joe Average
 	License: MPL-1.1
+
 	Files: src/js/fdlibm/*
 	Copyright: Copyright 1993, J-Random Comporation
 	License: MPL-1.1
+
 	License: MPL-1.1
 	 [LICENSE TEXT]
 
@@ -209,10 +210,13 @@
 
 	Files: *
 	License: Perl
+
 	License-Alias: Perl
 	Licenses: GPL-2+ | Artistic-2.0
+
 	License: GPL-2+
 	 [LICENSE TEXT]
+
 	License: Artistic-2.0
 	 [LICENSE TEXT]
 
@@ -247,11 +251,11 @@
 
 The command for find from the first example would be:
 
-	find . -path "*/Makefile.am -o -name "*.py"
+	find . -path "*/Makefile.am" -o -name "*.py"
 
 It is quite common for a work to have files with copyright held by
-different parties and received under different licenses. To allow this,
-**multiple stanzas are allowed with different `Files`
+different parties and received under different licenses. To accomodate
+this, **multiple stanzas are allowed with different `Files`
 declarations**.
 
 However it makes for easier reading if the copyright file lists the
@@ -270,10 +274,12 @@
 	Copyright: Copyright 2003-2005, John Doe <jdoe at xample.com>
 	License: [the main work's license]
 	 [LICENSE TEXT]
+
 	Files: getopt.*
 	Copyright: Copyright 2000, The Corporation Foundation, Inc.
 	License: BSD-C2
 	 [LICENSE TEXT]
+
 	Files: debian/*
 	Copyright: Copyright [years], [the debian package copyright holder]
 	License: [the debian package license]