Merge branch 'stable-2.8' into stable-2.9
authorKlaus Aehlig <aehlig@google.com>
Tue, 17 Sep 2013 09:59:36 +0000 (11:59 +0200)
committerKlaus Aehlig <aehlig@google.com>
Tue, 17 Sep 2013 11:12:45 +0000 (13:12 +0200)
commit52469de0bf18290eae8afbd17dd7b064bcfc8218
treec0a40eb7d0d03f5be9cfbb24b0ce009ac965ebe4
parentb2e7599dd208d16726764f22f2fc36b951239d9f
parenta3de343e3ac17ac2ece2efb9ac437b3091586454
Merge branch 'stable-2.8' into stable-2.9

* stable-2.8
  Add a default to file-driver when unspecified over RAPI
  Remove typo from RAPI documentation
  Describe the files in doc/users in NEWS
  Update the upgrade procedure

* stable-2.7
  Fix incorrect manpage reference to htools

Conflicts:
NEWS
configure.ac
lib/cmdlib/instance.py
man/hroller.rst

All trivial, except for man/hrooler.rst, where the
fix in the section number was manually applied to the
new text.

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>
NEWS
doc/rapi.rst
lib/cli.py
lib/cmdlib/instance.py
man/hroller.rst