Merge branch 'jt/push-options-doc'

The receive-pack program now makes sure that the push certificate
records the same set of push options used for pushing.

* jt/push-options-doc:
  receive-pack: verify push options in cert
  docs: correct receive.advertisePushOptions default

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/technical/pack-protocol.txt
Simple merge

diff --cc builtin/receive-pack.c
index 0bb36d584d7e97ef0234c932d27e8312c1461107,ed21142349444cac66eca006dc077a17c40f3708..1b29975c528167ac5284b5710afcbd8c395a9c0a
--- 1/builtin/receive-pack.c
--- 2/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@@ -495,8 -495,8 +498,8 @@@ static char *find_header(const char *ms
  
  static const char *check_nonce(const char *buf, size_t len)
  {
-       char *nonce = find_header(buf, len, "nonce");
+       char *nonce = find_header(buf, len, "nonce", NULL);
 -      unsigned long stamp, ostamp;
 +      timestamp_t stamp, ostamp;
        char *bohmac, *expect = NULL;
        const char *retval = NONCE_BAD;