From ac93b5300aa6b91a99d3c08f2a8b97efde105881 Mon Sep 17 00:00:00 2001
From: Stephen Dade <stephen_dade@hotmail.com>
Date: Fri, 19 Jun 2020 09:40:44 +1000
Subject: [PATCH] Update MAVProxy documentation links

---
 MAVProxy/modules/mavproxy_help.py | 4 ++--
 README.md                         | 2 +-
 setup.py                          | 2 +-
 windows/mavproxy.iss              | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MAVProxy/modules/mavproxy_help.py b/MAVProxy/modules/mavproxy_help.py
index 8d49f59877..75113ce135 100644
--- a/MAVProxy/modules/mavproxy_help.py
+++ b/MAVProxy/modules/mavproxy_help.py
@@ -66,7 +66,7 @@ def __init__(self, mpstate):
         if mp_util.has_wxpython:
             self.menu_added_console = False
             self.menu = MPMenuSubMenu('Help',
-                                  items=[MPMenuItem('MAVProxy website', 'MAVProxy website', '', handler=MPMenuOpenWeblink('http://ardupilot.github.io/MAVProxy/')),
+                                  items=[MPMenuItem('MAVProxy website', 'MAVProxy website', '', handler=MPMenuOpenWeblink('https://ardupilot.org/mavproxy/index.html')),
                                          MPMenuItem('Check for Updates', 'Check for Updates', '', handler=MPMenuChildMessageDialog(title="Updates", message=self.newversion)),
                                          MPMenuItem('About', 'About', '', handler=MPMenuChildMessageDialog(title="About MAVProxy", message=self.about_string()))])
 
@@ -94,7 +94,7 @@ def cmd_help(self, args):
         if args[0] == "about":
             print(self.about_string())
         elif args[0] == "site":
-            print("See http://ardupilot.github.io/MAVProxy/ for documentation")
+            print("See https://ardupilot.org/mavproxy/index.html for documentation")
         else:
             self.print_usage()
 
diff --git a/README.md b/README.md
index db96ffa4af..61d686a785 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ MAVProxy
 
 This is a MAVLink ground station written in python. 
 
-Please see http://ardupilot.github.io/MAVProxy/ for more information
+Please see https://ardupilot.org/mavproxy/index.html for more information
 
 This ground station was developed as part of the CanberraUAV OBC team
 entry
diff --git a/setup.py b/setup.py
index 6f954d5ccb..9ce27f2104 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ def package_files(directory):
 subdirectory for some example modules. MAVProxy was developed by CanberraUAV
 for use in the 2012 Outback Challenge, and includes a module for the
 CanberraUAV search and rescue system. See
-http://ardupilot.github.io/MAVProxy/ for more information
+https://ardupilot.org/mavproxy/index.html for more information
 on how to use MAVProxy.''',
       url='https://github.com/ArduPilot/MAVProxy',
       author='Andrew Tridgell',
diff --git a/windows/mavproxy.iss b/windows/mavproxy.iss
index bac0db9525..bee8f48aa2 100644
--- a/windows/mavproxy.iss
+++ b/windows/mavproxy.iss
@@ -6,7 +6,7 @@
 ; Note MyAppVersion is defined in MAVProxyWinBuild.bat
 ; #define MyAppVersion {code:GetVersion}
 #define MyAppPublisher "Andrew Tridgell"
-#define MyAppURL "http://ardupilot.github.io/MAVProxy"
+#define MyAppURL "https://ardupilot.org/mavproxy/index.html"
 #define MyAppExeName "mavproxy.exe"
 
 [Setup]
@@ -53,7 +53,7 @@ Source: "..\windows\Startup Examples\MAVProxyMultiOutput.bat"; DestDir: "{app}\E
 Name: "{group}\{#MyAppName} (No GUI)"; Filename: "{app}\{#MyAppExeName}"
 Name: "{group}\MAVExplorer"; Filename: "{app}\MAVExplorer.exe"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-Name: "{group}\Documentation"; Filename: "http://ardupilot.github.io/MAVProxy/"
+Name: "{group}\Documentation"; Filename: "https://ardupilot.org/mavproxy/index.html"
 Name: "{group}\Startup Examples"; Filename: "{app}\Examples"
 Name: "{group}\Ardupilot MAVProxy Forum"; Filename: "http://discuss.ardupilot.org/c/ground-control-software/mavproxy"
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Parameters: "--map --console --load-module=graph"
@@ -164,4 +164,4 @@ begin
     RemovePath(ExpandConstant('{app}'));
     RefreshEnvironment();
   end;
-end;
\ No newline at end of file
+end;