diff --git a/CREDITS b/CREDITS
index 419f52ad..1a242372 100644
--- a/CREDITS
+++ b/CREDITS
@@ -86,6 +86,7 @@ Timo J. Rinne
Herman I. May
* Web wrangling and forums question answering
+ * HTML interface fixes
North Overby
* Patches for disc number
diff --git a/admin-root/CREDITS b/admin-root/CREDITS
index 419f52ad..1a242372 100644
--- a/admin-root/CREDITS
+++ b/admin-root/CREDITS
@@ -86,6 +86,7 @@ Timo J. Rinne
Herman I. May
* Web wrangling and forums question answering
+ * HTML interface fixes
North Overby
* Patches for disc number
diff --git a/admin-root/config-update.html b/admin-root/config-update.html
index c1e27bd0..884140ab 100644
--- a/admin-root/config-update.html
+++ b/admin-root/config-update.html
@@ -9,6 +9,7 @@
+
+
Version @VERSION@
@@ -35,7 +37,7 @@
-
+
diff --git a/contrib/mt-daapd.conf b/contrib/mt-daapd.conf
index 2d24bdad..3e623803 100644
--- a/contrib/mt-daapd.conf
+++ b/contrib/mt-daapd.conf
@@ -42,16 +42,29 @@ port 3689
admin_pw mt-daapd
+
#
-# db_dir (required)
+# db_type (required)
#
-# This is where mt-daapd stores its database of song information.
-#
-# If you installed from .RPM or .deb, then this directory already
-# exists. If not, then YOU MUST CREATE THIS DIRECTORY!
+# This is what kind of backend database to store the song
+# info in. Valid choices are "sqlite" and "sqlite3".
#
-db_dir /var/cache/mt-daapd
+db_type sqlite
+
+#
+# db_parms
+#
+# This is any extra information the db needs to connect.
+# in the case of sqlite and sqlite3, this is the name
+# of the directory to store the database in
+#
+# If you installed from RPM or .deb, this path likely already
+# exists. If not, then you must create it. The directory itself
+# must be writable by the "runas" user.
+#
+
+db_parms /var/cache/mt-daapd
#
# mp3_dir (required)
diff --git a/src/configfile.c b/src/configfile.c
index e092a0ad..c317cc20 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -405,12 +405,12 @@ int config_read(char *file) {
config.mp3dir=strdup(path_buffer);
if(config.dbdir) {
- DPRINTF(E_LOG,L_MISC,"You are using db_dir rather than "
- "db_type/db_parms. This will stop working at "
- "some point. Please fix your config\n");
- realpath(config.dbdir,path_buffer);
- free(config.dbdir);
- config.dbdir=strdup(path_buffer);
+ DPRINTF(E_LOG,L_MISC,"You are using db_dir rather than "
+ "db_type/db_parms. This will stop working at "
+ "some point. Please fix your config\n");
+ realpath(config.dbdir,path_buffer);
+ free(config.dbdir);
+ config.dbdir=strdup(path_buffer);
}
@@ -913,6 +913,8 @@ void config_emit_service_status(WS_CONNINFO *pwsc, void *value, char *arg) {
ws_writefd(pwsc," |
\n");
+ ws_writefd(pwsc,"