From: Russ Allbery Date: Wed, 6 Apr 2011 07:41:31 +0000 (-0700) Subject: Whitespace cleanup of copyright-format document X-Git-Url: https://git.donarmstrong.com/?p=debian%2Fdebian-policy.git;a=commitdiff_plain;h=295a6af2cee486f565d5cede631d4b2aadb78b0f Whitespace cleanup of copyright-format document --- diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml index a62da99..b9599d3 100644 --- a/copyright-format/copyright-format.xml +++ b/copyright-format/copyright-format.xml @@ -36,7 +36,7 @@ - +
Introduction @@ -54,7 +54,7 @@ debian/copyright.
- +
Rationale @@ -104,7 +104,7 @@ Lars Wirzenius.
- +
File syntax @@ -126,7 +126,7 @@ There are four kinds values for fields. Each field specifies which kind is allowed. - +
Single-line values @@ -136,7 +136,7 @@ that is used.
- +
White space separated lists @@ -146,7 +146,7 @@ Filesfield has a list of filename patterns.
- +
Line based lists @@ -155,7 +155,7 @@ line.
- +
Text formatted like package long descriptions @@ -169,7 +169,7 @@
- +
Paragraphs @@ -180,7 +180,7 @@ license paragraph. This is similar to source and binary package paragraphs in debian/control files. - +
Header paragraph (Once)
@@ -190,14 +190,14 @@ http://www.debian.org/doc/copyright-format/1.0
- +
<varname>Upstream-Name</varname> Optional single line: the name upstream uses for the software
- +
<varname>Upstream-Contact</varname> @@ -206,7 +206,7 @@ usually be written as a list of RFC5322 addresses or URIs.
- +
<varname>Source</varname> @@ -220,7 +220,7 @@ in this field.
- +
<varname>Disclaimer</varname> @@ -229,7 +229,7 @@ url="http://www.debian.org/doc/debian-policy/ch-docs#s-copyrightfile">12.5)
- +
<varname>Comment</varname> @@ -241,7 +241,7 @@ version is not.
- +
<varname>License</varname> @@ -253,7 +253,7 @@ linkend="files-paragraph">Files paragraph section.
- + - +
Example header paragraph Format: <VERSIONED_FORMAT_URL> @@ -286,7 +286,7 @@ Upstream-Contact: John Doe <john.doe@example.com> Source: http://www.example.com/software/project
- +
Files paragraph (Repeatable) @@ -295,7 +295,7 @@ Source: http://www.example.com/software/project which applies to all files and lists all applicable copyrights and licenses. - +
<varname>Files</varname> @@ -366,7 +366,7 @@ Source: http://www.example.com/software/project paragraphs.
- + - +
<varname>Comment</varname> @@ -439,7 +439,7 @@ Copyright 2009, 2010 Angela Watts Comment field in the header paragraph.
- +
Example files paragraphs Files: * @@ -467,7 +467,7 @@ License: GPL-2+
- +
Standalone License Paragraph (Optional, Repeatable) @@ -492,7 +492,7 @@ License: GPL-2 License: LGPL-2.1 LICENSE TEXT] - + recurrent license Files: src/js/editline/* @@ -512,7 +512,7 @@ License: MPL-1.1
License specification - +
Short name @@ -523,7 +523,7 @@ License: MPL-1.1 License field. - These short names have the specified meanings across all uses of this + These short names have the specified meanings across all uses of this file format, and must not be used to refer to any other licenses. Parsers may thus rely on these short names referring to the same licenses wherever they occur, without needing to parse or @@ -582,7 +582,7 @@ License: MPL-1.1 Apache - Apache license + Apache license 1.0, 2.0. @@ -592,7 +592,7 @@ License: MPL-1.1 Artistic - Artistic license + Artistic license 1.0, 2.0. @@ -933,7 +933,7 @@ so, delete this exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - +
Public domain @@ -962,7 +962,7 @@ also delete it here.
- +
Syntax @@ -1011,12 +1011,12 @@ also delete it here. version. . In addition, as a special exception, the author of this - program gives permission to link the code of its + program gives permission to link the code of its release with the OpenSSL project's "OpenSSL" library (or with modified versions of it that use the same license as the "OpenSSL" library), and distribute the linked - executables. You must obey the GNU General Public - License in all respects for all of the code used other + executables. You must obey the GNU General Public + License in all respects for all of the code used other than "OpenSSL". If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, @@ -1170,7 +1170,7 @@ License: GPL-2+
- +
Appendix: Note about the use of this format in Debian