[gi-docgen: 7/7] Merge branch 'wip/carlosg/multi-content-dir' into 'main'

[Emmanuele Bassi <ebassi src gnome org>]

commit 6485146fd541128d2d2faf225858b47776ecf82b
Merge: 884231e e3a6d47
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Wed Jun 23 16:13:57 2021 +0000

    Merge branch 'wip/carlosg/multi-content-dir' into 'main'
    
    Allow multiple --content-dir arguments
    
    See merge request GNOME/gi-docgen!77

 docs/project-configuration.rst |  8 ++++----
 docs/tools/gen-index.rst       |  7 +++++--
 docs/tools/generate.rst        |  7 +++++--
 gidocgen/gdgendeps.py          | 18 ++++++++++--------
 gidocgen/gdgenerate.py         | 27 +++++++++++++++------------
 gidocgen/gdgenindices.py       | 11 +++++++----
 gidocgen/utils.py              |  9 +++++++++
 7 files changed, 55 insertions(+), 32 deletions(-)
---