Merge pull request #217 from infirit/yelp

Update help uri to the correct location

8 files changed, 9 insertions, 9 deletions

diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c
index 4a63a4f5..572f6275 100644
--- a/src/caja-bookmarks-window.c
+++ b/src/caja-bookmarks-window.c
@@ -145,7 +145,7 @@ caja_bookmarks_window_response_callback (GtkDialog *dialog,
         GError *error = NULL;
 
         gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
-                      "help:user-guide#goscaja-36",
+                      "help:mate-user-guide/goscaja-36",
                       gtk_get_current_event_time (), &error);
 
         if (error)
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index d27958e1..5e704d1b 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -685,7 +685,7 @@ connect_dialog_response_cb (CajaConnectServerDialog *dialog,
     case GTK_RESPONSE_HELP :
         error = NULL;
         gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
-                      "help:user-guide#caja-server-connect",
+                      "help:mate-user-guide/caja-server-connect",
                       gtk_get_current_event_time (), &error);
         if (error)
         {
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index 0d517fee..5bac9e25 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -209,7 +209,7 @@ preferences_show_help (GtkWindow *parent,
     g_assert (helpfile != NULL);
     g_assert (sect_id != NULL);
 
-    help_string = g_strdup_printf ("help:%s#%s", helpfile, sect_id);
+    help_string = g_strdup_printf ("help:%s/%s", helpfile, sect_id);
 
     gtk_show_uri (gtk_window_get_screen (parent),
                   help_string, gtk_get_current_event_time (),
@@ -266,7 +266,7 @@ caja_file_management_properties_dialog_response_cb (GtkDialog *parent,
             section = "goscaja-61";
             break;
         }
-        preferences_show_help (GTK_WINDOW (parent), "user-guide", section);
+        preferences_show_help (GTK_WINDOW (parent), "mate-user-guide", section);
     }
     else if (response_id == GTK_RESPONSE_CLOSE)
     {
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index 37d091bd..b534f210 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -95,7 +95,7 @@ response_callback (CajaLocationDialog *dialog,
     case GTK_RESPONSE_HELP :
         error = NULL;
         gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
-                      "help:user-guide#caja-open-location",
+                      "help:mate-user-guide/caja-open-location",
                       gtk_get_current_event_time (), &error);
         if (error)
         {
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index 59a17181..bb9e4058 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -1642,7 +1642,7 @@ help_button_callback (GtkWidget *widget, GtkWidget *property_browser)
     GtkWidget *dialog;
 
     gtk_show_uri (gtk_widget_get_screen (property_browser),
-                  "help:user-guide#goscaja-50",
+                  "help:mate-user-guide/goscaja-50",
                   gtk_get_current_event_time (), &error);
 
     if (error)
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index c511aaac..6962b736 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -603,7 +603,7 @@ action_caja_manual_callback (GtkAction *action,
     else
     {
         gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)),
-                      "help:user-guide#goscaja-1",
+                      "help:mate-user-guide/goscaja-1",
                       gtk_get_current_event_time (), &error);
     }
 
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 9c90a518..a97b3e91 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1168,7 +1168,7 @@ pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data)
 	case GTK_RESPONSE_HELP :
 		error = NULL;
 		gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
-			      "help:user-guide#caja-select-pattern",
+			      "help:mate-user-guide/caja-select-pattern",
 			      gtk_get_current_event_time (), &error);
 		if (error) {
 			eel_show_error_dialog (_("There was an error displaying help."), error->message,
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 983cfe3b..f74ca6ca 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5520,7 +5520,7 @@ real_response (GtkDialog *dialog,
 	switch (response) {
 	case GTK_RESPONSE_HELP:
 		gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
-			      "help:user-guide#goscaja-51",
+			      "help:mate-user-guide/goscaja-51",
 			      gtk_get_current_event_time (),
 			      &error);
 		if (error != NULL) {