X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=copyright-format%2Fcopyright-format.xml;h=e854c2a1464c842bcbb3262847607b5697d02503;hb=0808200988a182be172f20818a9274dab0d40a7f;hp=4c18c3ba27b7cde71eeb28fcd48ba2f04ec98239;hpb=09ffcbdb7f52ad3ff036fdc6569777b88954446d;p=debian%2Fdebian-policy.git
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index 4c18c3b..e854c2a 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -580,8 +580,8 @@ License: MPL-1.1
Apache license
- 1.0,
- 2.0.
+ 1.0,
+ 2.0.
@@ -710,9 +710,8 @@ License: MPL-1.1
CC0
- Creative Commons Universal
- waiver.
+ Creative Commons Zero 1.0 Universal
+ 1.0.
@@ -720,8 +719,8 @@ License: MPL-1.1
CDDL
- Common Development
- and Distribution License.
+ Common Development and Distribution License
+ 1.0.
@@ -772,7 +771,6 @@ License: MPL-1.1
2.1,
3.0, or
GNU Library General Public License
- 1.0,
2.0.
@@ -781,8 +779,8 @@ License: MPL-1.1
GFDL
- GNU Free
- Documentation License.
+ GNU Free Documentation License 1.0, or
+ 1.1.
@@ -827,12 +825,13 @@ License: MPL-1.1
- Python-CNRI
+ Python
- Python
- license.
+ Python license
+ 2.0.
+
@@ -869,8 +868,8 @@ License: MPL-1.1
Zope
- Zope Public License
- 1.0,
+ Zope Public License 1.0,
+ 1.1,
2.0,
2.1.