# HG changeset patch # User Franz Glasner # Date 1556285249 -7200 # Node ID b3ba2b0265b540c080e8107e37441650d4fc5eed # Parent 8138d56d7cd3cd52628b65d2864bc855768d9ea0 Docu: Explicitely tag "defaults" as keyword argument diff -r 8138d56d7cd3 -r b3ba2b0265b5 configmix/__init__.py --- a/configmix/__init__.py Fri Apr 26 14:30:52 2019 +0200 +++ b/configmix/__init__.py Fri Apr 26 15:27:29 2019 +0200 @@ -46,9 +46,9 @@ and return the resulting configuration dictionary. :param files: the filenames of the configuration files to read and merge - :param defaults: optional configuration dictionary with some default - settings where the settings from `files` are merged - into + :keyword defaults: optional configuration dictionary with some default + settings where the settings from `files` are merged + into :type defaults: a configuration dictionary or `None` :returns: the configuration :rtype: ~configmix.config.Configuration