From f805ec707ed59ddabc821f071653689055e1f8f0 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Wed, 6 Jan 2010 05:23:58 +0000
Subject: [PATCH] Merge r3951 from 2.1.8 back in: fixing old URLs

Originally committed to SVN as r3952.
---
 aegisub/src/ass_file.cpp          | 2 +-
 aegisub/src/frame_main_events.cpp | 4 ++--
 aegisub/src/subtitle_format.cpp   | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/aegisub/src/ass_file.cpp b/aegisub/src/ass_file.cpp
index 41566ea5d..c1a4c032c 100644
--- a/aegisub/src/ass_file.cpp
+++ b/aegisub/src/ass_file.cpp
@@ -147,7 +147,7 @@ void AssFile::Load (const wxString _filename,const wxString charset,bool addToRe
 
 	// Add comments and set vars
 	AddComment(_T("Script generated by Aegisub ") + GetAegisubLongVersionString());
-	AddComment(_T("http://www.aegisub.net"));
+	AddComment(_T("http://www.aegisub.org/"));
 	SetScriptInfo(_T("ScriptType"),_T("v4.00+"));
 
 	// Add to recent
diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp
index bcd99b2b1..211060ce2 100644
--- a/aegisub/src/frame_main_events.cpp
+++ b/aegisub/src/frame_main_events.cpp
@@ -631,7 +631,7 @@ void FrameMain::OnFiles(wxCommandEvent& WXUNUSED(event)) {
 /// @param event 
 ///
 void FrameMain::OnWebsite(wxCommandEvent& WXUNUSED(event)) {
-	AegisubApp::OpenURL(_T("http://www.aegisub.net/"));
+	AegisubApp::OpenURL(_T("http://www.aegisub.org/"));
 }
 
 
@@ -640,7 +640,7 @@ void FrameMain::OnWebsite(wxCommandEvent& WXUNUSED(event)) {
 /// @param event 
 ///
 void FrameMain::OnForums(wxCommandEvent& WXUNUSED(event)) {
-	AegisubApp::OpenURL(_T("http://forum.aegisub.net/"));
+	AegisubApp::OpenURL(_T("http://forum.aegisub.org/"));
 }
 
 
diff --git a/aegisub/src/subtitle_format.cpp b/aegisub/src/subtitle_format.cpp
index ae818f866..efbdc4563 100644
--- a/aegisub/src/subtitle_format.cpp
+++ b/aegisub/src/subtitle_format.cpp
@@ -503,8 +503,9 @@ static void InsertLineSortedIntoList(std::list<AssEntry*> &list, std::list<AssEn
 }
 
 
-/// @brief http://malakith.net/aegiwiki/Split-merge_algorithm_for_converting_to_simple_subtitle_formats Split and merge lines so there are no overlapping lines 
+/// @brief Split and merge lines so there are no overlapping lines 
 ///
+/// Algorithm described at http://devel.aegisub.org/wiki/Technical/SplitMerge
 void SubtitleFormat::RecombineOverlaps() {
 	using std::list;
 	list<AssEntry*>::iterator next;