From 6f9656bf091f6cb1ebfe22c926e60e1c9d25ca02 Mon Sep 17 00:00:00 2001 From: Chris Axon Date: Thu, 30 May 2024 18:28:29 -0400 Subject: [PATCH] Update usage.rst (#1176) --- docs/source/usage.rst | 2 +- news/1176.docs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 news/1176.docs diff --git a/docs/source/usage.rst b/docs/source/usage.rst index 7f63b19a7..1877cfea4 100644 --- a/docs/source/usage.rst +++ b/docs/source/usage.rst @@ -449,7 +449,7 @@ Web server configuration example: conf = OmegaConf.merge(server_cfg, plugin1_cfg, site1_cfg, site2_cfg) The following example creates two configs from files, and one from the cli. It then combines them into a single object. -Note how the port changes to 82, and how the users lists are combined. +Note how the port changes to 82. **example2.yaml** file: diff --git a/news/1176.docs b/news/1176.docs new file mode 100644 index 000000000..4a56ab26a --- /dev/null +++ b/news/1176.docs @@ -0,0 +1 @@ +Update documentation about merging lists examples.