From 6b4a43a0a7b9cc4633e0b9a4f82cfcca3a727e4b Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Fri, 19 Aug 2016 19:20:05 +0100
Subject: [PATCH] Fix some web addresses which changed with the manual moving.

---
 src/HelpText.cpp         | 8 ++++----
 src/export/ExportMP3.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/HelpText.cpp b/src/HelpText.cpp
index 82191dab4..8e43d952f 100644
--- a/src/HelpText.cpp
+++ b/src/HelpText.cpp
@@ -201,11 +201,11 @@ static wxString HelpTextBuiltIn( const wxString & Key )
          wxString(wxT("<p>"))+
          _("Audacity can import unprotected files in many other formats (such as M4A and WMA, \
 compressed WAV files from portable recorders and audio from video files) if you download and install \
-the optional <a href=\"http://manual.audacityteam.org/o/man/faq_opening_and_saving_files.html#foreign\"> \
+the optional <a href=\"http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#foreign\"> \
 FFmpeg library</a> to your computer.") + wxT("</p><p>") +
          _("You can also read our help on importing \
-<a href=\"http://manual.audacityteam.org/o/man/faq_opening_and_saving_files.html#midi\">MIDI files</a> \
-and tracks from <a href=\"http://manual.audacityteam.org/o/man/faq_opening_and_saving_files.html#fromcd\"> \
+<a href=\"http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#midi\">MIDI files</a> \
+and tracks from <a href=\"http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#fromcd\"> \
 audio CDs</a>.") + wxT("</p>")
       );
    }
@@ -218,7 +218,7 @@ audio CDs</a>.") + wxT("</p>")
 // *URL* will be replaced by whatever URL we are looking for.
       return WrapText(_("You do not appear to have the 'help' folder installed. \
 Please <a href=\"*URL*\">view the content online</a> or \
-<a href=\"http://manual.audacityteam.org/o/man/unzipping_the_manual.html\"> \
+<a href=\"http://manual.audacityteam.org/man/unzipping_the_manual.html\"> \
 download the current Manual</a>.<br><br>\
 To always view the Manual online, change \"Location of Manual\" in \
 Interface Preferences to \"From Internet\".")
diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp
index d03d9cabf..4e26f904b 100644
--- a/src/export/ExportMP3.cpp
+++ b/src/export/ExportMP3.cpp
@@ -675,7 +675,7 @@ public:
 
    void OnDownload(wxCommandEvent & WXUNUSED(event))
    {
-      wxString page = wxT("http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#lame");
+      wxString page = wxT("http://manual.audacityteam.org/man/faq_installation_and_plug_ins.html#lame");
       ::OpenInDefaultBrowser(page);
    }