From 36b4820f519d93bad998302141ae6de2cb15191c Mon Sep 17 00:00:00 2001
From: Alan Fregtman <941331+darkvertex@users.noreply.github.com>
Date: Wed, 30 Jun 2021 01:15:18 -0400
Subject: Implement "glob:" directive for declarative "data_files" option.

---
 docs/userguide/declarative_config.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'docs/userguide')

diff --git a/docs/userguide/declarative_config.rst b/docs/userguide/declarative_config.rst
index 128d9f97..dcab0b3a 100644
--- a/docs/userguide/declarative_config.rst
+++ b/docs/userguide/declarative_config.rst
@@ -68,6 +68,7 @@ boilerplate code in some cases.
         site.d/00_default.conf
         host.d/00_default.conf
     data = data/img/logo.png, data/svg/icon.svg
+    fonts = glob: data/fonts/*.ttf, glob: data/fonts/*.otf
 
 Metadata and options are set in the config sections of the same name.
 
@@ -156,6 +157,8 @@ Special directives:
       The ``file:`` directive is sandboxed and won't reach anything outside
       the directory containing ``setup.py``.
 
+* ``glob:`` - Value will be treated as a glob() pattern and expanded accordingly.
+
 
 Metadata
 --------
@@ -225,7 +228,7 @@ package_data             section                                              [#
 exclude_package_data     section
 namespace_packages       list-comma
 py_modules               list-comma
-data_files               dict                                 40.6.0
+data_files               glob:, dict                          40.6.0
 =======================  ===================================  =============== =========
 
 **Notes**:
-- 
cgit v1.2.1


From cb05fb0c94716b1d328ecca0573346218505b859 Mon Sep 17 00:00:00 2001
From: Alan Fregtman <941331+darkvertex@users.noreply.github.com>
Date: Wed, 21 Jul 2021 17:34:14 -0400
Subject: Update globbing for [options.data_files] to be implicit, not
 requiring a custom directive.

---
 docs/userguide/declarative_config.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'docs/userguide')

diff --git a/docs/userguide/declarative_config.rst b/docs/userguide/declarative_config.rst
index dcab0b3a..3b72611c 100644
--- a/docs/userguide/declarative_config.rst
+++ b/docs/userguide/declarative_config.rst
@@ -68,7 +68,7 @@ boilerplate code in some cases.
         site.d/00_default.conf
         host.d/00_default.conf
     data = data/img/logo.png, data/svg/icon.svg
-    fonts = glob: data/fonts/*.ttf, glob: data/fonts/*.otf
+    fonts = data/fonts/*.ttf, data/fonts/*.otf
 
 Metadata and options are set in the config sections of the same name.
 
@@ -157,8 +157,6 @@ Special directives:
       The ``file:`` directive is sandboxed and won't reach anything outside
       the directory containing ``setup.py``.
 
-* ``glob:`` - Value will be treated as a glob() pattern and expanded accordingly.
-
 
 Metadata
 --------
@@ -228,7 +226,7 @@ package_data             section                                              [#
 exclude_package_data     section
 namespace_packages       list-comma
 py_modules               list-comma
-data_files               glob:, dict                          40.6.0
+data_files               dict                                 40.6.0
 =======================  ===================================  =============== =========
 
 **Notes**:
-- 
cgit v1.2.1