Merge branch 'docs' into 'master'

docs: Add information on binary verification

I added a section about `Binaries:` metadata field. However, my information might be wrong or outdated, since I barely used it by now. Maybe even this field was left out on purpose...

See merge request !83

diff --combined docs/fdroid.texi
index 24ba68bc6a4d293465c827cdd124c6182a4aaa31,cdbbb85b9fe8e3a843bca2e95335073b62159712..7b94dc69e3e2de4f62012308afdd3c6b3042dbd6
--- 1/docs/fdroid.texi
--- 2/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@@ -14,7 -14,9 +14,9 @@@ Copyright @copyright{} 2011 Henrik Tune
  
  Copyright @copyright{} 2013 David Black
  
- Copyright @copyright{} 2013, 2014 Daniel Martí
+ Copyright @copyright{} 2013, 2014, 2015 Daniel Martí
+ 
+ Copyright @copyright{} 2015 Boris Kraut
  
  @quotation
  Permission is granted to copy, distribute and/or modify this document
@@@ -489,6 -491,7 +491,7 @@@ The following sections describe the fie
  * Maintainer Notes::
  * Repo Type::
  * Repo::
+ * Binaries::
  * Build::
  * AntiFeatures::
  * Disabled::
@@@ -704,7 -707,7 +707,7 @@@ A litecoin address for donating to the 
  @cindex Summary
  
  A brief summary of what the application is. Since the summary is only allowed
 -one line on the list of the F-Droid client, keeping it to within 50 characters
 +one line on the list of the F-Droid client, keeping it to within 80 characters
  will ensure it fits most screens.
  
  @node Description
@@@ -776,6 -779,7 +779,7 @@@ values are
  @item
  @samp{srclib}
  @end itemize
+ 
  @node Repo
  @section Repo
  
@@@ -801,6 -805,20 +805,20 @@@ according srclib .txt file. For exampl
  and you want to use this srclib, then you have to set Repo to
  @code{FooBar}.
  
+ @node Binaries
+ @section Binaries
+ 
+ @cindex Binaries
+ 
+ The location of binaries used in verification process.
+ 
+ If specified, F-Droid will verify the output apk file of a build against the
+ one specified. You can use %v and %c to point to the version name and version
+ code of the current build. To verify the F-Droid client itself you could use:
+ @code{Binaries:https://f-droid.org/repo/org.fdroid.fdroid_%c.apk}
+ 
+ F-Droid will use upstream binaries if the verification succeeded.
+ 
  @node Build
  @section Build
  
@@@ -1054,9 -1072,9 +1072,9 @@@ adding them to 'ndk_paths' in your conf
  Build with Gradle instead of Ant, specifying what flavours to use. Flavours
  are case sensitive since the path to the output apk is as well.
  
 -If only one flavour is given and it is 'yes' or 'main', no flavour will be
 -used. Note that for projects with flavours, you must specify at least one
 -valid flavour since 'yes' or 'main' will build all of them separately.
 +If only one flavour is given and it is 'yes', no flavour will be used.
 +Note that for projects with flavours, you must specify at least one
 +valid flavour since 'yes' will build all of them separately.
  
  @item maven=yes[@@<dir>]
  Build with Maven instead of Ant. An extra @@<dir> tells F-Droid to run Maven