From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 8 Apr 2012 12:00:57 +0000 (+0100)
Subject: Various documentation updates
X-Git-Tag: 0.1~813
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4bec91d24c172c6b30bf2c63f1089e908e65cfa6;p=fdroidserver.git

Various documentation updates
---

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 2c79beb7..e255c56e 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -445,21 +445,31 @@ Common values:
 
 @item
 @samp{GPLv2}
+GNU GPL version 2
 
 @item
 @samp{GPLv2+}
+GNU GPL version 2 or later
 
 @item
 @samp{GPLv3}
+GNU GPL version 3
+
+@item
+@samp{GPLv3}
+GNU GPL version 3 or later
 
 @item
 @samp{Apache2}
+Apache 2
 
 @item
 @samp{MIT}
+MIT X11 license
 
 @item
 @samp{BSD}
+BSD license. Some disambiguation is needed here, regarding original versions modfied versions of this license.
 
 @end itemize
 
@@ -540,6 +550,8 @@ values are:
 @samp{hg}
 @item
 @samp{bzr}
+@item
+@samp{srclib}
 @end itemize
 @node Repo
 @section Repo
@@ -683,10 +695,19 @@ insert literal commas, or as the last character on a line to join that
 line with the next. It has no special meaning in other contexts; in
 particular, literal backslashes should not be escaped.
 
+You can use $$name$$ to substitute the path to a referenced srclib - see
+the @code{srclib} directory for details of this.
+
+You can use $$SDK$$ and $$NDK$$ to substitute the paths to the android
+SDK and NDK directories respectively.
+
 @item init=xxxx
 As for 'prebuild', but runs on the source code BEFORE any other processing
 takes place.
 
+You can use $$SDK$$ and $$NDK$$ to substitute the paths to the android
+SDK and NDK directories respectively.
+
 @item novcheck=yes 
 Don't check that the version name and code in the resulting apk are
 correct by looking at the build output - assume the metadata is