INTEGRATION: CWS hcswriter01 (1.4.68); FILE MERGED

2006/05/30 13:15:17 ufi 1.4.68.2: RESYNC: (1.4-1.5); FILE MERGED
2006/02/14 15:49:25 ufi 1.4.68.1: 14.2.

1 files changed, 4 insertions, 6 deletions

diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp
index 74f50886e6..142c0ab2fa 100644
--- a/helpcontent2/source/text/swriter/01/04060000.xhp
+++ b/helpcontent2/source/text/swriter/01/04060000.xhp
@@ -6,9 +6,9 @@
  *
  *  $RCSfile: 04060000.xhp,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2006-03-13 14:18:39 $
+ *  last change: $Author: ihi $ $Date: 2006-06-28 15:47:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -71,9 +71,7 @@
 <paragraph role="heading" id="par_idN1068A" xml-lang="en-US" level="3" l10n="NEW">Separator</paragraph>
 <paragraph role="paragraph" id="par_idN10690" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter optional text characters to appear between the number and the caption text.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="3" l10n="U" oldref="11">Position</paragraph>
-<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph><comment>UFI: removed double help id</comment>
-<paragraph role="heading" id="hd_id3143280" xml-lang="en-US" level="3" l10n="U" oldref="43">Apply border and shadow</paragraph>
-<paragraph role="paragraph" id="par_id3149826" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CAPTION:ED_OBJECT_NAME" id="bm_id3151258" localize="false"/>
 <paragraph role="heading" id="hd_id3149109" xml-lang="en-US" level="3" l10n="U" oldref="42">Object name</paragraph>
 <paragraph role="paragraph" id="par_id3148969" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW:EDIT:DLG_CAPTION:ED_OBJECT_NAME">Type a name for the caption object, so that you can use the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> to quickly jump to the caption in your document.</ahelp></paragraph>
@@ -81,7 +79,7 @@
 <embed href="text/swriter/01/04060100.xhp#optionentext"/>
 <bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
 <paragraph role="heading" id="par_idN10744" xml-lang="en-US" level="2" l10n="NEW">AutoCaption</paragraph>
-<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW">Opens the Caption dialog. It has the same information as the dialog you get by menu <link href="text/shared/optionen/01041100.xhp">Tools - Options - %PRODUCTNAME Writer - AutoCaption</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu Tools - Options - %PRODUCTNAME Writer - AutoCaption.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/captions.xhp#captions"/>
 <embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>