Rewrite the templates

metadata/template

@@ -1,111 +1,62 @@
-## See http://f-droid.org/manual for details
+# F-Droid metadata template
-## Fields and comments which aren't used can be deleted
-## Blank lines are customary as they are seen here 
 #
-# Only used for making an app disappear from the index
+# See http://f-droid.org/manual for more details
-Disabled:
+#
-# Possible values are hard-coded in the F-Droid source code: separate with a ","
+# Fields that are commented out are optional
-AntiFeatures:
+ 
-# Not hard-coded but look at the pre-existing ones. Separate with a ";"
+# Disabled: (if an app must vanish from the repo)
-Category:
+# AntiFeatures: (comma-separated) (possible values hard-coded in fdroidserver)
-# The ''overall'' license: must be compatible with licenses of components
+Categories: (comma-separated)
 License:
-# Only use if different from Source Code
-Web Site:
-# Should be http(s)://
-Source Code:
-# Should be http(s):// 
-Issue Tracker:
-# A dedicated web page with donation buttons is preferred
-Donate:
-# See http://flattr.com
-FlattrID:
-# Add a comment about how to verify, such as URL for an issue
-Bitcoin:
 
-# Scripts will try to put the app's name here. Don't need to edit it
+Web Site: (web link)
-Auto Name:
+Source Code: (web link)
-# Only changes the name in the index. Not generally required
+Issue Tracker: (web link)
-Name:
+
-# Jargon-free description, not longer than 32 characters
+# Donate: (web link)
-Summary:
+# FlattrID: (number)
-# Description goes ''under'' this field, terminated by a line with a single "."
+# Bitcoin: (bitcoin address)
+
+# Name: (to override the name of the app in the index)
+Summary: (one sentence, no more than 30-40 chars)
 Description:
-Blank lines indicate a new paragraph and it is preferrable to make a new
+Description of what the app does. It should be as objective as possible.
-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 also
-compatible with their device.
 
-The description should be: 
+A blank line means a line break, i.e. the end of a paragraph.
-* Fairly future proof, unless you intend to keep it updated 
-* 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 —
+Bulleted lists can be used:
 
-Requires root: No. The app can reboot the phone if it is allowed root.
+* Item 1
-
+* Item 2
-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 and/or BETA and/or current version can't be built.
 
+Links can be added like this:
 [https://github.com/org/project/raw/master/res/raw/changelog.xml Changelog]
+
+Links to other apps too: [[some.other.app]]
 .
 
-# Yes is the only possible value
+# Requires Root: Yes (f not having root breaks the app or renders it useless)
-Requires Root:
 
-## Repo and Build Version only apply to apps with source-built versions
+# Repo and Build fields only matter in source-built apps
-Repo Type:
+Repo Type: (git, git-svn, svn, hg or bzr)
-Repo:
+Repo: (repo url, don't use auth
-# Versions/Codes of each Build Version must be different from the others
-# Any jars or prebuilts should have references, preferably in the README
-# 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=android-x,\
-compilesdk=x,\
-update=[no|force|.;<path/to/x>;<path/to/y>;...],\
-encoding=xxxx,\
-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 && ...,\
-build=xxxx && yyyy && ...,\
-buildjni=[yes|no|<dir list>],\
-maven=yes,\
-preassemble=task1 task2,\
-gradle=[main|flavor],\
-bindir=<path>,\
-antcommand=xxx
 
-# A more recent version i.e. one with a greater version code
+# One for each source build
-Build Version:
+# Build:<version>,<version code>
+#     commit=<tag/commit/rev>
+#     [...]
+#
+# For a complete list of flags, see the manual
 
-## Comments on what to watch for when adding new Build Versions (BVs) go here
+# Maintainer Notes:
+# Here go the notes to take into account for future updates, builds, etc.
+# Will be published in the wiki if present.
+# .
 
-# This field is best used at the discretion of the repo maintainers
+Auto Update Mode: (see the manual)
-Auto Update Mode:
+Update Check Mode: (see the manual)
-# One of Tags, RepoManifest, Static, Market or None (in that order of preference)
+Current Version: (current version name)
-# If None or Market, describe why the other methods don't work
+Current Version Code: (current version code, i.e. number)
-# 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 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 because of non-free elements
+# No Source Since: First version to be partially or completely missing upstream
-No Source Since:
 

metadata/template-minimal

@@ -1,20 +1,43 @@
-Category:
+# F-Droid metadata template
-License:
+#
-Web Site:
+# See http://f-droid.org/manual for more details
-Source Code:
-Issue Tracker:
  
-Summary:
+Categories: (comma-separated)
+License:
+
+Web Site: (web link)
+Source Code: (web link)
+Issue Tracker: (web link)
+
+Summary: (one sentence, no more than 30-40 chars)
 Description:
+Description of what the app does. It should be as objective as possible.
+
+A blank line means a line break, i.e. the end of a paragraph.
+
+Bulleted lists can be used:
+
+* Item 1
+* Item 2
+
+Links can be added like this:
+[https://github.com/org/project/raw/master/res/raw/changelog.xml Changelog]
+
+Links to other apps too: [[some.other.app]]
 .
 
-Repo Type:
+Repo Type: (git, git-svn, svn, hg or bzr)
-Repo:
+Repo: (repo url, don't use auth
 
-Build Version:
+# One for each source build
+# Build:<version>,<version code>
+#     commit=<tag/commit/rev>
+#     [...]
+#
+# For a complete list of flags, see the manual
 
-Auto Update Mode:
+Auto Update Mode: (see the manual)
-Update Check Mode:
+Update Check Mode: (see the manual)
-Current Version:
+Current Version: (current version name)
-Current Version Code:
+Current Version Code: (current version code, i.e. number)