# HG changeset patch # User Franz Glasner # Date 1599722854 -7200 # Node ID 7ef4362ca7c5abebe657e0c63e2b5955e0ce397e # Parent 1484f6c0223a6224e873a6964efff7615abfed87 Docu diff -r 1484f6c0223a -r 7ef4362ca7c5 configmix/__init__.py --- a/configmix/__init__.py Thu Sep 10 09:22:30 2020 +0200 +++ b/configmix/__init__.py Thu Sep 10 09:27:34 2020 +0200 @@ -49,7 +49,10 @@ """Load the given configuration files, merge them in the given order and return the resulting configuration dictionary. - :param files: the filenames of the configuration files to read and merge + :param files: the filenames of the configuration files to read and merge; + if a filename starts with ```` then the name is + interpreted as directory and all files are loaded in + sorted order (non-resursively, ignoring unknown filetypes) :keyword defaults: optional configuration dictionary with some default settings where the settings from `files` are merged into