Remove "unhelpful" and out-of-date help text

3 files changed, 2 insertions, 6 deletions

diff --git a/help_text.php b/help_text.php
index a17975d914..6beb39279d 100644
--- a/help_text.php
+++ b/help_text.php
@@ -1440,11 +1440,6 @@ case 'role':
 		'</dd>';
 	break;
 
-case 'search_include_ASSO':
-	$title=WT_I18N::translate('Associates');
-	$text=WT_I18N::translate('This option causes <b>webtrees</b> to show all individuals who are recorded as having an association relationship to the person or family that was found as a direct result of the search.  The inverse, where all persons or families are shown when a person found as a direct result of the search has an association relationship to these other persons or families, is not possible.<br /><br />Example:  Suppose person <b>A</b> is godparent to person <b>B</b>.  This relationship is recorded in the GEDCOM record of person <b>B</b> by means of an ASSO tag.  No corresponding tag exists in the GEDCOM record of person <b>A</b>.<br /><br />When this option is set to <b>Yes</b> and the Search results list includes <b>B</b>, <b>A</b> will be included automatically because of the ASSO tag in the GEDCOM record of <b>B</b>.  However, if the Search results list includes <b>A</b>, <b>B</b> will not be included automatically since there is no matching ASSO tag in the GEDCOM record of person <b>A</b>.');
-	break;
-
 case 'show_fact_sources':
 	$title=WT_I18N::translate('Show all sources');
 	$text=WT_I18N::translate('When this option is checked, you can see all Source or Note records for this person.  When this option is unchecked, Source or Note records that are associated with other facts for this person will not be shown.');
diff --git a/includes/old_messages.php b/includes/old_messages.php
index 4361ecb358..aeef1bdfbb 100644
--- a/includes/old_messages.php
+++ b/includes/old_messages.php
@@ -51,6 +51,7 @@ exit;
 /* I18N: This message is deleted in webtrees-1.4.2  */ WT_I18N::translate('This is the name of the SMTP mail server.  Example: <b>smtp.foo.bar.com</b>.<br /><br />Configuration values for some e-mail providers:<br /><br /><b>Gmail<br /></b><br /><b>Outgoing server (SMTP) name:</b> smtp.gmail.com<br /><b>SMTP Port:</b> 465 or 587<br /><b>Secure connection:</b> SSL<br /><br /><b>Hotmail<br /></b><br /><b>Outgoing server (SMTP) name:</b> smtp.live.com<br /><b>SMTP Port:</b> 25 or 587<br /><b>Secure connection:</b> TLS<br /><br /><b>Yahoo Mail Plus (currently a paid service)<br /></b><br /><b>Outgoing server (SMTP) name:</b> smtp.mail.yahoo.com<br /><b>SMTP Port:</b> 25');
 /* I18N: This message is deleted in webtrees-1.4.2  */ WT_I18N::translate('This is used in the "From:" header when sending mails.');
 /* I18N: This message is deleted in webtrees-1.4.2  */ WT_I18N::translate('This is used in the "Sender:" header when sending mails.  It is often the same as the "From:" header.');
+/* I18N: This message is deleted in webtrees-1.4.2  */ WT_I18N::translate('This option causes <b>webtrees</b> to show all individuals who are recorded as having an association relationship to the person or family that was found as a direct result of the search.  The inverse, where all persons or families are shown when a person found as a direct result of the search has an association relationship to these other persons or families, is not possible.<br /><br />Example:  Suppose person <b>A</b> is godparent to person <b>B</b>.  This relationship is recorded in the GEDCOM record of person <b>B</b> by means of an ASSO tag.  No corresponding tag exists in the GEDCOM record of person <b>A</b>.<br /><br />When this option is set to <b>Yes</b> and the Search results list includes <b>B</b>, <b>A</b> will be included automatically because of the ASSO tag in the GEDCOM record of <b>B</b>.  However, if the Search results list includes <b>A</b>, <b>B</b> will not be included automatically since there is no matching ASSO tag in the GEDCOM record of person <b>A</b>.');
 /* I18N: This message is deleted in webtrees-1.4.2  */ WT_I18N::translate('This option controls whether or not to show the Birth and Death details of an individual on charts.');
 /* I18N: This message is deleted in webtrees-1.4.2  */ WT_I18N::translate('This option enables online editing features for this database so that users with Edit privileges may update data online.');
 /* I18N: This message is deleted in webtrees-1.4.2  */ WT_I18N::translate('Transport Layer Security (TLS) and Secure Sockets Layer (SSL) are Internet data encryption protocols.<br /><br />TLS 1.0, 1.1 and 1.2 are standardized developments of SSL 3.0. TLS 1.0 and SSL 3.1 are equivalent. Further work on SSL is now done under the new name, TLS.<br /><br />If your SMTP Server requires the SSL protocol during login, you should select the <b>SSL</b> option. If your SMTP Server requires the TLS protocol during login, you should select the <b>TLS</b> option.');
diff --git a/search.php b/search.php
index 06be1a5e49..d0559042a2 100644
--- a/search.php
+++ b/search.php
@@ -128,7 +128,7 @@ echo '<div id="search-page">
 				echo ' value="yes" id="srnote" name="srnote">
 					<label for="srnote">' ,  WT_I18N::translate('Shared notes'), '</label>
 			</p></div>
-			<div class="label">' , WT_I18N::translate('Associates'), help_link('search_include_ASSO'), '</div>
+			<div class="label">' , WT_I18N::translate('Associates'), '</div>
 			<div class="value"><input type="checkbox" id="showasso" name="showasso" value="on"';
 				if ($controller->showasso == 'on') echo ' checked="checked"'; 
 			echo '><label for="showasso">' , WT_I18N::translate('Show related persons/families'), '</label></div>';