Merge branch 'v0.20.x'

2018-06-03 14:22:29 +02:00
parent b63664988f 8dcb1f805d
commit 24874b8286
4 changed files with 29 additions and 9 deletions
--- 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>
@@ -2149,6 +2142,15 @@ run</programlisting>
                  <application>MPD</application> instance.
                </entry>
              </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>