Almost direct copy of the code licensing policy

[wiki.git] / doc.mdwn

diff --git a/doc.mdwn b/doc.mdwn
index f7615bed3cbb88bb2efe436041cf41f1750ea4ad..deef7fbcf342978eb674032b4a96ab0b68517dae 100644 (file)
--- a/doc.mdwn
+++ b/doc.mdwn
@@ -116,3 +116,12 @@ A guide to using and enjoying the Discuss bulletin board system on Athena.
 
 * [[So you want to learn Git...|doc/&git ]]
 Pointers to resources from which Git, the Version Control System many of us use.
+
+
+## Licensing
+
+While we love free and open source software, there are [http://www.opensource.org/proliferation](too many licenses) and the options can get a bit confusing. SIPB has some official recommendations for what to use and how to effect these licenses.
+
+* [[Code Licensing Recommendation|doc/code-licensing]]
+
+* [[Documentation Licensing Recommendation|doc/doc-licensing]]