PATCH: [ 2988974 ] Fix help locations

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index f094d90..5d537d7 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id]
 
 WinMerge 2.13.12
   Update copyright year to 2010
+  Fix help locations (#2988974)
   Bugfix: Strange scrolling effect in location pane (#2942869)
   Translation updates:
   - Chinese Traditional (#2954833)

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 9f1c31c..288f868 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -62,7 +62,7 @@ static char THIS_FILE[] = __FILE__;
 /**
  * @brief Location for folder compare specific help to open.
  */
-static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/CompareDirs.html");
+static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/Compare_dirs.html");
 
 /**
  * @brief Limit (in seconds) to signal compare is ready for user.

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 5dda356..d753744 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -70,7 +70,7 @@ static char THIS_FILE[] = __FILE__;
 
 
 /** @brief Location for command line help to open. */
-static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/CommandLine.html");
+static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
 
 /////////////////////////////////////////////////////////////////////////////
 // CMergeApp

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 64c1df2..27e360a 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -61,7 +61,7 @@ const UINT IDT_RESCAN = 2;
 const UINT RESCAN_TIMEOUT = 1000;
 
 /** @brief Location for file compare specific help to open. */
-static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/CompareFiles.html");
+static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/Compare_files.html");
 
 /////////////////////////////////////////////////////////////////////////////
 // CMergeEditView

diff --git a/Src/OpenDlg.cpp b/Src/OpenDlg.cpp
index 2a74d66..44b49a2 100644 (file)
--- a/Src/OpenDlg.cpp
+++ b/Src/OpenDlg.cpp
@@ -58,7 +58,7 @@ const UINT CHECKFILES_TIMEOUT = 1000; // milliseconds
 static const TCHAR EMPTY_EXTENSION[] = _T(".*");
 
 /** @brief Location for Open-dialog specific help to open. */
-static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/OpenPaths.html");
+static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/Open_paths.html");
 
 /////////////////////////////////////////////////////////////////////////////
 // COpenDlg dialog