INTEGRATION: CWS helpcontentbeta (1.2.2); FILE MERGED

2004/10/06 14:56:47 fpe 1.2.2.1: Regular Update

1 files changed, 5 insertions, 5 deletions

diff --git a/helpcontent2/source/text/swriter/01/05060100.xhp b/helpcontent2/source/text/swriter/01/05060100.xhp
index c90382d9f2..669e82155a 100644
--- a/helpcontent2/source/text/swriter/01/05060100.xhp
+++ b/helpcontent2/source/text/swriter/01/05060100.xhp
@@ -62,7 +62,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-06-23T13:27:19">UFI: sw.feature "Enhanced Writer fly frame positioning and alignment"   news://staroffice-news:119/openoffice.sw.features-6195447.1075794225974.JavaMail.root@so; dedr: reviewed
+<lastedited date="2004-09-20T14:50:40">UFI: sw.feature "Enhanced Writer fly frame positioning and alignment"   news://staroffice-news:119/openoffice.sw.features-6195447.1075794225974.JavaMail.root@so; dedr: reviewed
 -web3.Germany.Sun.COM
 YJ:checked</lastedited>
 </history>
@@ -139,14 +139,14 @@ YJ:checked</lastedited>
 <bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION" id="bm_id3150923" localize="false"/>
 <paragraph role="heading" id="hd_id3150912" xml-lang="en-US" level="3" l10n="U" oldref="56">to</paragraph>
 <paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION">Select the reference point for the selected vertical alignment option.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FRM_STD_CB_FOLLOWTEXTFLOW" id="bm_id611285" localize="false"/>
+<paragraph role="heading" id="par_idN10A8E" xml-lang="en-US" level="3" l10n="NEW">Follow text flow</paragraph>
+<paragraph role="paragraph" id="par_idN10A92" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW">Keeps the selected object within the layout boundaries of the text that the object is anchored to. To place the selected object anywhere in your document, do not select this option.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">By default, the <emph>Follow text flow</emph> option is selected when you open a document that was created in a version of %PRODUCTNAME older than %PRODUCTNAME %PRODUCTVERSION. However, this option is not selected when you create a document or when you open a document in Microsoft Word format (*.doc).</paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
 <paragraph role="paragraph" id="par_id3149241" xml-lang="en-US" l10n="U" oldref="58">The green rectangle represents the selected object and the red rectangle represents the alignment reference point. If you anchor the object as a character, the reference rectangle changes to a red line.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3146949" xml-lang="en-US" l10n="U" oldref="66"><link href="text/shared/01/05260000.xhp" name="Format - Anchor"><emph>Format - Anchor</emph></link></paragraph>
 <paragraph role="paragraph" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="67"><link href="text/shared/01/05070000.xhp" name="Format - Alignment"><emph>Format - Alignment</emph></link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FRM_STD_CB_FOLLOWTEXTFLOW" id="bm_id611285" localize="false"/>
-<paragraph role="heading" id="par_idN10A8E" xml-lang="en-US" level="3" l10n="NEW">Follow text flow</paragraph>
-<paragraph role="paragraph" id="par_idN10A92" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW">Keeps the selected object within the layout boundaries of the text that the object is anchored to. To place the selected object anywhere in your document, do not select this option.</ahelp></paragraph>
-<paragraph role="note" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">By default, the <emph>Follow text flow</emph> option is selected when you open a document that was created in a version of %PRODUCTNAME older than %PRODUCTNAME %PRODUCTVERSION. However, this option is not selected when you create a document or when you open a document in Microsoft Word format (*.doc).</paragraph>
 </body>
 </helpdocument>