Updated links to prevent redirects and broken pages

README.md

@@ -14,16 +14,16 @@ For details read the [complete changelog](./core/docs/changelog.txt "complete ch
 
 Here's what you need to get started installing or upgrading MODX Revoluton:
 
-+ [Download MODX Revolution](http://modx.com/download/ "Download MODX")
-+ [What's required to run MODX Revolution](http://rtfm.modx.com/revolution/2.x/getting-started/server-requirements "Server Requirements - MODx Revolution 2.x - MODx Documentation")
-+ [How to install MODX Revolution](http://rtfm.modx.com/revolution/2.x/getting-started/installation/basic-installation "Basic Installation - MODx Revolution 2.x - MODx Documentation")
-+ [Install MODX via git](http://rtfm.modx.com/revolution/2.x/getting-started/installation/git-installation "Git Installation - MODx Revolution 2.x - MODx Documentation")
-+ [How to upgrade MODX Revolution](http://rtfm.modx.com/revolution/2.x/administering-your-site/upgrading-modx "Upgrading MODx - MODx Revolution 2.x - MODx Documentation")
-+ [Read the MODX Revolution Documentation](http://rtfm.modx.com/revolution/2.x/ "Home - MODx Revolution 2.x - MODx Documentation")
++ [Download MODX Revolution](https://modx.com/download)
++ [What's required to run MODX Revolution](https://docs.modx.com/3.x/en/getting-started/server-requirements)
++ [How to install MODX Revolution](https://docs.modx.com/3.x/en/getting-started/installation)
++ [Install MODX via git](https://docs.modx.com/3.x/en/getting-started/installation/git)
++ [How to upgrade from 2.x to 3.0](https://docs.modx.com/3.x/en/getting-started/upgrading-to-3.0)
++ [Read the MODX Documentation](https://docs.modx.com/3.x/en/index)
 
 ### Other Important Stuff
 
-MODX is only as good as it is because of many individual community members and users that take the time to [report issues and request new features](https://github.com/modxcms/revolution/issues "MODX Github Issues"). Make sure you [read the documentation](http://rtfm.modx.com/revolution/2.x/ "Home - MODx Revolution 2.x - MODx Documentation"), [post feedback and share your successes](http://forums.modx.com/board/?board=264 "MODX :: Revolution 2.2") in the MODX community forums. To join us in the quest for *Creative Freedom*, [become a Contributor](http://rtfm.modx.com/community/). You can [contribute using GitHub](http://rtfm.modx.com/community/contribute/using-git-and-github/ "Contribute to MODX via GitHub")
+MODX is only as good as it is because of many individual community members and users that take the time to [report issues and request new features](https://github.com/modxcms/revolution/issues "MODX Github Issues"). Make sure you [read the documentation](https://docs.modx.com/3.x/en/index), [post feedback and share your successes](https://community.modx.com) in the MODX community forums. To join us in the quest for *Creative Freedom*, [become a Contributor](https://docs.modx.org/3.x/en/contribute). You can [contribute using GitHub](https://docs.modx.com/current/en/contribute/code/git-github)
 
 On behalf of the entire MODX Team,
 

composer.json

@@ -31,7 +31,7 @@
         }
     ],
     "support": {
-        "docs": "https://rtfm.modx.com/revolution/2.x/",
+        "docs": "https://docs.modx.com/3.x/en/index",
         "email": "help@modx.com",
         "forum": "https://forums.modx.com/",
         "irc": "irc://irc.freenode.org/modx",

core/lexicon/en/configcheck.inc.php

@@ -26,7 +26,7 @@
 If your MODX installation is running on a Apache webserver
 you should at least set up the .htaccess file inside the core folder <em>[[+fileLocation]]</em>.
 This can be easily done by renaming the existing ht.access example file there to .htaccess.
-<p>There are other methods and webservers you may use, please read the <a href="https://rtfm.modx.com/revolution/2.x/administering-your-site/security/hardening-modx-revolution">Hardening MODX Guide</a>
+<p>There are other methods and webservers you may use, please read the <a href="https://docs.modx.com/3.x/en/getting-started/maintenance/securing-modx">Hardening MODX Guide</a>
 for further information about securing your site.</p>
 If you setup everything correctly, browsing e.g. to the <a href="[[+checkUrl]]" target="_blank">Changelog</a>
 should give you a 403 (permission denied) or better a 404 (not found). If you can see the changelog

core/lexicon/en/formcustomization.inc.php

@@ -35,7 +35,7 @@
 $_lang['filter_by_search'] = 'Search...';
 $_lang['for_parent'] = 'For Parent';
 $_lang['for_parent_desc'] = 'Check this when you want this rule to apply to the parent. Only use with Resources or objects with a `parent` field. Useful for the "create" page of Resources.';
-$_lang['form_customization_msg'] = 'Here is a list of currently applied Rules. More information on Rules and Form Customization can be found <a href="http://rtfm.modx.com/display/revolution20/Customizing+the+Manager" target="_blank">here</a>. Please note that improper Rules might cause problems with your MODX Revolution installation. Inactive Rules are faded gray.';
+$_lang['form_customization_msg'] = 'Here is a list of currently applied Rules. More information on Rules and Form Customization can be found <a href="https://docs.modx.com/3.x/en/building-sites/client-proofing/form-customization" target="_blank">here</a>. Please note that improper Rules might cause problems with your MODX Revolution installation. Inactive Rules are faded gray.';
 $_lang['form_rules'] = 'Form Rules';
 $_lang['import'] = 'Import';
 $_lang['import_from_xml'] = 'Import New Set from XML';

core/lexicon/en/login.inc.php

@@ -15,7 +15,7 @@
 $_lang['login_blocked_too_many_attempts'] = 'You have been blocked due to too many failed login attempts.';
 $_lang['login_button'] = 'Login';
 $_lang['login_cannot_locate_account'] = 'The username or password you entered is incorrect. Please check the username, re-type the password, and try again.';
-$_lang['login_copyright'] = '&copy; 2005-[[+current_year]] by <a href="http://modx.com/about/" target="_blank">MODX, LLC</a>. MODX Revolution&trade; is licensed under the GPLv2 or later.';
+$_lang['login_copyright'] = '&copy; 2005-[[+current_year]] by <a href="https://modx.com/about/company" target="_blank">MODX, LLC</a>. MODX Revolution&trade; is licensed under the GPLv2 or later.';
 $_lang['login_email_label'] = 'Account Email:';
 $_lang['login_err_unknown'] = 'An unknown error occurred while trying to log in.';
 $_lang['login_forget_your_login'] = 'Forgot your password?';

manager/controllers/default/dashboard/widget.updates.php

@@ -16,7 +16,7 @@ class modDashboardWidgetUpdates extends modDashboardWidgetInterface
     /** @var modX $modx */
     public $modx;
     public $latest_url = 'https://raw.githubusercontent.com/modxcms/revolution/3.x/_build/build.xml';
-    public $download_url = 'http://modx.com/download/latest/';
+    public $download_url = 'https://modx.com/download/latest';
     public $updatesCacheExpire = 3600;
 
 

setup/lang/en/default.inc.php

@@ -154,7 +154,7 @@
 $_lang['modx_configuration_file'] = 'MODX configuration file';
 $_lang['modx_err_instantiate'] = 'Could not instantiate the MODX class.';
 $_lang['modx_err_instantiate_mgr'] = 'Could not initialize the MODX manager context.';
-$_lang['modx_footer1'] = '&copy; 2005-[[+current_year]] the <a href="http://www.modx.com/" onclick="window.open(this.href); return false;" onkeypress="window.open(this.href); return false;">MODX</a> Content Management Framework (CMF) project. All rights reserved. MODX is licensed under the GNU GPL.';
+$_lang['modx_footer1'] = '&copy; 2005-[[+current_year]] the <a href="https://modx.com/" onclick="window.open(this.href); return false;" onkeypress="window.open(this.href); return false;">MODX</a> Content Management Framework (CMF) project. All rights reserved. MODX is licensed under the GNU GPL.';
 $_lang['modx_footer2'] = 'MODX is free software.  We encourage you to be creative and make use of MODX in any way you see fit. Just make sure that if you do make changes and decide to redistribute your modified MODX, that you keep the source code free!';
 $_lang['modx_install'] = 'MODX Installation';
 $_lang['modx_install_complete'] = 'MODX Installation Complete';

setup/templates/base_resource.tpl

@@ -3,14 +3,14 @@
 
 <h2>New to&nbsp;MODX?</h2>
 
-<p>Pages on a MODX site are called <a href="https://rtfm.modx.com/revolution/2.x/making-sites-with-modx/structuring-your-site/resources">Resources</a>, and are visible on the left-hand side of the manager in the Resources tab. Resources can be nested under other resources, making it easy to create a tree of resources. There are different types of resources for different use&nbsp;cases.</p>
+<p>Pages on a MODX site are called <a href="https://docs.modx.com/3.x/en/building-sites/resources">Resources</a>, and are visible on the left-hand side of the manager in the Resources tab. Resources can be nested under other resources, making it easy to create a tree of resources. There are different types of resources for different use&nbsp;cases.</p>
 
 <p>Building your website is done through a combination of <b>Templates</b>, <b>Template Variables</b>, <b>Chunks</b>, <b>Snippets</b> and <b>Plugins</b>. Collectively these are known as <b>Elements</b>, and can also be found in the left-hand side of the manager, in the Elements&nbsp;tab.</p>
 
-<p><a href="https://rtfm.modx.com/revolution/2.x/making-sites-with-modx/structuring-your-site/templates">Templates</a> contain the outer markup of any page. Each resource can only be assigned to a single template at a time. By adding <a href="https://rtfm.modx.com/revolution/2.x/making-sites-with-modx/customizing-content/template-variables">Template Variables</a> to a template, you can add custom fields for any resource using that particular&nbsp;template.</p>
+<p><a href="https://docs.modx.com/3.x/en/building-sites/elements/templates">Templates</a> contain the outer markup of any page. Each resource can only be assigned to a single template at a time. By adding <a href="https://docs.modx.com/3.x/en/building-sites/elements/template-variables">Template Variables</a> to a template, you can add custom fields for any resource using that particular&nbsp;template.</p>
 
-<p>With <a href="https://rtfm.modx.com/revolution/2.x/making-sites-with-modx/structuring-your-site/chunks">Chunks</a> you can share parts of the markup, such as a header, across different templates. <a href="https://rtfm.modx.com/revolution/2.x/making-sites-with-modx/structuring-your-site/using-snippets">Snippets</a> are pieces of PHP that return dynamic content, such as summaries of other resources or the current date. With snippets, you will often use Chunks to mark up the pieces of content it returns, instead of mixing the PHP and&nbsp;HTML.</p>
+<p>With <a href="https://docs.modx.com/3.x/en/building-sites/elements/chunks">Chunks</a> you can share parts of the markup, such as a header, across different templates. <a href="https://docs.modx.com/3.x/en/building-sites/elements/snippets">Snippets</a> are pieces of PHP that return dynamic content, such as summaries of other resources or the current date. With snippets, you will often use Chunks to mark up the pieces of content it returns, instead of mixing the PHP and&nbsp;HTML.</p>
 
-<p>Finally, <a href="https://rtfm.modx.com/revolution/2.x/developing-in-modx/basic-development/plugins">Plugins</a> enable more advanced features by hooking into the extensive events system provided by&nbsp;MODX.</p>
+<p>Finally, <a href="https://docs.modx.com/3.x/en/building-sites/elements/plugins">Plugins</a> enable more advanced features by hooking into the extensive events system provided by&nbsp;MODX.</p>
 
-<p>To learn more about MODX, be sure to check out the <a href="https://rtfm.modx.com/revolution/2.x/getting-started">Getting Started</a> section in the official&nbsp;documentation.</p>
+<p>To learn more about MODX, be sure to check out the <a href="https://docs.modx.com/3.x/en/getting-started">Getting Started</a> section in the official&nbsp;documentation.</p>

setup/templates/base_template.tpl

@@ -239,7 +239,7 @@
 </head>
 <body>
 
-<a href="http://www.modx.com" title="Modx" class="logo" target="_blank">MODX</a>
+<a href="https://modx.com" title="Modx" class="logo" target="_blank">MODX</a>
 
 <div class="container">
     <section>
@@ -250,35 +250,35 @@
         <a href="[[++manager_url]]" title="Your MODX manager" class="cta-button">Go to the&nbsp;manager</a>
         <h3>Learn more about&nbsp;MODX</h3>
         <ul>
-            <li><a href="https://rtfm.modx.com/revolution/2.x/">Official&nbsp;Documentation</a></li>
-            <li><a href="https://rtfm.modx.com/revolution/2.x/administering-your-site/using-friendly-urls">Using Friendly&nbsp;URLs</a></li>
-            <li><a href="https://rtfm.modx.com/revolution/2.x/developing-in-modx/advanced-development/package-management/">Package&nbsp;Management</a></li>
-            <li><a href="http://modx.com/blog/">Official MODX&nbsp;Blog</a></li>
+            <li><a href="https://docs.modx.com/3.x/en/index">Official&nbsp;Documentation</a></li>
+            <li><a href="https://docs.modx.com/3.x/en/getting-started/friendly-urls">Using Friendly&nbsp;URLs</a></li>
+            <li><a href="https://docs.modx.com/current/en/building-sites/extras">Package&nbsp;Management</a></li>
+            <li><a href="https://modx.com/blog/">Official MODX&nbsp;Blog</a></li>
             <li><a href="http://www.discovermodx.com/">Discover&nbsp;MODX</a></li>
             <li><a href="https://modx.today">MODX.today</a></li>
         </ul>
 
         <h3>Get help!</h3>
         <ul>
-            <li><a href="http://forums.modx.com/">Official MODX&nbsp;Forums</a></li>
+            <li><a href="https://community.modx.com">Official MODX&nbsp;Forums</a></li>
             <li><a href="https://modx.org/">MODX on&nbsp;Slack</a></li>
             <li><a href="https://twitter.com/modx">MODX on&nbsp;Twitter</a></li>
             <li><a href="https://www.facebook.com/modxcms">MODX on&nbsp;Facebook</a></li>
-            <li><a href="http://modx.com/professionals/">Find a MODX&nbsp;Professional</a></li>
+            <li><a href="https://modx.com/professionals/">Find a MODX&nbsp;Professional</a></li>
         </ul>
     </aside>
     <div class="companies">
         <h3>Extend MODX with&nbsp;Extras</h3>
         <ul>
-            <li class="modxextras"><a href="http://modx.com/extras/" title="MODX extras" target="_blank">MODX&nbsp;extras</a></li>
+            <li class="modxextras"><a href="https://modx.com/extras/" title="MODX extras" target="_blank">MODX&nbsp;extras</a></li>
             <li class="modmore"><a href="https://www.modmore.com/extras/" title="modmore.com" target="_blank">modmore.com</a></li>
             <li class="modstore"><a href="https://modstore.pro/" title="modstore.pro" target="_blank">modstore.pro</a></li>
             <li class="extrasio"><a href="https://extras.io/extras/" title="Extras.io" target="_blank">Extras.io</a></li>
         </ul>
     </div>
 </div>
 <footer class="disclaimer">
-    <p>&copy; 2005-present the <a href="http://www.modx.com/" target="_blank">MODX</a> Content Management Framework (CMF) project. All rights reserved. MODX is licensed under the GNU&nbsp;GPL.</p>
+    <p>&copy; 2005-present the <a href="https://modx.com" target="_blank">MODX</a> Content Management Framework (CMF) project. All rights reserved. MODX is licensed under the GNU&nbsp;GPL.</p>
 </footer>
 
 <script>

setup/templates/findcore.php

@@ -113,7 +113,7 @@
 <div id="footer">
     <div id="footer-inner">
     <div class="container_12">
-        <p>&copy; 2005-<?php echo date('Y'); ?> the <a href="http://www.modx.com/" onclick="window.open(this.href); return false;" onkeypress="window.open(this.href); return false;"  style="color: green; text-decoration:underline">MODX</a> Content Management Framework (CMF) project. All rights reserved. MODX is licensed under the GNU GPL.</p>
+        <p>&copy; 2005-<?php echo date('Y'); ?> the <a href="https://modx.com/" onclick="window.open(this.href); return false;" onkeypress="window.open(this.href); return false;"  style="color: green; text-decoration:underline">MODX</a> Content Management Framework (CMF) project. All rights reserved. MODX is licensed under the GNU GPL.</p>
         <p>MODX is free software.  We encourage you to be creative and make use of MODX in any way you see fit. Just make sure that if you do make changes and decide to redistribute your modified MODX, that you keep the source code free!</p>
     </div>
     </div>

setup/templates/index.tpl

@@ -32,7 +32,7 @@
     </tr>
     <tr class="fancyRow2">
       <td class="border-top-bottom smallText" colspan="2">
-        <p style="padding: 5px 10px;">&copy; 2005-{'Y'|date} the <a href="http://www.modx.com/" target="_blank" style="color: green; text-decoration:underline">MODX</a> Content Mangement Framework (CMF) project. All rights reserved. MODX is licensed under the GNU GPL.</p>
+        <p style="padding: 5px 10px;">&copy; 2005-{'Y'|date} the <a href="https://modx.com/" target="_blank" style="color: green; text-decoration:underline">MODX</a> Content Mangement Framework (CMF) project. All rights reserved. MODX is licensed under the GNU GPL.</p>
         <p style="padding: 5px 10px;">MODX is free software. We encourage you to be creative and make use of MODX in any way you see fit. Just make sure that if you do make changes and decide to redistribute your modified MODX, that you keep the source code free!</p>
       </td>
     </tr>