From 6bdb58ff0557b46bb4dd9089ac1199a4ac66fb47 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 14 May 2020 02:44:47 -0700
Subject: [PATCH] Core.setting.php - Tweak prose for defaultExternUrl, again

---
 settings/Core.setting.php                | 3 ++-
 templates/CRM/Admin/Form/Setting/Url.tpl | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index e60ce0a2f9..114158509d 100644
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -251,9 +251,10 @@ return [
     ],
     'default' => 'router',
     'add' => '5.27',
-    'title' => ts('Extern URL Style (Transition Support)'),
+    'title' => ts('Extern URL Style'),
     'is_domain' => 1,
     'is_contact' => 0,
+    'description' => ts('This setting provides transitional support. It should be set to "Prefer normal router." If your deployment requires "Prefer standalone script", then please ensure that the issue is tracked in <code>lab.civicrm.org</code>.'),
     'help_text' => NULL,
     'options' => [
       'standalone' => ts('Prefer standalone scripts'),
diff --git a/templates/CRM/Admin/Form/Setting/Url.tpl b/templates/CRM/Admin/Form/Setting/Url.tpl
index ab3cd178b9..c6df140ff6 100644
--- a/templates/CRM/Admin/Form/Setting/Url.tpl
+++ b/templates/CRM/Admin/Form/Setting/Url.tpl
@@ -82,7 +82,8 @@
             {$form.defaultExternUrl.label} {help id='id-defaultExternUrl'}
         </td>
         <td>
-            {$form.defaultExternUrl.html}
+            {$form.defaultExternUrl.html}<br/>
+            <p class="description font-red">{ts}{$settings_fields.defaultExternUrl.description}{/ts}</p>
         </td>
     </tr>
 </table>
-- 
2.25.1