diff --git a/metadata/template b/metadata/template
index 683183f1bb..33e89265dc 100644
--- a/metadata/template
+++ b/metadata/template
@@ -23,7 +23,7 @@ FlattrID:
 # Not visible in the client/web repository yet
 Bitcoin:
 
-# Scripts will try to put the app's name here. Shouldn't be edited
+# Scripts will try to put the app's name here. Don't edit it
 Auto Name:
 # Only changes the name in the index. Not generally required
 Name:
@@ -34,7 +34,7 @@ Description:
 Blank lines indicate a new paragraph and it is preferrable to make a new
 line for a new sentence.
 It is applicable to what would be the Recommended Version for most people 
-i.e. the version that's closest to the Current Version (see below) and als
+i.e. the version that's closest to the Current Version (see below) and also
 compatible with their device.
 
 The description should be: 
@@ -42,18 +42,19 @@ The description should be:
 * Not be too short 
 * With a  maximum line length of 80 chars, unless the basic MediaWiki markup is used
 
-The following extra are examples of items that may be helpful:
+The following extra are examples of items that may be helpful —
 
 Requires root: No. The app can reboot the phone if it is allowed root.
 
-Anti-features: Tracking and Network Services. The app uploads usage statistics
-periodically to a server whose location is hard-coded into the app.
+Anti-features: 
+* Tracking: The app uploads usage stats — see the Website for details
+* Non-free Network Services: Calculations are done on the developers' server
 
 Google Ad library was removed before building.
 
 Supports x86 natively.
 
-Status: Last version or BETA.
+Status: Last version and/or BETA and/or current version can't be built.
 
 [https://github.com/org/project/raw/master/res/raw/changelog.xml Changelog]
 .
@@ -64,24 +65,46 @@ Requires Root:
 ## These next four only apply to apps with source-built versions
 Repo Type:
 Repo:
-# Versions/Codes of each line must be different from the others
+# Versions/Codes of each Build Version must be different from the others
 # Any jars or prebuilts should have references, preferably in the README
-Build Version:
+# The following contains all possible parameters in the best order
+Build Version:version,version code,commit/tag,\
+subdir=<path/to/manifest or pom>,\
+submodules=yes,\
+init=xxxx && yyyy && ...,\
+target=<target>,\
+update=[no|force|.;<path/to/x>;<path/to/y>;...],\
+encoding=xxxx,\
+forceversion=yes,\
+forcevercode=yes,\
+rm=<relpath/to/x.apk>;<relpath/to/y.jar>;...,\
+extlibs=a/Av1.2.jar;b/Bv1.3.jar;...,\
+srclibs=a@r;b@r1;...,\
+patch=x.patch;...,\
+prebuild=xxxx && yyyy && ...,\
+scanignore=build/com.domain.app1/path1;build/org.domain.app2/path2;...,\
+build=xxxx && yyyy && ...,\
+buildjni=[yes|no|<dir list>],\
+maven=yes,\
+bindir=<path>,\
+antcommand=xxx,\
+novcheck=yes 
+
 Build Version:
 
 ## Comments on what to watch for when adding new Build Versions (BVs) go here
 # This field is best used at the discretion of the repo maintainers
 Auto Update Mode:
 # One of Tags, RepoManifest, Static, Market or None (in that order of preference)
-# If None, describe how to obtain the Current Version (CV) in a comment 
+# If None or Market, describe why the other methods don't work
 # Tags and RepoManifest (RM) are automatic but check that the mechanism works
 # Use Static if you plan to let the maintainers know in person (so to speak)
 Update Check Mode:
-# These two values are usually in the AndroidManifest.xml, but may be automatically
-# updated, depending on the value of the previous field
+# These two values are usually in the AndroidManifest of the current release, 
+# but may be automatically updated, depending on the value of the previous field
 Current Version:
 Current Version Code:
 
-# The version at which it became impossible to build due to policy issues
+# The version at which it became impossible to build because of non-free elements
 No Source Since: