Merge branch 'develop' into gh-pages

* develop: v3.2.76 Align wording with specberus expectations
w3c · Sep 29, 2015 · d3d5ea7 · d3d5ea7
2 parents f881e19 + 3df9ca1
commit d3d5ea7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/builds/respec-w3c-common-3.2.76.js b/builds/respec-w3c-common-3.2.76.js
diff --git a/builds/respec-w3c-common.js b/builds/respec-w3c-common.js
diff --git a/js/w3c/templates/headers.html b/js/w3c/templates/headers.html
@@ -163,7 +163,7 @@ <h2>{{#if prependW3C}}W3C {{/if}}{{textStatus}} <time {{#if doRDFa}}property="dc
           <a rel="license" href='http://www.w3.org/Consortium/Legal/2013/copyright-documents-dual.html'>document use</a>
         {{else}}
           {{#if isW3CSoftAndDocLicense}}
-            <a rel="license" href='http://www.w3.org/Consortium/Legal/2015/copyright-software-and-document'>document + software use</a>
+            <a rel="license" href='http://www.w3.org/Consortium/Legal/2015/copyright-software-and-document'>permissive document license</a>
           {{else}}
             <a rel="license" href='http://www.w3.org/Consortium/Legal/copyright-documents'>document use</a>
           {{/if}}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "respec",
-    "version": "3.2.75",
+    "version": "3.2.76",
     "description": "Specification Edition Support Tool.",
     "main": "index.js",
     "directories": {