Skip to content

Commit aa3f3e1

Browse files
committed
Merge branch 'main' into forman-82-config_setting_extra
2 parents 60b9eb3 + db3ab06 commit aa3f3e1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
is applicable. Deprecated `SliceSource.dispose()`.
1212

1313
- Introduced new optional configuration setting `slice_source_kwargs` that
14-
contains keyword-arguments passed to a configured `slice_source` together with
14+
contains keyword-arguments, which are passed to a configured `slice_source` together with
1515
each slice item.
1616

1717

docs/guide.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -801,9 +801,8 @@ argument(s) to your slice source.
801801
- Any other type is interpreted as single positional argument.
802802

803803
You can also pass extra keyword arguments to your slice source using the
804-
`slice_source_kwargs` setting. Its properties are passed as keyword arguments to
805-
every slice source invocation. Keyword arguments passed as slice items with same name
806-
as in `slice_source_kwargs` take precedence.
804+
`slice_source_kwargs` setting. Keyword arguments passed as slice items take
805+
precedence, that is, they overwrite arguments passed by `slice_source_kawrgs`.
807806

808807
Slice arguments are passed to your slice source for every slice. If your slice source
809808
has many parameters that stay the same for all slices you may prefer providing

0 commit comments

Comments
 (0)