Fix some outdated wiki links

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 1593043ec9183837ba4c0de04836bf6ab3841746..ce97e2c655539a100a68fcc54fea3325d2d6e45c 100644 (file)
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -385,7 +385,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
       unset($attributes['multiple']);
       $extra = NULL;
     }
-    // @see http://wiki.civicrm.org/confluence/display/CRMDOC/crmDatepicker
+    // @see https://docs.civicrm.org/dev/en/latest/framework/ui/#date-picker
     if ($type == 'datepicker') {
       // Support minDate/maxDate properties
       if (isset($extra['minDate'])) {

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 581447c2b638f076ec39d8b293117bde9aba83fe..40dd3b09782ff88268e34fcffeddc28af162ed90 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -258,7 +258,7 @@ class CRM_Core_Resources {
    * Access var from javascript:
    * CRM.vars.myNamespace.foo // "bar"
    *
-   * @see http://wiki.civicrm.org/confluence/display/CRMDOC/Javascript+Reference
+   * @see https://docs.civicrm.org/dev/en/latest/standards/javascript/
    *
    * @param string $nameSpace
    *   Usually the name of your extension.

diff --git a/CRM/Upgrade/Page/Cleanup.php b/CRM/Upgrade/Page/Cleanup.php
index 7a746b7a8276fc28a56973280e211c1d360e25ee..ece1c2aa141d86ef6fb830966c38671d62a97b9b 100644 (file)
--- a/CRM/Upgrade/Page/Cleanup.php
+++ b/CRM/Upgrade/Page/Cleanup.php
@@ -38,7 +38,7 @@ class CRM_Upgrade_Page_Cleanup extends CRM_Core_Page {
     $postMessage = ts('You can <a href="%1">click here</a> to try running the 4.2 upgrade script again. <a href="%2" target="_blank">(Review upgrade documentation)</a>',
       [
         1 => CRM_Utils_System::url('civicrm/upgrade', 'reset=1'),
-        2 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Installation+and+Upgrades',
+        2 => CRM_Utils_System::docURL2('sysadmin/upgrade', TRUE),
       ]);
     $template->assign('postMessage', $postMessage);
 

diff --git a/ang/crmUtil.js b/ang/crmUtil.js
index ab460ab7e9c51a5f0e779449c1a8314cd77c17c3..bbdbe4652db4a0b882cc5f740d8f3f037a2bc2c0 100644 (file)
--- a/ang/crmUtil.js
+++ b/ang/crmUtil.js
@@ -3,7 +3,7 @@
   angular.module('crmUtil', CRM.angRequires('crmUtil'));
 
   // Angular implementation of CRM.api3
-  // @link http://wiki.civicrm.org/confluence/display/CRMDOC/AJAX+Interface#AJAXInterface-CRM.api3
+  // @link https://docs.civicrm.org/dev/en/latest/api/interfaces/#angularjs
   //
   // Note: To mock API results in unit-tests, override crmApi.backend, e.g.
   //   var apiSpy = jasmine.createSpy('crmApi');

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index bfff407843dc2e02e4723c866e431ecc48d8854d..7c7371131125d42848126a433d99fb0a0403c82a 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -56,6 +56,7 @@
     return result;
   }
 
+  // https://docs.civicrm.org/dev/en/latest/api/interfaces/#ajax
   CRM.api4 = function(entity, action, params, index) {
     return new Promise(function(resolve, reject) {
       if (typeof entity === 'string') {
@@ -88,7 +89,7 @@
 
   /**
    * AJAX api
-   * @link http://wiki.civicrm.org/confluence/display/CRMDOC/AJAX+Interface#AJAXInterface-CRM.api3
+   * @link https://docs.civicrm.org/dev/en/latest/api/interfaces/#ajax
    */
   CRM.api3 = function(entity, action, params, status) {
     if (typeof(entity) === 'string') {

diff --git a/js/crm.datepicker.js b/js/crm.datepicker.js
index 3a8eebbc9bdc8f3463df86e63bbf46397568ec36..d630834c5c0b4c4efce4132d1b10fa8bb4611e07 100644 (file)
--- a/js/crm.datepicker.js
+++ b/js/crm.datepicker.js
@@ -2,7 +2,7 @@
   "use strict";
 
   /**
-   * @see http://wiki.civicrm.org/confluence/display/CRMDOC/crmDatepicker
+   * @see https://docs.civicrm.org/dev/en/latest/framework/ui/#date-picker
    */
   $.fn.crmDatepicker = function(options) {
     return $(this).each(function() {

diff --git a/templates/CRM/common/civicrm.settings.php.template b/templates/CRM/common/civicrm.settings.php.template
index 6bdab4ec760b77550da0ab950ddeed1c58e4d30e..28102ccd78ea53dcb0d82a2282db83214304073d 100644 (file)
--- a/templates/CRM/common/civicrm.settings.php.template
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -235,7 +235,7 @@ if (!defined('CIVICRM_UF_BASEURL')) {
 }
 
 /**
- * Define any CiviCRM Settings Overrides per http://wiki.civicrm.org/confluence/display/CRMDOC/Override+CiviCRM+Settings
+ * Define any CiviCRM Settings Overrides per https://docs.civicrm.org/sysadmin/en/latest/customize/settings/
  *
  * Uncomment and edit the below as appropriate.
  */