INTEGRATION: CWS hcshared06 (1.8.56); FILE MERGED

2006/11/03 07:47:20 ufi 1.8.56.1: saving

1 files changed, 35 insertions, 51 deletions

diff --git a/helpcontent2/source/text/shared/guide/line_intext.xhp b/helpcontent2/source/text/shared/guide/line_intext.xhp
index 82349e6ca1..1881a21bb4 100644
--- a/helpcontent2/source/text/shared/guide/line_intext.xhp
+++ b/helpcontent2/source/text/shared/guide/line_intext.xhp
@@ -1,58 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+<!--
+ ***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: line_intext.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.9 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: rt $ $Date: 2006-12-01 16:57:01 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
+ *    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.
  *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
+ *    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
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************-->
+ ************************************************************************
+ -->
 	
 <helpdocument version="1.0">
 <meta>
@@ -62,7 +44,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-12T13:52:28">converted from old format - fpe</lastedited>
+<lastedited date="2006-10-30T11:49:34">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
@@ -82,10 +64,10 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="E">
-<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="5.64mm" height="5.64mm"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
+<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.222inch" height="0.222inch"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 <paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="E">
-<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
+<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -108,7 +90,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="E">
-<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="5.64mm" height="5.64mm"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
+<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -134,16 +116,17 @@
 <paragraph role="listitem" id="par_id3153049" xml-lang="en-US" l10n="CHG" oldref="38">Create a horizontal line by applying the preset Paragraph Style <emph>Horizontal Line</emph>. Click into an empty paragraph, and double-click the <emph>Horizontal Line</emph> Style in the <emph>Styles and Formatting</emph> window. If the entry for horizontal lines is not visible in the list of Paragraph Styles, select "All Styles" in the lower listbox.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="64">You can draw a line above, beside or below a paragraph by choosing <emph>Format - Paragraph - </emph><link href="text/shared/01/05030500.xhp" name="Borders"><emph>Borders</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="CHG" oldref="64">You can draw a line above, beside or below a paragraph in a Writer text document by choosing <emph>Format - Paragraph - </emph><link href="text/shared/01/05030500.xhp" name="Borders"><emph>Borders</emph></link>.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="par_idN107C6" xml-lang="en-US" level="2" l10n="NEW">Automatic lines</paragraph>
+<paragraph role="heading" id="par_idN107C6" xml-lang="en-US" level="2" l10n="CHG">Automatic lines in Writer</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_idN107CC" xml-lang="en-US" l10n="NEW">If you start a new line by typing some consecutive hyphen or underline characters and press the <item type="keycode">Enter</item> key, the characters are removed and the previous paragraph gets a line as a bottom border.</paragraph>
+<paragraph role="listitem" id="par_idN107CC" xml-lang="en-US" l10n="CHG">If you start a new line in a Writer text document by typing three or more hyphen characters and press the <item type="keycode">Enter</item> key, the characters are removed and the previous paragraph gets a line as a bottom border.</paragraph>
+<paragraph role="paragraph" id="par_id8849452" xml-lang="en-US" l10n="NEW">To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_idN107D0" xml-lang="en-US" l10n="NEW">To remove an automatically drawn border, choose <emph>Format - Paragraph - Border</emph> and select no border.</paragraph>
+<paragraph role="listitem" id="par_idN107D0" xml-lang="en-US" l10n="CHG">To remove an automatically drawn border, choose <emph>Format - Paragraph - Borders</emph> and select no border.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_idN107D8" xml-lang="en-US" l10n="NEW">To undo an automatic border replacement once, choose <emph>Edit - Undo</emph>.</paragraph>
@@ -155,6 +138,7 @@
 <paragraph role="warning" id="par_id3145787" xml-lang="en-US" l10n="U" oldref="45">The lines and other drawing objects that you insert in text are not defined in <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link>, and are therefore not exported directly into HTML format. Instead, they are exported as graphics.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3154188" xml-lang="en-US" l10n="U" oldref="65"><link href="text/shared/01/05030500.xhp" name="Format - Paragraph - Borders">Format - Paragraph - Borders</link></paragraph>
+<embed href="text/swriter/guide/insert_line.xhp#insert_line"/>
 <embed href="text/shared/guide/linestyles.xhp#linestyles"/>
 </body>
 </helpdocument>