Merge pull request #4906 from eileenmcnaughton/minor-tidies

[civicrm-core.git] / settings / Address.setting.php

diff --git a/settings/Address.setting.php b/settings/Address.setting.php
index 3995e66d8031e0cfd9a3e61709a71af7e9fe0b8f..32bf646f82211b85e11bf99125bf178d7cf2081f 100644 (file)
--- a/settings/Address.setting.php
+++ b/settings/Address.setting.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -35,20 +35,20 @@
 /*
  * Settings metadata file
  */
-return array (
+return array(
   'address_standardization_provider' => array(
     'group_name' => 'Address Preferences',
     'group' => 'address',
     'name' => 'address_standardization_provider',
     'type' => 'String',
     'html_type' => 'Select',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'title' => 'Address Standardization Provider.',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => 'CiviCRM includes an optional plugin for interfacing with the United States Postal Services (USPS) Address Standardization web service. You must register to use the USPS service at https://www.usps.com/business/webtools-address-information.htm. If you are approved, they will provide you with a User ID and the URL for the service. Plugins for other address standardization services may be available from 3rd party developers. If installed, they will be included in the drop-down below. ',
+    'description' => NULL,
+    'help_text' => 'CiviCRM includes an optional plugin for interfacing with the United States Postal Services (USPS) Address Standardization web service. You must register to use the USPS service at https://www.usps.com/business/web-tools-apis/address-information.htm. If you are approved, they will provide you with a User ID and the URL for the service. Plugins for other address standardization services may be available from 3rd party developers. If installed, they will be included in the drop-down below. ',
   ),
   'address_standardization_userid' => array(
     'group_name' => 'Address Preferences',
@@ -56,13 +56,13 @@ return array (
     'name' => 'address_standardization_userid',
     'type' => 'String',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'title' => 'Web service user ID',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),
   'address_standardization_url' => array(
     'group_name' => 'Address Preferences',
@@ -70,13 +70,13 @@ return array (
     'name' => 'address_standardization_url',
     'type' => 'Text',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
-    'title' => 'Web service url',
+    'title' => 'Web Service URL',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => 'Web service URL.',
+    'description' => NULL,
+    'help_text' => 'Web Service URL',
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
 );