Merge branch 'maint'

* maint:
Fix list of released versions in the toc document
Do not fail "describe --always" in a tag-less repository

diff --cc Documentation/git.txt
Simple merge

diff --cc builtin-describe.c
index 2dcfd3dfebdaad8fe87b8d09fa00b058f519ac5a,7542b5705c4e0f3d214d3f3ff7367ee03bf82b9f..eaa8a9d229c97ebaab9ee3aa09d2456f68cd172c
--- 1/builtin-describe.c
--- 2/builtin-describe.c
+++ b/builtin-describe.c
@@@ -350,10 -359,6 +350,10 @@@ int cmd_describe(int argc, const char *
                return cmd_name_rev(i + argc, args, prefix);
        }
  
-       if (!found_names)
 +      for_each_ref(get_name, NULL);
++      if (!found_names && !always)
 +              die("No names found, cannot describe anything.");
 +
        if (argc == 0) {
                describe("HEAD", 1);
        } else {