16 files changed, 4 insertions, 64 deletions
diff --git a/source/text/shared/00/00000004.xhp b/source/text/shared/00/00000004.xhp
index 1ea328e6dd..09418ceed5 100644
--- a/source/text/shared/00/00000004.xhp
+++ b/source/text/shared/00/00000004.xhp
@@ -40,10 +40,6 @@
 </variable></paragraph>
 </section>
 
-<section id="agentoff">
-<paragraph role="tip" id="par_id56935339" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
-</section>
-
 <section id="sytextfarbe">
 <table id="tbl_id3156421">
 <tablerow>
diff --git a/source/text/shared/00/00000099.xhp b/source/text/shared/00/00000099.xhp
index 147d4ed551..fc6c7a8a93 100644
--- a/source/text/shared/00/00000099.xhp
+++ b/source/text/shared/00/00000099.xhp
@@ -45,9 +45,6 @@
 </section>
 <paragraph role="paragraph" id="par_id3154408" xml-lang="en-US" l10n="U" oldref="85"><variable id="winmanager">The availability of this function depends on your X Window Manager. 
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:HelperDialog" id="bm_id562099" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:HelperDialog" id="bm_id3153681" localize="false"/>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>$[officename] - General - Help Agent</emph> in the Options dialog box.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelpTip" id="bm_id2449436" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelpTip" id="bm_id3148491" localize="false"/>
 <paragraph role="paragraph" id="par_idN10665" xml-lang="en-US" l10n="CHG"><ahelp hid=".uno:HelpTip">Enables the display of icon names at the mouse pointer and other Help contents.</ahelp></paragraph>
diff --git a/source/text/shared/05/00000120.xhp b/source/text/shared/05/00000120.xhp
index 07e2d03feb..240af804a1 100644
--- a/source/text/shared/05/00000120.xhp
+++ b/source/text/shared/05/00000120.xhp
@@ -22,26 +22,19 @@
 	
 <meta>
       <topic id="textshared0500000120xml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Help Agent, Tips and Extended Tips</title>
+         <title xml-lang="en-US" id="tit">Tips and Extended Tips</title>
          <filename>/text/shared/05/00000120.xhp</filename>
       </topic>
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150672"><bookmark_value>Help; Help tips</bookmark_value>
       <bookmark_value>tooltips; help</bookmark_value>
-      <bookmark_value>Help Agent; help</bookmark_value>
-      <bookmark_value>Clippy, see Help Agent</bookmark_value>
 </bookmark>
 <paragraph xml-lang="en-US" id="par_id3150672" role="paragraph" l10n="E" oldref="11"
                  localize="false"/>
-      <paragraph xml-lang="en-US" id="hd_id3155599" role="heading" level="1" l10n="U" oldref="1"><variable id="00000120"><link href="text/shared/05/00000120.xhp" name="Help Agent, Tips and Extended Tips">Help Agent, Tips and Extended Tips</link>
+      <paragraph xml-lang="en-US" id="hd_id3155599" role="heading" level="1" l10n="U" oldref="1"><variable id="00000120"><link href="text/shared/05/00000120.xhp" name="Tips and Extended Tips">Tips and Extended Tips</link>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3148520" role="paragraph" l10n="CHG" oldref="2">The Help Agent, Tips, and Extended Tips provide help while you work. </paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3147285" role="heading" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
-      <paragraph xml-lang="en-US" id="par_idN10634" role="tip" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task. To disable the Help Agent choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
-</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
-      <embed href="text/shared/00/00000004.xhp#agentoff"/>
+      <paragraph xml-lang="en-US" id="par_id3148520" role="paragraph" l10n="CHG" oldref="2">Tips and Extended Tips provide help while you work. </paragraph>
       <paragraph xml-lang="en-US" id="hd_id3149140" role="heading" level="2" l10n="U" oldref="3">Tips</paragraph>
       <paragraph xml-lang="en-US" id="par_id3157896" role="paragraph" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153910" role="paragraph" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
@@ -60,4 +53,4 @@
          <embed href="text/shared/05/00000150.xhp#doc_title"/>
       </section>
    </body>
