core,data,doc: Rename upnp_enabled → upnp-enabled

Provide consistency with all the other configuration options. Also add
documentation for the option to the rygel.conf manpage.

diff --git a/data/rygel.conf b/data/rygel.conf
index 088fd16..77ae571 100644 (file)
--- a/data/rygel.conf
+++ b/data/rygel.conf
@@ -8,7 +8,7 @@
 # Set it to 'false' if you want to only use the streaming part of Rygel and/or
 # don't want it to advertize itself on the UPnP network. If you want to
 # completely disable rygel, just don't run it then. :)
-upnp_enabled=true
+upnp-enabled=true
 
 # Set it to 'false' if you want to disable transcoding support.
 enable-transcoding=true

diff --git a/doc/man/rygel.conf.xml b/doc/man/rygel.conf.xml
index a5c069e..3057c30 100644 (file)
--- a/doc/man/rygel.conf.xml
+++ b/doc/man/rygel.conf.xml
@@ -104,6 +104,14 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
     <variablelist>
       <varlistentry>
         <term>
+          <option>upnp-enabled</option>
+        </term>
+        <listitem>
+            <para>Enable/disable UPnP sharing of the media files. If set to <varname>false</varname>, <command>&dhpackage;</command> will still offer HTTP proxy URLs for its media files but not actively advertise them via UPnP.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
           <option>interface=<replaceable>INTERFACE</replaceable></option>
         </term>
         <listitem>

diff --git a/src/rygel/rygel-user-config.vala b/src/rygel/rygel-user-config.vala
index 2e30042..7ee7679 100644 (file)
--- a/src/rygel/rygel-user-config.vala
+++ b/src/rygel/rygel-user-config.vala
@@ -31,7 +31,7 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
     public static const string CONFIG_FILE = "rygel.conf";
     public static const string IFACE_KEY = "interface";
     public static const string PORT_KEY = "port";
-    public static const string ENABLED_KEY = "upnp_enabled";
+    public static const string ENABLED_KEY = "upnp-enabled";
     public static const string TITLE_KEY = "title";
     public static const string TRANSCODING_KEY = "enable-transcoding";
     public static const string MP3_TRANSCODER_KEY = "enable-mp3-transcoder";