Merge pull request #27 from NiceandGently/master

adjust help links to match prefs and sensor-prefs dialog

3 files changed, 24 insertions, 9 deletions

diff --git a/help/C/index.docbook b/help/C/index.docbook
index 51691ae..4d8301f 100644
--- a/help/C/index.docbook
+++ b/help/C/index.docbook
@@ -2,13 +2,13 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY legal SYSTEM "legal.xml">
-  <!ENTITY appletversion "1.6">
-  <!ENTITY manrevision "2.0">
+  <!ENTITY appletversion "1.10">
+  <!ENTITY manrevision "2.1">
   <!ENTITY date "January 2006">
   <!ENTITY applet "MATE Sensors Applet">
   <!ENTITY author-name "Alex Murray">
   <!ENTITY author-email "[email protected]">
-  <!ENTITY project-webpage "http://sensors-applet.sourceforge.net/">
+  <!ENTITY project-webpage "https://github.com/mate-desktop/mate-sensors-applet/">
   <!-- Information about the entities.
        The legal.xml file contains legal information, there is no need to edit the file. 
        Use the appletversion entity to specify the version of the applet.
@@ -20,7 +20,7 @@
 <!-- 
       (Do not remove this comment block.)
   Maintained by the MATE Documentation Project
-  http://developer.mate.org/projects/gdp
+  http://www.mate-desktop.org/development/
   Template version: 2.0 beta
   Template last modified Feb 06, 2003
 -->
@@ -31,6 +31,10 @@
   <articleinfo> 
     <title>&applet; Manual V&manrevision;</title>
     <copyright> 
+      <year>2015</year> 
+      <holder>MATE Development</holder>
+    </copyright>
+    <copyright> 
       <year>2006</year> 
       <holder>&author-name;</holder> 
     </copyright> 
@@ -61,6 +65,16 @@
 
     <authorgroup> 
       <author role="maintainer"> 
+	<surname>MATE Development</surname> 
+	<affiliation> 
+	  <!-- <orgname>MATE Documentation
+	  Project</orgname> -->
+	  <!-- The email address of the author is optional and is commented out by default. 
+	  <address> <email>[email protected]</email> </address> 
+	  --> 
+	</affiliation> 
+      </author> 
+      <author role="maintainer"> 
 	<firstname>Alex</firstname> 
 	<surname>Murray</surname> 
 	<affiliation> 
@@ -631,9 +645,10 @@ Alarms for individual sensors must also be enabled.
 
   <sect1 id="myapplet-about">
     <title>About &applet;</title>
-    <para>
-      <application>&applet;</application> was written by Alex Murray
-      (<email>[email protected]</email>). To find more information about
+    <para> The origin sensor applet was written by Alex Murray
+      (<email>[email protected]</email>).
+      <application>&applet;</application> is further develop by Mate dev team.
+      To find more information about
       <application>&applet;</application>, please visit the <ulink
         url="&project-webpage;" type="http">&applet; Project
         Homepage</ulink>. 
diff --git a/sensors-applet/prefs-dialog.c b/sensors-applet/prefs-dialog.c
index c7c2204..9e3376a 100644
--- a/sensors-applet/prefs-dialog.c
+++ b/sensors-applet/prefs-dialog.c
@@ -64,7 +64,7 @@ void prefs_dialog_response(GtkDialog *prefs_dialog,
         case GTK_RESPONSE_HELP:
                 g_debug("loading help in prefs");
                 current_page = gtk_notebook_get_current_page(sensors_applet->prefs_dialog->notebook);
-		uri = g_strdup_printf("help:mate-sensors-applet#%s",
+		uri = g_strdup_printf("help:mate-sensors-applet/sensors-applet-general-options",
 				      ((current_page == 0) ?
 				       "general_options" :
 				       ((current_page == 1) ?
diff --git a/sensors-applet/sensor-config-dialog.c b/sensors-applet/sensor-config-dialog.c
index e106481..e8ddc08 100644
--- a/sensors-applet/sensor-config-dialog.c
+++ b/sensors-applet/sensor-config-dialog.c
@@ -80,7 +80,7 @@ static void sensor_config_dialog_response(GtkDialog *dialog,
         case GTK_RESPONSE_HELP:
                 g_debug("loading help in config dialog");
                 gtk_show_uri(NULL,
-			     "help:mate-sensors-applet",
+			     "help:mate-sensors-applet/sensors-applet-sensor-config-dialog",
 			     gtk_get_current_event_time(),
 			     &error);