s-m-r-a is access, not acl

[wiki.git] / projects / collaboration.mdwn

diff --git a/projects/collaboration.mdwn b/projects/collaboration.mdwn
index 4860ed82d44688c36c433e7854ebaee678422eda..5ed0c9b552a52fce6b6cb2ee123c90eb3a1c07bd 100644 (file)
--- a/projects/collaboration.mdwn
+++ b/projects/collaboration.mdwn
@@ -2,7 +2,7 @@ SIPB projects should generally be free software with open collaboration, that is
 
 # Free software
 
-For software and source code, the [[SIPB project licensing recommendation|doc/licensing]] advises you to choose one of the following two licenses:
+For software and source code, the [[SIPB project licensing recommendation|doc/code-licensing]] advises you to choose one of the following two licenses:
 
 * the <a>MIT license</a>, also known as the "Expat" or "X11" license. This is a short, permissive license that allows code to be distributed and reused in most forms, without placing redistribution requirements on the user or distributor.
 
@@ -33,7 +33,8 @@ Software Guidelines](http://www.debian.org/social_contract#guidelines) and an [F
 
 # Free documentation
 
-The [[doc/doc-licensing|SIPB documentation licensing recommendation]] advises *dual-licensing* (i.e., making available with both licenses) documentation under:
+The [[SIPB documentation licensing recommendation|doc/doc-licensing]] advise *dual-licensing* (i.e., making available with both licenses) documentation under:
+
 * the <a>Creative Commons Attribution-Share Alike</a> license, and
 * the <a>GNU Free Documentation License</a>, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover-Texts.
 
@@ -43,7 +44,7 @@ Both of these are popular licenses for free non-code creative works. For example
 
 A license without the code is worthless! Make sure your code is posted somewhere accessible. If you're using a version control system (which you should), the easiest approach is to set up public read-only access to your repository. Options that SIPB projects have used include
 
- * <a>Subversion on Athena</a>
+ * <a>Subversion or git in an Athena AFS locker</a>
  * <a>Subversion or git on scripts.mit.edu</a>
  * <a>Github</a>, a commercial git hosting service free for open-source/public projects