aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa@rosenzweig.io>2017-04-30 01:55:40 +0000
committerGogs <gogitservice@gmail.com>2017-04-30 01:55:40 +0000
commit736c6f5bdbed7e539cf9b4f2fb0ed807b53d3492 (patch)
tree8a55c20aeed61bc2808f46efb9912efa8c2b005d /www
parent399dc58cc336072181425405e3ff33ddc16774dd (diff)
parent1c590deb5a372e6c68ed808b6a7f222e937d74c7 (diff)
downloadlibrebootfr-736c6f5bdbed7e539cf9b4f2fb0ed807b53d3492.tar.gz
librebootfr-736c6f5bdbed7e539cf9b4f2fb0ed807b53d3492.zip
Merge branch 'gnu/docs/adopt-gfdl-license' of libreboot/libreboot into master
Diffstat (limited to 'www')
-rw-r--r--www/license.md15
-rwxr-xr-xwww/publish.sh16
2 files changed, 11 insertions, 20 deletions
diff --git a/www/license.md b/www/license.md
index eecf1c2f..d70a4733 100644
--- a/www/license.md
+++ b/www/license.md
@@ -1,17 +1,4 @@
-Website:
-
-Copyright 2015-2017 Leah Rowe <info@minifree.org> \
-Copyright 2017 Alyssa Rosenzweig <alyssa@rosenzweig.io>
-
-This document is released under the Creative Commons Attribution-ShareAlike 4.0
-International Public License and all future versions. A copy of the license
-can be found at "cc-by-sa-4.txt".
-
-This document is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See cc-by-sa-4.txt for more information.
-
-Template:
+Pandoc template used on the Libreboot website:
Copyright (c) 2014--2017, John MacFarlane
diff --git a/www/publish.sh b/www/publish.sh
index 7b1dacef..55b6660a 100755
--- a/www/publish.sh
+++ b/www/publish.sh
@@ -38,12 +38,16 @@ if [ "${FILE}" != "./index" ]; then
OPTS="--css /headerleft.css -T Libreboot"
fi
-echo "" >> temp.md
-printf "[License](/license.md) --\n" >> temp.md
-printf "[Authors](/contrib.md) --\n" >> temp.md
-printf "[Conduct Guidelines](/conduct.md) --\n" >> temp.md
-printf "[Management Guidelines](/management.md) --\n" >> temp.md
-printf "[Peers Community](https://peers.community/) \n" >> temp.md
+
+if [ "${FILE}" != "./docs/fdl-1.3" ] && [ "${FILE}" != "./conduct" ]; then
+ echo "" >> temp.md
+ printf "[License](/docs/fdl-1.3.md) --\n" >> temp.md
+ printf "[Template](/license.md) --\n" >> temp.md
+ printf "[Authors](/contrib.md) --\n" >> temp.md
+ printf "[Conduct Guidelines](/conduct.md) --\n" >> temp.md
+ printf "[Management Guidelines](/management.md) --\n" >> temp.md
+ printf "[Peers Community](https://peers.community/) \n" >> temp.md
+fi
# change out .md -> .html
sed temp.md -i -e 's/\.md\(#[a-z\-]*\)*)/.html\1)/g'