CRMDOC - Change various CRMDOCxx links to plain CRMDOC

Most of the source comments with documentation links should reflect current version.

For the "incremental upgrade" messages, I left the CRMDOCxx URLs in tact
because these messages could actually be version specific.

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 1357e61571756b48fa44ea80cb3835882e2c5052..4a4c1222bad055cf4299df53a232e02a7f232320 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -201,7 +201,7 @@ class CRM_Core_Resources {
    * From javascript:
    * CRM.myNamespace.foo // "bar"
    *
-   * @see http://wiki.civicrm.org/confluence/display/CRMDOC43/Javascript+Reference
+   * @see http://wiki.civicrm.org/confluence/display/CRMDOC/Javascript+Reference
    *
    * @param $settings array
    * @return CRM_Core_Resources

diff --git a/README.txt b/README.txt
index d002eb9df8d0a52b6914ec7ef91d0942c61fe2a7..2ce1ddd893dfa706799f77741fad2961666280f6 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -56,4 +56,4 @@ http://forum.civicrm.org/index.php/board,20.0.html
 
 Installing the latest developmental code requires some special steps. Full
 instructions are on the wiki:
-http://wiki.civicrm.org/confluence/display/CRMDOC43/Github+for+CiviCRM
+http://wiki.civicrm.org/confluence/display/CRMDOC/Github+for+CiviCRM

diff --git a/templates/CRM/common/jsortable.tpl b/templates/CRM/common/jsortable.tpl
index a3fe82721604d8abe5f56a88051adccef7e9027b..5678b8cf6d60d65daa62448fd21a090a6b04c8e6 100644 (file)
--- a/templates/CRM/common/jsortable.tpl
+++ b/templates/CRM/common/jsortable.tpl
@@ -26,7 +26,7 @@
 {literal}
 <script type="text/javascript">
 cj( function( ) {
-// for date sorting see http://wiki.civicrm.org/confluence/display/CRMDOC42/Sorting+Date+Fields+in+dataTables+Widget
+// for date sorting see http://wiki.civicrm.org/confluence/display/CRMDOC/Sorting+Date+Fields+in+dataTables+Widget
 var useAjax = {/literal}{if $useAjax}1{else}0{/if}{literal};
 
 var sourceUrl = '';

diff --git a/tests/phpunit/WebTest/Release/InstallScript.php b/tests/phpunit/WebTest/Release/InstallScript.php
index 32456c2d43daa14171cbbce1712acd969106a1a4..8b51861dca48b5024a4a7cec4844ef6a0fbd43a9 100644 (file)
--- a/tests/phpunit/WebTest/Release/InstallScript.php
+++ b/tests/phpunit/WebTest/Release/InstallScript.php
@@ -29,7 +29,7 @@ require_once 'ReleaseTestCase.php';
 // name of the class doesn't end with Test on purpose - this way this
 // webtest is not picked up by the suite, since it needs to run
 // on specially prepare sandbox
-// more details: http://wiki.civicrm.org/confluence/display/CRMDOC40/Release+testing+script+documentation
+// more details: http://wiki.civicrm.org/confluence/display/CRMDOC/Release+testing+script
 class WebTest_Release_InstallScript extends WebTest_Release_ReleaseTestCase {
 
   protected function setUp() {

diff --git a/tests/phpunit/WebTest/Release/ReleaseTestCase.php b/tests/phpunit/WebTest/Release/ReleaseTestCase.php
index fc22b1728a0092628b81e0cde6286422520a0e50..75bf439e5763c29aa735e0b78eb8628229ec619c 100644 (file)
--- a/tests/phpunit/WebTest/Release/ReleaseTestCase.php
+++ b/tests/phpunit/WebTest/Release/ReleaseTestCase.php
@@ -29,7 +29,7 @@ require_once 'CiviTest/CiviSeleniumTestCase.php';
 // name of the class doesn't end with Test on purpose - this way this
 // webtest is not picked up by the suite, since it needs to run
 // on specially prepare sandbox
-// more details: http://wiki.civicrm.org/confluence/display/CRMDOC40/Release+testing+script+documentation
+// more details: http://wiki.civicrm.org/confluence/display/CRMDOC/Release+testing+script
 class WebTest_Release_ReleaseTestCase extends CiviSeleniumTestCase {
 
   /**

diff --git a/tests/phpunit/WebTest/Release/UpgradeScript.php b/tests/phpunit/WebTest/Release/UpgradeScript.php
index 657815ad864ec0a1b91bfcfc3339cfbb3311c1ab..1d91607aa5b53f0ed94c68f98e01ba8fe168127d 100644 (file)
--- a/tests/phpunit/WebTest/Release/UpgradeScript.php
+++ b/tests/phpunit/WebTest/Release/UpgradeScript.php
@@ -29,7 +29,7 @@ require_once 'ReleaseTestCase.php';
 // name of the class doesn't end with Test on purpose - this way this
 // webtest is not picked up by the suite, since it needs to run
 // on specially prepare sandbox
-// more details: http://wiki.civicrm.org/confluence/display/CRMDOC40/Release+testing+script+documentation
+// more details: http://wiki.civicrm.org/confluence/display/CRMDOC/Release+testing+script
 class WebTest_Release_UpgradeScript extends WebTest_Release_ReleaseTestCase {
 
   protected function setUp() {

diff --git a/tools/extensions/org.civicrm.sms.clickatell/info.xml b/tools/extensions/org.civicrm.sms.clickatell/info.xml
index 825de6283ba26f90435fad00ee1d44e3830655f3..944b0d44a5b4968b363dc01bc3fd249032667eb6 100644 (file)
--- a/tools/extensions/org.civicrm.sms.clickatell/info.xml
+++ b/tools/extensions/org.civicrm.sms.clickatell/info.xml
@@ -6,7 +6,7 @@
   <description>Clickatell integration allows delivering short message service (SMS) messages through its Clickatell Gateway to mobile phone users.</description>
   <urls>
     <url desc="Main Extension Page">http://civicrm.org</url>
-    <url desc="Documentation">http://wiki.civicrm.org/confluence/display/CRMDOC43/Setting+up+a+SMS+Provider+for+CiviSMS</url>
+    <url desc="Documentation">http://wiki.civicrm.org/confluence/display/CRMDOC/Setting+up+a+SMS+Provider+for+CiviSMS</url>
     <url desc="Support">http://forum.civicrm.org</url>
     <url desc="Licensing">http://civicrm.org/licensing</url>
   </urls>

diff --git a/tools/extensions/org.civicrm.sms.twilio/info.xml b/tools/extensions/org.civicrm.sms.twilio/info.xml
index 643012959066e8bbdedd8448f955eaeee7e0dbd3..438e2c4412b40124e8b5958bac6944d5372e4640 100644 (file)
--- a/tools/extensions/org.civicrm.sms.twilio/info.xml
+++ b/tools/extensions/org.civicrm.sms.twilio/info.xml
@@ -6,7 +6,7 @@
   <description>Twilio integration allows delivering short message service (SMS) messages through its Twilio Gateway to mobile phone users.</description>
   <urls>
     <url desc="Main Extension Page">http://civicrm.org</url>
-    <url desc="Documentation">http://wiki.civicrm.org/confluence/display/CRMDOC43/Setting+up+a+SMS+Provider+for+CiviSMS</url>
+    <url desc="Documentation">http://wiki.civicrm.org/confluence/display/CRMDOC/Setting+up+a+SMS+Provider+for+CiviSMS</url>
     <url desc="Support">http://forum.civicrm.org</url>
     <url desc="Licensing">http://civicrm.org/licensing</url>
   </urls>