[beast: 8/8] Merge branch 'documentation-upload'

[Tim Janik <timj src gnome org>]

commit 14c3c33af8d8f32bf823db8b402b6c18d5ff2c95
Merge: 36605cc 7d8595d
Author: Tim Janik <timj gnu org>
Date:   Tue Sep 8 09:11:35 2015 +0200

    Merge branch 'documentation-upload'
    
    * documentation-upload:
      DOCS: fix docu upload logic
      DOCS: simplify doc builds, always build docs in html/
      DOCS: avoid using Rapicorn tag file, as Doxygen ignore namespaces from tag files
      DOCS: include tagfile from cppreference.com for docu generation
      DOCS: strip spaces from DOXYGEN_TAGFILES
      DOCS: minor fixups to ChangeLog doc generation
      DOCS: allow to skip documentation rebuilds with "NODOC=1 make"

 docs/Makefile.am                              |   63 +-
 docs/imports/cppreference-doxygen-web.tag.xml |35489 +++++++++++++++++++++++++
 2 files changed, 35516 insertions(+), 36 deletions(-)
---