-</helpdocument>
-\ No newline at end of file
+</helpdocument>
diff --git a/source/text/shared/autokorr/01000000.xhp b/source/text/shared/autokorr/01000000.xhp
index cc8c9da60e..563161300d 100644
--- a/source/text/shared/autokorr/01000000.xhp
+++ b/source/text/shared/autokorr/01000000.xhp
@@ -39,9 +39,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/02000000.xhp b/source/text/shared/autokorr/02000000.xhp
index fa8a2182ff..db6f613186 100644
--- a/source/text/shared/autokorr/02000000.xhp
+++ b/source/text/shared/autokorr/02000000.xhp
@@ -39,9 +39,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/03000000.xhp b/source/text/shared/autokorr/03000000.xhp
index a58463df21..7e2f556e0a 100644
--- a/source/text/shared/autokorr/03000000.xhp
+++ b/source/text/shared/autokorr/03000000.xhp
@@ -39,9 +39,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/04000000.xhp b/source/text/shared/autokorr/04000000.xhp
index 183ee1b5f2..0573ea46a4 100644
--- a/source/text/shared/autokorr/04000000.xhp
+++ b/source/text/shared/autokorr/04000000.xhp
@@ -40,9 +40,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/05000000.xhp b/source/text/shared/autokorr/05000000.xhp
index 1a565695ef..e3c9756401 100644
--- a/source/text/shared/autokorr/05000000.xhp
+++ b/source/text/shared/autokorr/05000000.xhp
@@ -38,9 +38,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/06000000.xhp b/source/text/shared/autokorr/06000000.xhp
index 010a88276c..4112599ea9 100644
--- a/source/text/shared/autokorr/06000000.xhp
+++ b/source/text/shared/autokorr/06000000.xhp
@@ -38,9 +38,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokotyafz"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/07000000.xhp b/source/text/shared/autokorr/07000000.xhp
index 8aee88cde1..c4c08b5dfa 100644
--- a/source/text/shared/autokorr/07000000.xhp
+++ b/source/text/shared/autokorr/07000000.xhp
@@ -38,9 +38,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokotyafz"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/08000000.xhp b/source/text/shared/autokorr/08000000.xhp
index 516fbbc040..e139360bac 100644
--- a/source/text/shared/autokorr/08000000.xhp
+++ b/source/text/shared/autokorr/08000000.xhp
@@ -38,9 +38,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/09000000.xhp b/source/text/shared/autokorr/09000000.xhp
index 5a74b4dde7..e9057baf42 100644
--- a/source/text/shared/autokorr/09000000.xhp
+++ b/source/text/shared/autokorr/09000000.xhp
@@ -38,9 +38,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/10000000.xhp b/source/text/shared/autokorr/10000000.xhp
index 15d62afe3c..f3ca15a831 100644
--- a/source/text/shared/autokorr/10000000.xhp
+++ b/source/text/shared/autokorr/10000000.xhp
@@ -38,9 +38,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/12000000.xhp b/source/text/shared/autokorr/12000000.xhp
index de3e433ddf..9dbb7ee2d2 100644
--- a/source/text/shared/autokorr/12000000.xhp
+++ b/source/text/shared/autokorr/12000000.xhp
@@ -35,9 +35,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/autokorr/13000000.xhp b/source/text/shared/autokorr/13000000.xhp
index 8a1c79f069..6b1f7c286b 100644
--- a/source/text/shared/autokorr/13000000.xhp
+++ b/source/text/shared/autokorr/13000000.xhp
@@ -38,9 +38,6 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
-
-<embed href="text/shared/00/00000004.xhp#agentoff"/>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/source/text/shared/optionen/01010600.xhp b/source/text/shared/optionen/01010600.xhp
index 5b20613153..fd3e980b39 100644
--- a/source/text/shared/optionen/01010600.xhp
+++ b/source/text/shared/optionen/01010600.xhp
@@ -30,7 +30,6 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155450"><bookmark_value>opening; dialog settings</bookmark_value>
       <bookmark_value>saving; dialog settings</bookmark_value>
       <bookmark_value>years; 2-digit options</bookmark_value>
-      <bookmark_value>Help Agent;options</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/OptGeneralPage" id="bm_id3539840" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3155450" role="paragraph" l10n="E" oldref="42"
@@ -51,15 +50,6 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/exthelp" id="bm_id1425519" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="3" l10n="NEW">Extended tips</paragraph>
       <paragraph xml-lang="en-US" id="par_idN106FA" role="paragraph" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/helpagent" id="bm_id1998657" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154138" role="heading" level="3" l10n="CHG"
-                 oldref="26">Help Agent</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145174" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="cui/ui/optgeneralpage/helpagent">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/resethelpagent" id="bm_id7073885" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="CHG"
-                 oldref="30">Reset Help Agent</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="cui/ui/optgeneralpage/resethelpagent">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3152577" role="heading" level="2" l10n="CHG"
                  oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/filedlg" id="bm_id7715994" localize="false"/>