From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 16 Feb 2012 21:04:41 +0000 (+0200)
Subject: Update docs for forceversion/forcevercode.
X-Git-Tag: 0.1~952^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bd6619ee0188e9339f7556da91b334f50445c969;p=fdroidserver.git

Update docs for forceversion/forcevercode.
---

diff --git a/README b/README
index 140b6a0d..baaeaa7a 100644
--- a/README
+++ b/README
@@ -160,10 +160,13 @@ configuration to the build. These are:
                    AndroidManifest.xml.
  antcommand=xxx  - Specify an alternate ant command (target) instead of the
                    default 'release'.
- insertversion=x - If specified, the pattern 'x' in the AndroidManifest.xml is
-                   replaced with the version number for the build.
- insertvercode=x - If specified, the pattern 'x' in the AndroidManifest.xml is
-                   replaced with the version code for the build.
+ forceversion=yes - If specified, the package version in AndroidManifest.xml is
+                   replaced with the version number for the build as specified
+                   in recipe. Useful for cases when upstream repo missed to
+                   update it for specific tag, or to build an arbitrary revision.
+ forcevercode=yes - If specified, the package vercode in the AndroidManifest.xml is
+                   replaced with the version code for the build. See also
+                   forceversion.
  update=no	   By default, 'android update project' is used to generate or
                    update the build.xml file. Specifying update=no bypasses
                    that.
diff --git a/fdroid.texi b/fdroid.texi
index e3a3e89e..f586de93 100644
--- a/fdroid.texi
+++ b/fdroid.texi
@@ -364,13 +364,15 @@ the directory that contains AndroidManifest.xml.
 Specify an alternate ant command (target) instead of the default
 'release'.
 
-@item insertversion=x
-If specified, the pattern 'x' in the AndroidManifest.xml is replaced
-with the version number for the build.
-
-@item insertvercode=x
-If specified, the pattern 'x' in the AndroidManifest.xml is replaced
-with the version code for the build.
+@item forceversion=yes
+If specified, the package version in AndroidManifest.xml is replaced
+with the version number for the build as specified in recipe. Useful
+for cases when upstream repo missed to update it for specific tag,
+or to build an arbitrary revision.
+
+@item forcevercode=yes
+If specified, the package vercode in the AndroidManifest.xml is replaced
+with the version code for the build. See also forceversion.
 
 @item update=no
 By default, 'android update project' is used to generate or update the