aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2016-06-10 10:28:01 +0200
committerZandra Hird <[email protected]>2016-06-10 10:28:01 +0200
commit48acd7ea0ec25625504fe0b3c3afb7c298c562ca (patch)
treea4dd2563d06ebfa1877e65a90e0481dabb991d81 /lib
parent51f4f2c08082bfed4243ff92f23cac936d22efdb (diff)
parentc789326165e63ed43bd316bc344139169aad0331 (diff)
downloadotp-48acd7ea0ec25625504fe0b3c3afb7c298c562ca.tar.gz
otp-48acd7ea0ec25625504fe0b3c3afb7c298c562ca.tar.bz2
otp-48acd7ea0ec25625504fe0b3c3afb7c298c562ca.zip
Merge branch 'zandra/common_test/ct-reload_config-doc'
* zandra/common_test/ct-reload_config-doc: Update ct:reload_config docs since {error, Reason} can be returned
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/doc/src/ct.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
index 5231ef24a4..264bcff251 100644
--- a/lib/common_test/doc/src/ct.xml
+++ b/lib/common_test/doc/src/ct.xml
@@ -935,7 +935,7 @@
</func>
<func>
- <name>reload_config(Required) -&gt; ValueOrElement</name>
+ <name>reload_config(Required) -&gt; ValueOrElement | {error, Reason}</name>
<fsummary>Reloads configuration file containing specified configuration
key.</fsummary>
<type>