update authorities with new dontmerge info

Conflicts:
	en/manual.xml

diff --git a/en/manual.xml b/en/manual.xml
index df9eace..17169fc 100644 (file)
--- a/en/manual.xml
+++ b/en/manual.xml
@@ -28667,10 +28667,12 @@ location: [STAFF, ISO]</programlisting>Will block items with an itype code of
           </mediaobject>
         </screenshot>
 
-        <para>Once you've made the necessary edits, simply click 'Save' and if
-        you have the <link linkend="dontmerge">dontmerge</link> system
-        preference set to 'Do' the next time the <link linkend="mergeauthcron">merge_authorities.pl cronjob</link> runs it
-        will update all of the bib records that use that authority.</para>
+        <para>Once you've made the necessary edits, simply click 'Save' and <link
+            linkend="dontmerge">dontmerge</link> is set to 'Do', Koha will immediately update all of
+          the bib records linked to the authority with the new authority record's data. If dontmerge
+          is set to "Don't" then Koha won't edit bib records when changes are made to authorities,
+          rather, this is done later by the <link linkend="mergeauthcron">merge_authority.pl
+            cronjob</link>.</para>
 
         <para>To delete an authority record you first must make sure it's not
         linked to any bibliographic records. If it is not used by any