From c5cc8b452d0a6fd73676333394fab559f2ba6489 Mon Sep 17 00:00:00 2001
From: Riley McArdle <riley@glyff.net>
Date: Thu, 7 Jan 2010 16:41:01 -0600
Subject: [PATCH] Changed website addresses.

---
 mRemoteV1/App/App.Info.vb                          | 14 +++++++-------
 mRemoteV1/ChangeLog.txt                            |  1 +
 .../mRemote_Announcement.txt}                      |  0
 mRemoteV1/mRemoteV1.vbproj                         |  4 +---
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename mRemoteV1/Resources/{Announcment/mRemote_Announcment.txt => Announcement/mRemote_Announcement.txt} (100%)

diff --git a/mRemoteV1/App/App.Info.vb b/mRemoteV1/App/App.Info.vb
index d44ca1b5a..494b1f088 100644
--- a/mRemoteV1/App/App.Info.vb
+++ b/mRemoteV1/App/App.Info.vb
@@ -3,10 +3,10 @@ Imports System.Environment
 Namespace App
     Namespace Info
         Public Class General
-            Public Shared ReadOnly URLHome As String = "http://www.mRemote.org/"
-            Public Shared ReadOnly URLDonate As String = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=felix%2edeimel%40gmail%2ecom&item_name=mRemote%20Donations&buyer_credit_promo_code=&buyer_credit_product_category=&buyer_credit_shipping_method=&buyer_credit_user_address_change=&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8"
-            Public Shared ReadOnly URLBugs As String = "http://bugs.mremote.org/"
-            Public Shared ReadOnly URLAnnouncement As String = "http://update.mRemote.org/mRemote_Announcment.txt"
+            Public Shared ReadOnly URLHome As String = "http://www.mRemoteNG.org/"
+            Public Shared ReadOnly URLDonate As String = "http://donate.mRemoteNG.org/"
+            Public Shared ReadOnly URLBugs As String = "http://bugs.mRemoteNG.org/"
+            Public Shared ReadOnly URLAnnouncement As String = "http://update.mRemoteNG.org/announcement.txt"
             Public Shared ReadOnly LogFile As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\mRemoteNG.log"
             Public Shared ReadOnly HomePath As String = My.Application.Info.DirectoryPath
             Public Shared EncryptionKey As String = "mR3m"
@@ -25,11 +25,11 @@ Namespace App
         End Class
 
         Public Class Update
-            Public Shared ReadOnly URL As String = "http://update.mRemote.org/"
+            Public Shared ReadOnly URL As String = "http://update.mRemoteNG.org/"
 #If DEBUG Then
-            Public Shared ReadOnly File As String = "mRemote_Update_Debug.txt"
+            Public Shared ReadOnly File As String = "update-debug.txt"
 #Else
-            Public Shared ReadOnly File As String = "mRemote_Update.txt"
+            Public Shared ReadOnly File As String = "update.txt"
 #End If
         End Class
 
diff --git a/mRemoteV1/ChangeLog.txt b/mRemoteV1/ChangeLog.txt
index 8cb1fa26a..93d20a799 100644
--- a/mRemoteV1/ChangeLog.txt
+++ b/mRemoteV1/ChangeLog.txt
@@ -7,6 +7,7 @@
 	%USERPROFILE%\Local Settings\Application Data\mRemoteNG\mRemoteNG.log
   Changed filename delimiter in title bar from pipe to dash
   Changed default format for saving screenshot images to PNG
+  Changed website addresses
 
 1.50:
   Added the following formats to the "Save Connections As" function:
diff --git a/mRemoteV1/Resources/Announcment/mRemote_Announcment.txt b/mRemoteV1/Resources/Announcement/mRemote_Announcement.txt
similarity index 100%
rename from mRemoteV1/Resources/Announcment/mRemote_Announcment.txt
rename to mRemoteV1/Resources/Announcement/mRemote_Announcement.txt
diff --git a/mRemoteV1/mRemoteV1.vbproj b/mRemoteV1/mRemoteV1.vbproj
index eed1a487a..ae5355e77 100644
--- a/mRemoteV1/mRemoteV1.vbproj
+++ b/mRemoteV1/mRemoteV1.vbproj
@@ -715,6 +715,7 @@
     <None Include="Resources\Icons_FamFamFam\News_Icon.ico" />
     <None Include="Resources\Images_FamFamFam\News.png" />
     <None Include="Resources\Images\vRD08R1.png" />
+    <Content Include="Resources\Announcement\mRemote_Announcement.txt" />
     <Content Include="Resources\Update\mRemote_Update.txt" />
     <Content Include="Help\Main.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -811,9 +812,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\Announcment\" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.