") + _("These are our support methods:") + wxT("
") + wxT("") + _(" For even quicker answers, all the online resources above are searchable.") + wxT("
") @@ -200,11 +200,11 @@ wxString HelpTextBuiltIn( const wxString & Key ) wxString(wxT(""))+ _("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 \ +the optional \ FFmpeg library to your computer.") + wxT("
") + _("You can also read our help on importing \ -MIDI files \ -and tracks from \ +MIDI files \ +and tracks from \ audio CDs.") + wxT("
") ); } @@ -215,8 +215,10 @@ audio CDs.") + wxT("") if(Key == wxT("remotehelp") ) { // *URL* will be replaced by whatever URL we are looking for. - return WrapText(_("You do not appear to have 'help' installed on your computer.
\
-Please view or download it online.")
+ return WrapText(_("You do not appear to have the 'help' folder installed.
\
+Please view the content online or \
+ \
+download the full Manual.")
);
}
return wxT("");
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 6a4eac8b2..64880ea6e 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -5731,7 +5731,7 @@ void AudacityProject::OnQuickHelp()
ShowHelpDialog(
this,
FileNames::HtmlHelpIndexFile(true),
- wxT("http://manual.audacityteam.org/index.php?title=Quick_Help" ));
+ wxT("http://manual.audacityteam.org/o/quick_help.html" ));
}
void AudacityProject::OnManual()
@@ -5739,7 +5739,7 @@ void AudacityProject::OnManual()
ShowHelpDialog(
this,
FileNames::HtmlHelpIndexFile(false),
- wxT("http://manual.audacityteam.org/index.php?title=Main_Page" ));
+ wxT("http://manual.audacityteam.org/o/" ));
}
void AudacityProject::OnShowLog()
diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h
index de2d885b9..9ebb69bbd 100644
--- a/src/effects/ChangePitch.h
+++ b/src/effects/ChangePitch.h
@@ -163,15 +163,3 @@ class ChangePitchDialog:public EffectDialog {
#endif // __AUDACITY_EFFECT_CHANGEPITCH__
#endif // USE_SOUNDTOUCH
-
-// Indentation settings for Vim and Emacs and unique identifier for Arch, a
-// version control system. Please do not modify past this point.
-//
-// Local Variables:
-// c-basic-offset: 3
-// indent-tabs-mode: nil
-// End:
-//
-// vim: et sts=3 sw=3
-// arch-tag: a2885d66-6848-451b-aa61-3d54cec833d6
-
diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp
index 0539f3a11..9af8dff86 100644
--- a/src/export/ExportMP3.cpp
+++ b/src/export/ExportMP3.cpp
@@ -658,7 +658,7 @@ public:
void OnDownload(wxCommandEvent & event)
{
- wxString page = wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23How_do_I_download_and_install_the_LAME_MP3_encoder.3F");
+ wxString page = wxT("http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#lame");
::OpenInDefaultBrowser(page);
}
diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp
index fac129880..884849a07 100644
--- a/src/prefs/LibraryPrefs.cpp
+++ b/src/prefs/LibraryPrefs.cpp
@@ -167,7 +167,7 @@ void LibraryPrefs::OnMP3FindButton(wxCommandEvent & e)
/// tell us where the MP3 library is.
void LibraryPrefs::OnMP3DownButton(wxCommandEvent & e)
{
- wxString url = wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23How_do_I_download_and_install_the_LAME_MP3_encoder.3F");
+ wxString url = wxT("http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#lame");
::OpenInDefaultBrowser(url);
}
@@ -216,7 +216,7 @@ void LibraryPrefs::OnFFmpegFindButton(wxCommandEvent & e)
void LibraryPrefs::OnFFmpegDownButton(wxCommandEvent & e)
{
- wxString url = wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23installffmpeg");
+ wxString url = wxT("http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#ffdown");
::OpenInDefaultBrowser(url);
}