From 25285169bde517cd9c7d84c4ae0a708185223a71 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Mon, 26 Jul 2021 18:02:56 -0500 Subject: [PATCH] renamed NPL to NVPL and NPL-NA to NVPL-NA --- Makefile | 12 ++++++------ README.md | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 1e4c052..e740d93 100644 --- a/Makefile +++ b/Makefile @@ -3,17 +3,17 @@ all: clean cnpl npl cnpl-na npl-na cnpl: xml ed -d "/article/info" template.xml | pandoc -f docbook -t markdown -s -o cnpl.md -npl: - xml ed -d "/article/info" template.xml | xml ed -d "*/*/*[@role='restriction-cooperative']" | pandoc -f docbook -t markdown -s -o npl.md +nvpl: + xml ed -d "/article/info" template.xml | xml ed -d "*/*/*[@role='restriction-cooperative']" | pandoc -f docbook -t markdown -s -o nvpl.md cnpl-na: xml ed -d "/article/info" template.xml | xml ed -d "*/*/*[@role='restriction-attribution']" | pandoc -f docbook -t markdown -s -o cnpl-na.md -npl-na: - xml ed -d "/article/info" template.xml | xml ed -d "*/*/*[@role='restriction-attribution']" | xml ed -d "*/*/*[@role='restriction-cooperative']" | pandoc -f docbook -t markdown -s -o npl-na.md +nvpl-na: + xml ed -d "/article/info" template.xml | xml ed -d "*/*/*[@role='restriction-attribution']" | xml ed -d "*/*/*[@role='restriction-cooperative']" | pandoc -f docbook -t markdown -s -o nvpl-na.md clean: - rm -rf npl.md + rm -rf nvpl.md rm -rf cnpl.md rm -rf cnpl-na.md - rm -rf npl-na.md + rm -rf nvpl-na.md diff --git a/README.md b/README.md index 0a47ca2..7d29856 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ The Nonviolent Public License builder project provides 4 licenses generated from a common template. -- NPL - Nonviolent Public License +- NVPL - Nonviolent Public License - CNPL - Cooperative Nonviolent Public License -- NPL-NA - Nonviolent Public License No Attributions +- NVPL-NA - Nonviolent Public License No Attributions - CNPL-NA - Cooperative Nonviolent Public License No Attributions The text of the licenses are all in this repository each in its own .md (markdown) file above. You don't have to download and use the builder unless you are contributing. @@ -34,7 +34,7 @@ Use this license header (for the CNPL) in your source files if you want: - Only make or propose edits to the license text in **template.xml** - Changes that are not common among license have some special formatting requirements. Check the output of `make` to ensure everything is removed from the licenses it does not apply to. - If a change only applies to the CNPL or CNPL-NA use the "restriction-cooperative" role attribute - - If a change only applies to the CNPL or NPL (or in other words, it has to do with requiring attributions) use the "restriction-attribution" role attribute. + - If a change only applies to the CNPL or NVPL (or in other words, it has to do with requiring attributions) use the "restriction-attribution" role attribute. - When in doubt, make a bug report and I will be glad to help! ## Dependencies: