INTEGRATION: CWS hcshared16 (1.13.34); FILE MERGED

2008/02/11 13:18:35 ufi 1.13.34.3: changed how-to-tables
2008/02/07 14:58:15 fpe 1.13.34.2: script based change of references according to #i85615#
2008/02/04 11:28:31 mwaller 1.13.34.1: new file

1 files changed, 6 insertions, 4 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01041000.xhp b/helpcontent2/source/text/shared/optionen/01041000.xhp
index ed3d6605cd..f6656b6b33 100755
--- a/helpcontent2/source/text/shared/optionen/01041000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041000.xhp
@@ -7,9 +7,9 @@
  *
  *  $RCSfile: 01041000.xhp,v $fileonly,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-21 10:06:44 $
+ *  last change: $Author: rt $ $Date: 2008-02-20 00:38:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -61,7 +61,9 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid="53251">Specifies compatibility settings for text documents. These options help in fine-tuning %PRODUCTNAME when importing Microsoft Word documents.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_idN10630" xml-lang="en-US" l10n="NEW"><link href="text/shared/00/00000406.xhp#compatibility"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
+<section id="howtoget">
+  <embed href="text/shared/00/00000406.xhp#compatibility"/>
+</section>
 <paragraph role="note" id="par_id3153876" xml-lang="en-US" l10n="CHG" oldref="17">Some of the settings defined here are only valid for the current document and must be defined separately for each document.</paragraph>
 <section id="printermetrics">
 <bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS" id="bm_id3157844" localize="false"/><comment>UFI: added bookmarks due to bug #i24216#</comment><comment>UFI: this one called also from Impress options</comment><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3" l10n="U" oldref="47">Use printer metrics for document formatting</paragraph>
@@ -97,7 +99,7 @@
 <paragraph role="paragraph" id="par_idN10892" xml-lang="en-US" l10n="NEW">If the option is off, which is the default setting, the new text wrapping will be applied. If the option is on, <emph>the former text wrapping will be applied.</emph>
 </paragraph>
 <paragraph role="heading" id="par_idN1092A" xml-lang="en-US" level="3" l10n="NEW">Consider wrapping style when positioning objects<comment>UFI: spec obj-pos-without-wrapping</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="NEW">Specifies how the complex iterative process of positioning floating objects that are anchored to a character or paragraph should work. In %PRODUCTNAME prior to version %PRODUCTVERSION, an iterative process was used, while in %PRODUCTNAME %PRODUCTVERSION a straightforward process is used, which is similar to the same process in Microsoft Word.</paragraph>
+<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="CHG">Specifies how the complex process of positioning floating objects that are anchored to a character or paragraph should work. In %PRODUCTNAME prior to version %PRODUCTVERSION, an iterative process was used, while in %PRODUCTNAME %PRODUCTVERSION a straightforward process is used, which is similar to the same process in Microsoft Word.</paragraph>
 <paragraph role="paragraph" id="par_idN10943" xml-lang="en-US" l10n="NEW">If the option is off, the %PRODUCTNAME iterative process of object positioning is used. If the option is on, the straightforward process is used to ensure compatibility with Microsoft Word documents.</paragraph>
 <paragraph role="heading" id="hd_id5240028" xml-lang="en-US" level="3" l10n="NEW">Expand word space on lines with manual line breaks in justified paragraphs<comment>UFI: i79041</comment></paragraph>
 <paragraph role="paragraph" id="par_id8599810" xml-lang="en-US" l10n="NEW">If enabled, Writer adds spacing between words, in lines that end with Shift+Enter in justified paragraphs. If disabled, spacing between words will not be expanded to justify the lines.</paragraph>