Merge branch 'master' into bugfix/nested-enums-not-visible

Contributing.md

@@ -8,7 +8,7 @@ This project adheres to the Adobe [code of conduct](CODE_OF_CONDUCT.md). By part
 
 ## Contributor License Agreement
 
-All third-party contributions to this project must be accompanied by a signed contributor license. This gives Adobe permission to redistribute your contributions as part of the project. Sign our CLA at [http://opensource.adobe.com/cla.html](http://opensource.adobe.com/cla.html). You only need to submit an Adobe CLA one time, so if you have submitted one previously, you are probably good to go!
+All third-party contributions to this project must be accompanied by a signed contributor license. This gives Adobe permission to redistribute your contributions as part of the project. [Sign our CLA](http://opensource.adobe.com/cla.html)! You only need to submit an Adobe CLA one time, so if you have submitted one previously, you are good to go!
 
 ## Things to Keep in Mind
 

lib/readmeWriter.js

@@ -15,7 +15,7 @@ var validUrl = require('valid-url');
 
 function relativePath(full, base) {
   if (full.indexOf(base)===0) {
-    return full.substr(base.length).replace(/\.schema\.json$/, '');
+    return full.substr(base.length).replace(/\.json$/, '');
   } else {
     return full;
   }

templates/md/readme.ejs

@@ -10,6 +10,8 @@
 
 <% _.forIn(groups, (schemas, group) => { %>
 ## <%= group %>
-<% _.forEach(_.sortBy(schemas, [o => { return o.title }]), schema => { %>
-* [<%= schema.title %>](.<%= schema.relative %>.schema.md) – `<%= schema.id %>` (<%= schema.status %>)<% }); %>
+<%
+ const reJson = /\.json$/;
+ _.forEach(_.sortBy(schemas, [o => { return o.title }]), schema => { %>
+* [<%= schema.title %>](.<%= schema.relative.replace(reJson, '') %>.md) – `<%= schema.id %>` (<%= schema.status %>)<% }); %>
 <% }); %>