INTEGRATION: CWS hcshared18 (1.14.2); FILE MERGED

2008/05/28 18:17:09 fpe 1.14.2.4: remove DOCTYPE headers from source files to avoid performance problems in installed help
2008/05/27 13:20:07 ufi 1.14.2.3: vor final build
2008/05/23 11:11:10 ufi 1.14.2.2: building Sol
2008/05/21 09:13:58 ufi 1.14.2.1: vor testbuild

1 files changed, 36 insertions, 29 deletions

diff --git a/helpcontent2/source/text/swriter/guide/text_frame.xhp b/helpcontent2/source/text/swriter/guide/text_frame.xhp
index 30e459f381..9820256748 100644
--- a/helpcontent2/source/text/swriter/guide/text_frame.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_frame.xhp
@@ -1,39 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<helpdocument version="1.0">
+	
 <!--
  ***********************************************************************
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ *  $RCSfile: text_frame.xhp,v $fileonly,v $
  *
- * $RCSfile: text_frame.xhp,v $
- * $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- * This file is part of OpenOffice.org.
+ *  last change: $Author: vg $ $Date: 2008-06-03 12:48:51 $
  *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
 <topic id="textswriterguidetext_framexml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Inserting, Editing, and Linking Text Frames</title>
@@ -49,9 +55,9 @@
 <bookmark_value>links;text frames</bookmark_value>
 <bookmark_value>text flow; from frame to frame</bookmark_value>
 <bookmark_value>frames; linking</bookmark_value>
-<bookmark_value>text;not printing</bookmark_value>
-<bookmark_value>printing;hiding text from printing</bookmark_value>
-</bookmark><comment>MW deleted "changing;"</comment><paragraph role="heading" id="hd_id3149487" xml-lang="en-US" level="1" l10n="U" oldref="3"><variable id="text_frame"><link href="text/swriter/guide/text_frame.xhp" name="Inserting, Editing, and Linking Text Frames">Inserting, Editing, and Linking Text Frames</link>
+<bookmark_value>printing;hiding text frames from printing</bookmark_value>
+</bookmark><comment>mw deleted "text;" and changed "printing;"</comment>
+<paragraph role="heading" id="hd_id3149487" xml-lang="en-US" level="1" l10n="U" oldref="3"><variable id="text_frame"><link href="text/swriter/guide/text_frame.xhp" name="Inserting, Editing, and Linking Text Frames">Inserting, Editing, and Linking Text Frames</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3149842" xml-lang="en-US" l10n="U" oldref="65">A text frame is a container for text and graphics that you can place anywhere on a page. You can also use a frame to apply a column layout to text.</paragraph>
 <paragraph role="heading" id="hd_id3156104" xml-lang="en-US" level="2" l10n="U" oldref="64">Inserting Text Frames</paragraph>
@@ -64,7 +70,7 @@
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id3145115" xml-lang="en-US" level="2" l10n="U" oldref="66">Editing Text Frames</paragraph>
-<list type="unordered">
+<list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="16">To edit the contents of a text frame, click in the frame, and make the changes that you want.</paragraph>
 </listitem>
@@ -96,7 +102,7 @@
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id3150223" xml-lang="en-US" l10n="CHG" oldref="87">On the <emph>Frame</emph> Bar, click the <emph>Link Frames</emph> icon 
-<image id="img_id3148968" src="res/commandimagelist/sc_chainframes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148968" xml-lang="en-US">Icon</alt>
+<image id="img_id3148968" src="res/commandimagelist/sc_chainframes.png" width="0.222in" height="0.222in"><alt id="alt_id3148968" xml-lang="en-US">Icon</alt>
 	</image>.</paragraph>
 </listitem>
 <listitem>
@@ -104,7 +110,7 @@
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3150947" xml-lang="en-US" l10n="U" oldref="75">You can only link frames if:</paragraph>
-<list type="unordered">
+<list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3150969" xml-lang="en-US" l10n="U" oldref="76">The target frame is empty.</paragraph>
 </listitem>
@@ -124,7 +130,8 @@
 <paragraph role="paragraph" id="par_id3151083" xml-lang="en-US" l10n="U" oldref="90">When you select a linked frame, a line is displayed that connects the linked frames.</paragraph>
 <paragraph role="note" id="par_id5853144" xml-lang="en-US" l10n="NEW">The Autosize feature is available only for the last frame in a chain of linked frames.</paragraph><comment>UFI: removed 
 id="par_id3147542" l10n="U" oldref="72"You can only change the height of the last frame in a series of linked frames.
-Obviously this works now</comment><section id="relatedtopics">
+Obviously this works now</comment>
+<section id="relatedtopics">
 <embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
 <embed href="text/swriter/guide/text_centervert.xhp#text_centervert"/>
 <embed href="text/swriter/guide/textdoc_inframe.xhp#textdoc_inframe"/>