Branch: master

d14761fb 2014-11-08 00:27:18 Timothy Pearson 
Fix up remaining references to DocPath
M kode/kodemain.cpp
 
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index 8488205..d97570b 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -599,7 +599,7 @@
     protocolFile.writeEntry( "input", "none" );
     protocolFile.writeEntry( "output", "filesystem" );
     protocolFile.writeEntry( "reading", "true" );
-    protocolFile.writeEntry( "DocPath", "tdeioslave/" + protocol + ".html" );
+    protocolFile.writeEntry( "X-DocPath", "tdeioslave/" + protocol + ".html" );
 
     protocolFile.sync();
   }
7ebe6cf3 2014-11-08 00:27:55 Timothy Pearson 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim
M korganizer/korganizer_configfonts.desktop
 
diff --git a/korganizer/korganizer_configfonts.desktop b/korganizer/korganizer_configfonts.desktop
index 172eb1f..3c61556 100644
--- a/korganizer/korganizer_configfonts.desktop
+++ b/korganizer/korganizer_configfonts.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=font-x-generics
+Icon=font-x-generic
 Type=Service
 X-TDE-ServiceTypes=TDECModule