[gtk: 2/2] Merge branch 'option-names' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 61345b3216b97ff7255be209c7f56daf27e1a66e
Merge: 129691f3a6 4eaf860e86
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jul 2 01:28:43 2019 +0000

    Merge branch 'option-names' into 'master'
    
    meson: Rename documentation option to gtk_doc
    
    See merge request GNOME/gtk!972

 .gitlab-ci.yml                   | 2 +-
 docs/reference/gdk/meson.build   | 2 +-
 docs/reference/gsk/meson.build   | 2 +-
 docs/reference/gtk/building.sgml | 8 ++++----
 docs/reference/gtk/meson.build   | 2 +-
 docs/reference/meson.build       | 2 +-
 docs/tools/meson.build           | 2 +-
 meson.build                      | 2 +-
 meson_options.txt                | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
---