From 014780335b16e5763d972deb1417dafc82b966f2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 17 Aug 2013 16:41:54 -0700
Subject: [PATCH] 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.
---
 CRM/Core/Resources.php                               | 2 +-
 README.txt                                           | 2 +-
 templates/CRM/common/jsortable.tpl                   | 2 +-
 tests/phpunit/WebTest/Release/InstallScript.php      | 2 +-
 tests/phpunit/WebTest/Release/ReleaseTestCase.php    | 2 +-
 tests/phpunit/WebTest/Release/UpgradeScript.php      | 2 +-
 tools/extensions/org.civicrm.sms.clickatell/info.xml | 2 +-
 tools/extensions/org.civicrm.sms.twilio/info.xml     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 1357e61571..4a4c1222ba 100644
--- 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 d002eb9df8..2ce1ddd893 100644
--- 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 a3fe827216..5678b8cf6d 100644
--- 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 32456c2d43..8b51861dca 100644
--- 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 fc22b1728a..75bf439e57 100644
--- 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 657815ad86..1d91607aa5 100644
--- 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 825de6283b..944b0d44a5 100644
--- 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 6430129590..438e2c4412 100644
--- 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>
-- 
2.25.1