diff options
| author | Max Kellermann <max@musicpd.org> | 2018-06-03 14:22:29 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-06-03 14:22:29 +0200 |
| commit | 24874b82867f0db0bfd3e486ad5f0b20375b1722 (patch) | |
| tree | 4d8c8f8962f31b30e3cd82983b32f711adc7095d /doc | |
| parent | b63664988fb8895830cb628df513a2ec07328aa5 (diff) | |
| parent | 8dcb1f805d39efef31ea63d5c42af9eb6263712f (diff) | |
Merge branch 'v0.20.x'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user.xml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/user.xml b/doc/user.xml index f63ed2a0a..bc2e76e89 100644 --- a/doc/user.xml +++ b/doc/user.xml @@ -2115,13 +2115,6 @@ run</programlisting> database. </para> - <para> - Note that unless overridden by the below settings (e.g. by - setting them to a blank value), general curl configuration - from environment variables such as http_proxy or specified - in ~/.curlrc will be in effect. - </para> - <informaltable> <tgroup cols="2"> <thead> @@ -2151,6 +2144,15 @@ run</programlisting> </row> <row> <entry> + <varname>password</varname> + </entry> + <entry> + The password used to log in to the "master" + <application>MPD</application> instance. + </entry> + </row> + <row> + <entry> <varname>keepalive</varname> <parameter>yes|no</parameter> </entry> |