summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-01-07 16:36:05 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-01-07 16:36:05 +0000
commit0566fe1d60f5e764fea219e11683e8b0dbf498eb (patch)
treee123f871683b241d3446498f2c63674651ce3611 /helpcontent2/source/text/swriter
parenta0218ff4759f8197fd966af4d0396280f60b0695 (diff)
CWS-TOOLING: integrate CWS menuchanges
2009-01-07 17:12:18 +0100 mod r265974 : throw out comment tracking accellerator 2009-01-07 16:23:35 +0100 mod r265972 : CWS-TOOLING: rebase CWS menuchanges to trunk@265758 (milestone: DEV300:m38) 2008-12-03 16:21:15 +0100 mod r264798 : menu shortcut fixes 2008-12-03 15:53:23 +0100 mod r264794 : some shortcut changes 2008-12-02 13:35:56 +0100 fredrikh r264696 : i96794 2008-12-01 20:09:07 +0100 fredrikh r264633 : i96768 2008-12-01 20:08:37 +0100 fredrikh r264632 : i96768 2008-12-01 16:40:18 +0100 fredrikh r264619 : i96762 2008-12-01 16:37:37 +0100 fredrikh r264618 : i96762 2008-12-01 16:37:09 +0100 fredrikh r264617 : i96762 2008-12-01 13:14:43 +0100 fredrikh r264595 : i90650 2008-11-28 18:26:38 +0100 fredrikh r264569 : i94758 2008-11-28 18:22:31 +0100 fredrikh r264568 : i94758 2008-11-28 12:46:26 +0100 fredrikh r264541 : i94758 2008-11-26 16:58:51 +0100 fredrikh r264423 : i96625 2008-11-26 16:14:10 +0100 fredrikh r264412 : i96623 2008-11-26 16:13:02 +0100 fredrikh r264410 : i96623 2008-11-25 19:46:42 +0100 fredrikh r264330 : i96359 2008-11-25 13:50:34 +0100 fredrikh r264307 : i96556 2008-11-25 13:49:46 +0100 fredrikh r264306 : i96556 2008-11-25 13:48:32 +0100 fredrikh r264305 : i96556 2008-11-25 13:46:55 +0100 fredrikh r264304 : i96556 2008-11-25 13:45:29 +0100 fredrikh r264303 : i96357 2008-11-25 13:42:11 +0100 fredrikh r264302 : i96556 & i94758 2008-11-25 13:34:54 +0100 fredrikh r264301 : i96556 2008-11-25 13:33:30 +0100 fredrikh r264300 : i96556 2008-11-25 13:32:31 +0100 fredrikh r264299 : i96556 2008-11-25 13:31:57 +0100 fredrikh r264298 : i96556 2008-11-25 13:31:27 +0100 fredrikh r264297 : i96556 2008-11-25 13:30:31 +0100 fredrikh r264295 : i96556 2008-11-25 13:29:29 +0100 fredrikh r264294 : i96556 2008-11-25 13:28:17 +0100 fredrikh r264292 : i96556 2008-11-25 13:27:44 +0100 fredrikh r264290 : i96556 2008-11-25 13:26:54 +0100 fredrikh r264288 : i96556 2008-11-25 13:25:03 +0100 fredrikh r264287 : i96556 2008-11-25 13:21:29 +0100 fredrikh r264286 : i96556 2008-11-19 16:14:07 +0100 fredrikh r264004 : i96359 2008-11-19 14:35:43 +0100 fredrikh r263995 : i96353 2008-11-19 14:05:58 +0100 fredrikh r263991 : i96347 2008-11-19 14:05:36 +0100 fredrikh r263990 : i96347 2008-11-19 14:05:07 +0100 fredrikh r263989 : i96347 2008-11-19 13:11:59 +0100 fredrikh r263983 : i96347 2008-11-19 13:00:09 +0100 fredrikh r263982 : i96347 2008-10-29 14:54:51 +0100 mod r262804 : 94633 2008-10-29 14:54:10 +0100 mod r262803 : #i94633# 2008-10-29 12:58:38 +0100 ufi r262787 : i94958,3rd 2008-10-29 12:42:41 +0100 ufi r262783 : i94958,2nd 2008-10-29 12:00:23 +0100 ufi r262777 : i94958 2008-10-28 23:45:34 +0100 mod r262766 : #i95457# 2008-10-18 19:09:38 +0200 mod r262295 : accelerator change 2008-10-17 15:45:11 +0200 mod r262289 : fix typo 2008-10-15 23:17:04 +0200 mod r262245 : menu fix 2008-10-15 22:58:30 +0200 mod r262244 : fix footnote setting dialog 2008-10-15 22:58:01 +0200 mod r262243 : further changes to menu 2008-10-14 10:27:46 +0200 mod r262195 : new accelerator and menu changes 2008-10-14 10:27:37 +0200 mod r262194 : new accelerator and menu changes 2008-10-07 14:23:26 +0200 mod r262081 : #i79329# #i85158# #i88351# 2008-10-02 10:31:52 +0200 mod r262026 : #i94551# 2008-10-02 10:23:57 +0200 mod r262025 : #i87347#
Diffstat (limited to 'helpcontent2/source/text/swriter')
-rw-r--r--helpcontent2/source/text/swriter/00/00000404.xhp88
-rw-r--r--helpcontent2/source/text/swriter/00/00000405.xhp147
-rwxr-xr-xhelpcontent2/source/text/swriter/00/00000406.xhp32
-rw-r--r--helpcontent2/source/text/swriter/01/02110000.xhp122
-rw-r--r--helpcontent2/source/text/swriter/01/02150000.xhp42
-rw-r--r--helpcontent2/source/text/swriter/01/04030000.xhp24
-rw-r--r--helpcontent2/source/text/swriter/01/04130000.xhp30
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05150000.xhp35
-rw-r--r--helpcontent2/source/text/swriter/01/05150100.xhp35
-rw-r--r--helpcontent2/source/text/swriter/01/05150200.xhp37
-rw-r--r--helpcontent2/source/text/swriter/01/05150300.xhp33
-rw-r--r--helpcontent2/source/text/swriter/01/06080000.xhp42
-rw-r--r--helpcontent2/source/text/swriter/01/06090000.xhp22
-rw-r--r--helpcontent2/source/text/swriter/guide/auto_numbering.xhp85
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/auto_off.xhp44
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/auto_spellcheck.xhp28
-rw-r--r--helpcontent2/source/text/swriter/guide/autocorr_except.xhp23
-rw-r--r--helpcontent2/source/text/swriter/guide/footnote_usage.xhp47
-rw-r--r--helpcontent2/source/text/swriter/guide/nonprintable_text.xhp26
-rw-r--r--helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp28
-rw-r--r--helpcontent2/source/text/swriter/guide/smarttags.xhp27
-rw-r--r--helpcontent2/source/text/swriter/guide/text_centervert.xhp26
-rw-r--r--helpcontent2/source/text/swriter/guide/text_frame.xhp14
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/word_completion.xhp27
-rwxr-xr-xhelpcontent2/source/text/swriter/main0102.xhp20
-rwxr-xr-xhelpcontent2/source/text/swriter/main0103.xhp18
-rwxr-xr-xhelpcontent2/source/text/swriter/main0104.xhp21
-rwxr-xr-xhelpcontent2/source/text/swriter/main0106.xhp25
28 files changed, 619 insertions, 529 deletions
diff --git a/helpcontent2/source/text/swriter/00/00000404.xhp b/helpcontent2/source/text/swriter/00/00000404.xhp
index bae3e97c9b..b81496ce3f 100644
--- a/helpcontent2/source/text/swriter/00/00000404.xhp
+++ b/helpcontent2/source/text/swriter/00/00000404.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000404.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0000000404xml" indexer="exclude" status="PUBLISH">
+<topic id="textswriter0000000404xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Insert Menu</title>
<filename>/text/swriter/00/00000404.xhp</filename>
</topic>
@@ -74,16 +72,17 @@
<section id="syfeldbefehl">
<table id="tbl_id3154642">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150760" xml-lang="en-US" l10n="E">
-<image id="img_id3146959" src="res/commandimagelist/sc_insertfield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146959" xml-lang="en-US">Icon</alt>
+<image id="img_id3146959" src="res/commandimagelist/sc_insertfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146959" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153619" xml-lang="en-US" l10n="U" oldref="6">Insert Fields</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="56"><variable id="felddokument">Choose <emph>Insert - Fields - Other - Document</emph> tab
@@ -108,16 +107,17 @@
<section id="sybereich">
<table id="tbl_id3150349">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="E">
-<image id="img_id3152952" src="res/commandimagelist/sc_insertsection.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152952" xml-lang="en-US">Icon</alt>
+<image id="img_id3152952" src="res/commandimagelist/sc_insertsection.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152952" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150828" xml-lang="en-US" l10n="CHG" oldref="71">Section</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3155899" xml-lang="en-US" l10n="U" oldref="69"><variable id="bereicheinbereich">Choose <emph>Insert - Section - Section</emph> tab or choose <emph>Format - Sections</emph>
@@ -125,38 +125,40 @@
<paragraph role="paragraph" id="par_id3154197" xml-lang="en-US" l10n="U" oldref="103"><variable id="sectionindents">Choose <emph>Insert - Section - Indents</emph> tab or choose <emph>Format - Sections</emph>
</variable></paragraph>
<section id="fussnoteein">
-<paragraph role="paragraph" id="par_id3151322" xml-lang="en-US" l10n="U" oldref="8">Footnote: Choose <emph>Insert - Footnote</emph>
+<paragraph role="paragraph" id="par_id3151322" xml-lang="en-US" l10n="U" oldref="8">Choose <emph>Insert - Footnote/Endnote</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="91">Open context menu - choose <emph>Footnote</emph> (inserted Footnote/Endnote)</paragraph>
+<paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="91">Open context menu - choose <emph>Footnote/Endnote</emph> (inserted Footnote/Endnote)</paragraph>
<paragraph role="paragraph" id="par_id3143279" xml-lang="en-US" l10n="CHG" oldref="9">Open <emph>Insert</emph> toolbar, click</paragraph>
<section id="syfussnoteein">
<table id="tbl_id3149826">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151261" xml-lang="en-US" l10n="E">
-<image id="img_id3149099" src="res/commandimagelist/sc_insertfootnote.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149099" xml-lang="en-US">Icon</alt>
+<image id="img_id3149099" src="res/commandimagelist/sc_insertfootnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149099" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148968" xml-lang="en-US" l10n="U" oldref="10">Insert Footnote Directly</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="syendnoteein">
<table id="tbl_id3147221">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147579" xml-lang="en-US" l10n="E">
-<image id="img_id3147586" src="res/commandimagelist/sc_insertendnote.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147586" xml-lang="en-US">Icon</alt>
+<image id="img_id3147586" src="res/commandimagelist/sc_insertendnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147586" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147076" xml-lang="en-US" l10n="U" oldref="66">Insert Endnote Directly</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="beschriftungein">
<paragraph role="paragraph" id="par_id3154385" xml-lang="en-US" l10n="U" oldref="11">Choose <emph>Insert - Caption</emph>
@@ -177,16 +179,17 @@
<section id="sytextmarke">
<table id="tbl_id3156379">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148884" xml-lang="en-US" l10n="E">
-<image id="img_id3151369" src="sw/imglst/nc20005.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3151369" xml-lang="en-US">Icon</alt>
+<image id="img_id3151369" src="sw/imglst/nc20005.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151369" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150689" xml-lang="en-US" l10n="CHG" oldref="14">Bookmark</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="U" oldref="15"><variable id="einfscript">Choose <emph>Insert - Script</emph> (only HTML documents)
@@ -200,16 +203,17 @@
<section id="syeintrag">
<table id="tbl_id3145256">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="E">
-<image id="img_id3149551" src="res/commandimagelist/sc_insertindexesentry.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149551" xml-lang="en-US">Icon</alt>
+<image id="img_id3149551" src="res/commandimagelist/sc_insertindexesentry.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149551" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150549" xml-lang="en-US" l10n="CHG" oldref="19">Entry</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3149217" xml-lang="en-US" l10n="U" oldref="20"><variable id="stichwortverzeichnisverz">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>
@@ -254,7 +258,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145625" xml-lang="en-US" l10n="U" oldref="88"><variable id="verz37">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Bibliography is the selected type)
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149767" xml-lang="en-US" l10n="U" oldref="89"><variable id="litdef">Choose <emph>Insert - Indexes and Tables - Bibliography Entry</emph> and click <emph>Edit</emph>
+<paragraph role="paragraph" id="par_id3149767" xml-lang="en-US" l10n="U" oldref="89"><variable id="litdef">Choose <emph>Insert - Indexes and Tables - </emph>
+<emph>Bibliography Entry</emph> and click <emph>Edit</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150918" xml-lang="en-US" l10n="U" oldref="68"><variable id="stichwortverzeichnisverz3">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Styles</emph> tab
</variable></paragraph>
@@ -269,22 +274,23 @@
<section id="rahmen">
<paragraph role="paragraph" id="par_id3148781" xml-lang="en-US" l10n="U" oldref="32">Choose <emph>Insert - Frame</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Format - Frame</emph>
+<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Format - Frame/Object</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="CHG" oldref="34">Open <emph>Insert</emph> toolbar, click</paragraph>
<section id="syrahmen">
<table id="tbl_id3155100">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149372" xml-lang="en-US" l10n="E">
-<image id="img_id3149379" src="res/commandimagelist/sc_insertframe.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3149379" xml-lang="en-US">Frame</alt>
+<image id="img_id3149379" src="res/commandimagelist/sc_insertframe.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149379" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151229" xml-lang="en-US" l10n="CHG" oldref="35">Insert Frame Manually</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="einfgentabelle">
@@ -296,16 +302,17 @@
<section id="sytabelle">
<table id="tbl_id3154350">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154620" xml-lang="en-US" l10n="E">
-<image id="img_id3154627" src="res/commandimagelist/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154627" xml-lang="en-US">Icon</alt>
+<image id="img_id3154627" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154627" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147382" xml-lang="en-US" l10n="CHG" oldref="39">Table</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3149627" xml-lang="en-US" l10n="U" oldref="40"><variable id="einfhorizlinie">Choose <emph>Insert - Horizontal Line</emph>
@@ -317,16 +324,17 @@
<section id="syeinfdatei">
<table id="tbl_id3146296">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149959" xml-lang="en-US" l10n="E">
-<image id="img_id3149966" src="res/commandimagelist/sc_insertdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149966" xml-lang="en-US">Icon</alt>
+<image id="img_id3149966" src="res/commandimagelist/sc_insertdoc.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149966" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150599" xml-lang="en-US" l10n="U" oldref="43">File</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3147267" xml-lang="en-US" l10n="U" oldref="59"><variable id="kopfzeile">Choose <emph>Insert - Header</emph>
diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp
index ae349c9ef0..46708e8126 100644
--- a/helpcontent2/source/text/swriter/00/00000405.xhp
+++ b/helpcontent2/source/text/swriter/00/00000405.xhp
@@ -70,7 +70,7 @@
</variable></paragraph>
<section id="spaltens">
<paragraph role="paragraph" id="par_id3150836" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Format - Page - Columns</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="123">Choose <emph>Format - Frame - Columns</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="123">Choose <emph>Format - Frame/Object - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3151336" xml-lang="en-US" l10n="U" oldref="23">Choose <emph>Insert - Frame - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3143276" xml-lang="en-US" l10n="U" oldref="156">Choose <emph>Insert/Format - Section(s) - Columns</emph> tab</paragraph>
@@ -95,13 +95,13 @@
<section id="numerierungsvorlage">
<paragraph role="paragraph" id="par_id3156364" xml-lang="en-US" l10n="U" oldref="142">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Numbering Styles)</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="37"><variable id="eingabe">Choose <emph>Format - AutoFormat - While Typing</emph>
+<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="37"><variable id="eingabe">Choose <emph>Format - AutoCorrect - While Typing</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="42"><variable id="autoformat1">Choose <emph>Format - AutoFormat</emph>
+<paragraph role="paragraph" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="42"><variable id="autoformat1">Choose <emph>Format - AutoCorrect</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="43"><variable id="autoformat2">Choose <emph>Format - AutoFormat - Apply</emph>
+<paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="43"><variable id="autoformat2">Choose <emph>Format - AutoCorrect - Apply</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoFormat - Apply and Edit Changes</emph>
+<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoCorrect - Apply and Edit Changes</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147413" xml-lang="en-US" l10n="CHG" oldref="44"><variable id="autoformattab">Choose <emph>Table - AutoFormat</emph> (with cursor in a table)
</variable></paragraph>
@@ -117,7 +117,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150557" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -130,13 +134,13 @@
</section>
<section id="grafiktyp">
<paragraph role="paragraph" id="par_id3146337" xml-lang="en-US" l10n="U" oldref="51">Choose <emph>Format - Picture - Type</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="124">Choose <emph>Format - Frame - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
+<paragraph role="paragraph" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="124">Choose <emph>Format - Frame/Object - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
<paragraph role="paragraph" id="par_id3148856" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Type</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3147067" xml-lang="en-US" l10n="U" oldref="55">Choose <emph>Insert - Frame - Type</emph> tab</paragraph>
</section>
<section id="grafikumlauf">
<paragraph role="paragraph" id="par_id3151082" xml-lang="en-US" l10n="U" oldref="56">Choose <emph>Format - Picture - Wrap</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3148437" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>Format - Frame - Wrap</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3148437" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>Format - Frame/Object - Wrap</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150169" xml-lang="en-US" l10n="U" oldref="60">Choose <emph>Insert - Frame - Wrap</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3153299" xml-lang="en-US" l10n="U" oldref="61">Choose <emph>Format - Wrap</emph>
</paragraph>
@@ -145,12 +149,12 @@
</variable></paragraph>
<section id="grahyper">
<paragraph role="paragraph" id="par_id3153984" xml-lang="en-US" l10n="U" oldref="63">Choose <emph>Format - Picture - Hyperlink</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="126">Choose <emph>Format - Frame - Hyperlink</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="126">Choose <emph>Format - Frame/Object - Hyperlink</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3145337" xml-lang="en-US" l10n="U" oldref="64">Choose <emph>Insert - Frame - Hyperlink</emph> tab</paragraph>
</section>
<section id="grazusaetze">
<paragraph role="paragraph" id="par_id3154724" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Format - Picture - Options</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="128">Choose <emph>Format - Frame - Options</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="128">Choose <emph>Format - Frame/Object - Options</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149774" xml-lang="en-US" l10n="U" oldref="68">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Options</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Insert - Frame - Options</emph> tab</paragraph>
</section>
@@ -158,7 +162,7 @@
</variable></paragraph>
<section id="makrografik">
<paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>Insert/Format - Picture - Macro</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame - Macro</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame/Object - Macro</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3153238" xml-lang="en-US" l10n="U" oldref="73">Choose <emph>Edit - AutoText - AutoText (button) - Macro</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3148792" xml-lang="en-US" l10n="U" oldref="148">Choose <emph>Edit - ImageMap -</emph> open context menu<emph> - Macro</emph>
@@ -180,6 +184,49 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148823" xml-lang="en-US" l10n="CHG" oldref="78"><variable id="zelle">Right-click in a table, choose <emph>Cell</emph>
</variable></paragraph>
+<<<<<<< .working
+<section id="verbindenze">
+<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="80">On the <emph>Table</emph> Bar, click</paragraph>
+<section id="syzellenverbinden">
+<table id="tbl_id3154636">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153996" xml-lang="en-US" l10n="E">
+<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154002" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="81">Merge Cells</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+<section id="teilenz">
+<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US" l10n="U" oldref="83">On the <emph>Table</emph> Bar, click</paragraph>
+<section id="syzellenteilen">
+<table id="tbl_id3149972">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="E">
+<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147275" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150616" xml-lang="en-US" l10n="U" oldref="84">Split Cells</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3149617" xml-lang="en-US" l10n="U" oldref="85"><variable id="schtzenze">In the context menu of a cell, choose <emph>Cell - Protect</emph>
</variable></paragraph>
<section id="schutzaufhz">
@@ -200,7 +247,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145222" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -211,6 +262,29 @@
</section>
</section>
+<<<<<<< .working
+<section id="verteilenzeile">
+<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3153755" xml-lang="en-US" l10n="U" oldref="93">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+<section id="syverteilenzeile">
+<table id="tbl_id3154064">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
+<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155994" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153206" xml-lang="en-US" l10n="U" oldref="94">Distribute Rows Equally</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3145095" xml-lang="en-US" l10n="U" oldref="95"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>
</variable></paragraph>
<section id="loschenz">
@@ -222,7 +296,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3147555" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -247,7 +325,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3157881" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -258,6 +340,29 @@
</section>
</section>
+<<<<<<< .working
+<section id="verteilenspalte">
+<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="108">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+<section id="syverteilentext">
+<table id="tbl_id3148462">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
+<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145186" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US" l10n="U" oldref="109">Space Columns Equally</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3153172" xml-lang="en-US" l10n="U" oldref="110"><variable id="spaltesel">Choose <emph>Table - Select - Column</emph>
</variable></paragraph>
<section id="einfgens">
@@ -270,7 +375,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -280,7 +389,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150895" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -299,7 +412,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153600" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -311,14 +428,18 @@
</section>
</section>
<section id="objektformat">
-<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="CHG" oldref="117">Choose <emph>Format - Frame</emph>
+<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="CHG" oldref="117">Choose <emph>Format - Frame/Object</emph>
</paragraph>
<section id="syeigenschaftenobjekt">
<table id="tbl_id3153367">
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -334,7 +455,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/swriter/00/00000406.xhp b/helpcontent2/source/text/swriter/00/00000406.xhp
index e8a7b59576..abceda496f 100755
--- a/helpcontent2/source/text/swriter/00/00000406.xhp
+++ b/helpcontent2/source/text/swriter/00/00000406.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000406.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0000000406xml" indexer="exclude" status="PUBLISH">
+<topic id="textswriter0000000406xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Tools Menu</title>
<filename>/text/swriter/00/00000406.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T12:45:38">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3154279" xml-lang="en-US" level="1" l10n="U" oldref="1">Tools Menu</paragraph>
@@ -54,13 +50,13 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="40"><variable id="kapitelnumerierung1">Choose <emph>Tools - Outline Numbering - Numbering</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="zeilennumerierung">Choose <emph>Tools - Line Numbering</emph> (not for HTML format)
+<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="zeilennumerierung">Choose <emph>Tools - Line Numbering</emph> (not for HTML format)
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="31"><variable id="fussnoteneinstellung">Choose <emph>Tools - Footnotes</emph>
+<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="31"><variable id="fussnoteneinstellung">Choose <emph>Tools - Footnotes/Endnotes</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153669" xml-lang="en-US" l10n="U" oldref="15"><variable id="fussnoten">Choose <emph>Tools - Footnotes - Footnotes</emph> tab
+<paragraph role="paragraph" id="par_id3153669" xml-lang="en-US" l10n="U" oldref="15"><variable id="fussnoten">Choose <emph>Tools - Footnotes/Endnotes - Footnotes</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150972" xml-lang="en-US" l10n="U" oldref="32"><variable id="endnoten">Choose <emph>Tools - Footnotes - Endnotes</emph> tab
+<paragraph role="paragraph" id="par_id3150972" xml-lang="en-US" l10n="U" oldref="32"><variable id="endnoten">Choose <emph>Tools - Footnotes/Endnotes - Endnotes</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3152963" xml-lang="en-US" l10n="CHG" oldref="16"><variable id="texttabelle">Choose <emph>Table - Convert - Text to Table</emph>
</variable></paragraph>
@@ -97,12 +93,12 @@
<paragraph role="paragraph" id="par_idN107E7" xml-lang="en-US" l10n="NEW">Click <emph>Mail Merge</emph> icon on the <emph>Table Data</emph> bar:</paragraph>
<table id="tbl_id3149877">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10806" xml-lang="en-US" l10n="NEW">
-<image id="img_id3083452" src="res/commandimagelist/sc_mergedialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083452" xml-lang="en-US">Icon</alt>
+<image id="img_id3083452" src="res/commandimagelist/sc_mergedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3083452" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10823" xml-lang="en-US" l10n="NEW">Mail Merge</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/01/02110000.xhp b/helpcontent2/source/text/swriter/01/02110000.xhp
index f691e49433..f35b46f63b 100644
--- a/helpcontent2/source/text/swriter/01/02110000.xhp
+++ b/helpcontent2/source/text/swriter/01/02110000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02110000.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0102110000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0102110000xml" indexer="include">
<title id="tit" xml-lang="en-US">Navigator</title>
<filename>/text/swriter/01/02110000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-04-13T16:05:02">converted from old format - fpe
-dedr: fixed #i31269#
-FPE: Deleted screenshot</lastedited>
-</history>
</meta>
<body>
<section id="navigator">
@@ -52,9 +48,9 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Navigator">Shows or hides the Navigator, where you can quickly jump to different parts of your document. You can also use the Navigator to insert elements from the current document or other open documents, and to organize master documents.</ahelp> To edit an item in the Navigator, right-click the item, and then choose a command from the context menu. If you want, you can <link href="text/shared/00/00000005.xhp#andocken" name="dock">dock</link> the Navigator at the edge of your workspace.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#navigator"/>
+<embed href="text/shared/00/00000402.xhp#navigator"/>
</section>
-<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="CHG" oldref="3">To open the Navigator, choose <emph>Edit - Navigator</emph>. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, double-click in a free area of the Navigator.</paragraph>
+<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="CHG" oldref="3">To open the Navigator, choose <emph>View - Navigator</emph>. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, double-click in a free area of the Navigator.</paragraph>
<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="CHG" oldref="79">Click the plus sign (+) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator.</paragraph>
<paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="CHG" oldref="64">To jump to the next or previous item in a document, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon to open the Navigation toolbar, click the item category, and then click the up or down arrows.</paragraph>
<paragraph role="note" id="par_id3155136" xml-lang="en-US" l10n="U" oldref="90">A hidden section in a document appears gray in the Navigator, and displays the text "hidden" when you rest the mouse pointer over it. The same applies to header and footer contents of Page Styles that are not used in a document, and hidden contents in tables, text frames, graphics, OLE objects, and indexes.</paragraph>
@@ -63,12 +59,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3155917" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid="." visibility="hidden">Switches between master view and normal view if a master document is open.</ahelp>Switches between <link href="text/shared/01/02110000.xhp" name="master view">master view</link> and normal view if a <link href="text/shared/01/01010001.xhp" name="master document">master document</link> is open.</paragraph>
<table id="tbl_id3155861">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150689" xml-lang="en-US" l10n="E">
-<image id="img_id3150695" src="sw/imglst/sc20244.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150695" xml-lang="en-US">Icon</alt>
+<image id="img_id3150695" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150695" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="68">Toggle</paragraph>
</tablecell>
</tablerow>
@@ -80,12 +76,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3149838" xml-lang="en-US" l10n="U" oldref="83">To continue the search, click the <link href="text/swriter/01/02110100.xhp" name="Repeat Search"><emph>Repeat Search</emph></link> icon on the <emph>Navigation</emph> toolbar.</paragraph>
<table id="tbl_id3148862">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN1087B" xml-lang="en-US" l10n="NEW">
-<image id="img_id3628141" src="sw/imglst/sc20249.png" width="0.222inch" height="0.222inch"><alt id="alt_id3628141" xml-lang="en-US">Icon</alt>
+<image id="img_id3628141" src="sw/imglst/sc20249.png" width="0.2228in" height="0.2228in"><alt id="alt_id3628141" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="71">Navigation</paragraph>
</tablecell>
</tablerow>
@@ -96,12 +92,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3148784" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="." visibility="hidden">Jumps to the previous item in the document. To specify the type of item to jump to, click the <emph>Navigation</emph> icon, and then click an item category - for example, "Graphics".</ahelp>Jumps to the previous item in the document. To specify the type of item to jump to, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon, and then click an item category - for example, "Graphics".</paragraph>
<table id="tbl_id3150044">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154616" xml-lang="en-US" l10n="E">
-<image id="img_id3154622" src="sw/imglst/sc20186.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154622" xml-lang="en-US">Icon</alt>
+<image id="img_id3154622" src="sw/imglst/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154622" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150659" xml-lang="en-US" l10n="U" oldref="30">Previous Object</paragraph>
</tablecell>
</tablerow>
@@ -112,12 +108,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3154028" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="." visibility="hidden">Jumps to the next item in the document. To specify the type of item to jump to, click the <link href="text/swriter/01/02110100.xhp" name="Navigation"><emph>Navigation</emph></link> icon, and then click an item category - for example, "Graphics".</ahelp>Jumps to the next item in the document. To specify the type of item to jump to, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon, and then click an item category - for example, "Graphics".</paragraph>
<table id="tbl_id3149971">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="E">
-<image id="img_id3150773" src="sw/imglst/sc20175.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150773" xml-lang="en-US">Icon</alt>
+<image id="img_id3150773" src="sw/imglst/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150773" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155359" xml-lang="en-US" l10n="U" oldref="33">Next Object</paragraph>
</tablecell>
</tablerow>
@@ -133,12 +129,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3155325" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="HID_NAVI_TBX7">Shows or hides the <emph>Navigator </emph>list.</ahelp></paragraph>
<table id="tbl_id3154409">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154949" xml-lang="en-US" l10n="E">
-<image id="img_id3154955" src="sw/imglst/sc20233.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154955" xml-lang="en-US">Icon</alt>
+<image id="img_id3154955" src="sw/imglst/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154955" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="9">List box on/off</paragraph>
</tablecell>
</tablerow>
@@ -149,12 +145,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3145596" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_NAVI_TBX8">Switches between the display of all categories in the Navigator and the selected category.</ahelp></paragraph>
<table id="tbl_id3145616">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154133" xml-lang="en-US" l10n="E">
-<image id="img_id3154140" src="sw/imglst/sc20244.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154140" xml-lang="en-US">Icon</alt>
+<image id="img_id3154140" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154140" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156067" xml-lang="en-US" l10n="U" oldref="12">Switch Content View</paragraph>
</tablecell>
</tablerow>
@@ -166,12 +162,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3153011" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the <link href="text/swriter/01/02110100.xhp" name="Navigation"><emph>Navigation</emph></link> icon, in the <emph>Navigation</emph> window click the <emph>Reminder</emph> icon, and then click the <emph>Previous</emph> or <emph>Next</emph> button.</ahelp>Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon, in the Navigation window click the Reminder icon, and then click the Previous or Next button.</paragraph>
<table id="tbl_id3154577">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154608" xml-lang="en-US" l10n="E">
-<image id="img_id3154904" src="sw/imglst/sr20014.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154904" xml-lang="en-US">Icon</alt>
+<image id="img_id3154904" src="sw/imglst/sr20014.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154904" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153054" xml-lang="en-US" l10n="U" oldref="15">Set Reminder</paragraph>
</tablecell>
</tablerow>
@@ -182,12 +178,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3159242" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_NAVI_TBX10">Moves the cursor to the header, or from the header to the document text area.</ahelp></paragraph>
<table id="tbl_id3159262">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153900" xml-lang="en-US" l10n="E">
-<image id="img_id3153911" src="sw/imglst/sc20179.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153911" xml-lang="en-US">Icon</alt>
+<image id="img_id3153911" src="sw/imglst/sc20179.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153911" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147104" xml-lang="en-US" l10n="U" oldref="19">Header</paragraph>
</tablecell>
</tablerow>
@@ -198,12 +194,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3147137" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_NAVI_TBX11">Moves the cursor to the footer, or from the footer to the document text area.</ahelp></paragraph>
<table id="tbl_id3149777">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150217" xml-lang="en-US" l10n="E">
-<image id="img_id3150224" src="sw/imglst/sc20177.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150224" xml-lang="en-US">Icon</alt>
+<image id="img_id3150224" src="sw/imglst/sc20177.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150224" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145220" xml-lang="en-US" l10n="U" oldref="22">Footer</paragraph>
</tablecell>
</tablerow>
@@ -214,12 +210,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3150314" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_NAVI_TBX12">Jumps between the footnote text and the footnote anchor.</ahelp></paragraph>
<table id="tbl_id3150333">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153100" xml-lang="en-US" l10n="E">
-<image id="img_id3153108" src="sw/imglst/sc20182.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153108" xml-lang="en-US">Icon</alt>
+<image id="img_id3153108" src="sw/imglst/sc20182.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153108" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150650" xml-lang="en-US" l10n="U" oldref="25">Anchor &lt;-&gt; Text</paragraph>
</tablecell>
</tablerow>
@@ -230,12 +226,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3155828" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_NAVI_TBX4">Sets the drag and drop options for inserting items from the Navigator into a document, for example, as a hyperlink. Click this icon, and then choose the option that you want to use.</ahelp></paragraph>
<table id="tbl_id3155849">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155120" xml-lang="en-US" l10n="E">
-<image id="img_id3155126" src="res/commandimagelist/sc_chainframes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155126" xml-lang="en-US">Icon</alt>
+<image id="img_id3155126" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155126" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147042" xml-lang="en-US" l10n="U" oldref="36">Drag mode</paragraph>
</tablecell>
</tablerow>
@@ -258,12 +254,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3148826" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="HID_NAVI_OUTLINES">Click <emph>1 </emph>to only view the top level headings in the Navigator window, and <emph>10</emph> to view all of the headings.</ahelp></paragraph>
<table id="tbl_id3147535">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153588" xml-lang="en-US" l10n="E">
-<image id="img_id3153595" src="sw/imglst/sc20236.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153595" xml-lang="en-US">Icon</alt>
+<image id="img_id3153595" src="sw/imglst/sc20236.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153595" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145554" xml-lang="en-US" l10n="U" oldref="47">Outline level</paragraph>
</tablecell>
</tablerow>
@@ -274,12 +270,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="CHG" oldref="49"><ahelp hid="HID_NAVI_TBX5">Moves the selected heading, and the text below the heading, up one heading position in the Navigator and in the document. To move only the selected heading and not the text associated with the heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3151301">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="E">
-<image id="img_id3153275" src="sw/imglst/sc20174.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153275" xml-lang="en-US">Icon</alt>
+<image id="img_id3153275" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153275" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149147" xml-lang="en-US" l10n="U" oldref="50">Chapter Up</paragraph>
</tablecell>
</tablerow>
@@ -290,12 +286,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3154440" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="HID_NAVI_TBX6">Moves the selected heading, and the text below the heading, down one heading position in the Navigator and in the document. To move only the selected heading and not the text associated with the heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3153737">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="E">
-<image id="img_id3150828" src="sw/imglst/sc20171.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150828" xml-lang="en-US">Icon</alt>
+<image id="img_id3150828" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150828" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="53">Chapter down</paragraph>
</tablecell>
</tablerow>
@@ -306,12 +302,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3151354" xml-lang="en-US" l10n="CHG" oldref="56"><ahelp hid="HID_NAVI_TBX14">Increases the outline level of the selected heading, and the headings that occur below the heading, by one. To only increase the outline level of the selected heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3148898">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155414" xml-lang="en-US" l10n="E">
-<image id="img_id3155420" src="sw/imglst/sc20172.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155420" xml-lang="en-US">Icon</alt>
+<image id="img_id3155420" src="sw/imglst/sc20172.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155420" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153697" xml-lang="en-US" l10n="U" oldref="57">Promote level</paragraph>
</tablecell>
</tablerow>
@@ -322,12 +318,12 @@ FPE: Deleted screenshot</lastedited>
<paragraph role="paragraph" id="par_id3150707" xml-lang="en-US" l10n="CHG" oldref="59"><ahelp hid="HID_NAVI_TBX15">Decreases the outline level of the selected heading, and the headings that occur below the heading, by one. To only decrease the outline level of the selected heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3150746">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148414" xml-lang="en-US" l10n="E">
-<image id="img_id3148420" src="sw/imglst/sc20173.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148420" xml-lang="en-US">Icon</alt>
+<image id="img_id3148420" src="sw/imglst/sc20173.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148420" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147324" xml-lang="en-US" l10n="U" oldref="60">Demote level</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/01/02150000.xhp b/helpcontent2/source/text/swriter/01/02150000.xhp
index 0cbc3b8b96..a3a0564c53 100644
--- a/helpcontent2/source/text/swriter/01/02150000.xhp
+++ b/helpcontent2/source/text/swriter/01/02150000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02150000.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -29,28 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
<topic id="textswriter0102150000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Edit Footnotes</title>
+<title id="tit" xml-lang="en-US">Footnote/Endnote</title>
<filename>/text/swriter/01/02150000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-12T16:11:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SW:MODALDIALOG:DLG_INS_FOOTNOTE" id="bm_id3149483" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_EDIT_FOOTNOTE" id="bm_id8871205" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_EDIT_FOOTNOTE" id="bm_id8871205" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EditFootnote" id="bm_id3149486" localize="false"/>
-<paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/02150000.xhp" name="Edit Footnotes">Edit Footnotes</link></paragraph>
-<paragraph role="paragraph" id="par_id3149097" xml-lang="en-US" l10n="U" oldref="2"><variable id="fusstext"><ahelp hid=".uno:EditFootnote">Edits the selected footnote or endnote anchor. Click in front of or behind the footnote or endnote, and then choose this command.</ahelp>
+<paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/02150000.xhp" name="Edit Footnotes">Footnote/Endnote</link></paragraph>
+<paragraph role="paragraph" id="par_id3149097" xml-lang="en-US" l10n="U" oldref="2"><variable id="fusstext"><ahelp hid=".uno:EditFootnote">Edits the selected footnote or endnote anchor. Click in front of the footnote or endnote, and then choose this command.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000402.xhp#fussnote"/>
+<embed href="text/swriter/00/00000402.xhp#fussnote"/>
</section>
<paragraph role="paragraph" id="par_id3149035" xml-lang="en-US" l10n="U" oldref="13">To edit the text of a footnote or endnote, click in the footnote area at the bottom of the page, or at the end of the document.</paragraph>
<paragraph role="note" id="par_id3145776" xml-lang="en-US" l10n="U" oldref="11">To quickly jump to the footnote or endnote text, click the anchor for note in the document. You can also position the cursor in front of or behind the marker, and then press Ctrl+Shift+PgDn. To jump back to the anchor for the note, press PgUp.</paragraph>
@@ -74,12 +72,12 @@
<paragraph role="paragraph" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_PREV">Moves to the previous footnote or endnote anchor in the document.</ahelp></paragraph>
<table id="tbl_id3148791">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150023" xml-lang="en-US" l10n="E">
-<image id="img_id3150030" src="res/sc10618.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150030" xml-lang="en-US">Icon</alt>
+<image id="img_id3150030" src="res/sc10618.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150030" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154614" xml-lang="en-US" l10n="U" oldref="25">Previous footnote</paragraph>
</tablecell>
</tablerow>
@@ -90,17 +88,17 @@
<paragraph role="paragraph" id="par_id3149638" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_NEXT">Moves to the next footnote or endnote anchor in the document.</ahelp></paragraph>
<table id="tbl_id3150662">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154029" xml-lang="en-US" l10n="E">
-<image id="img_id3154044" src="res/sc10617.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154044" xml-lang="en-US">Icon</alt>
+<image id="img_id3154044" src="res/sc10617.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154044" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149606" xml-lang="en-US" l10n="U" oldref="28">Next footnote</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="33"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Insert Footnote</link> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="33"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Insert Footnote/Endnote</link> dialog.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04030000.xhp b/helpcontent2/source/text/swriter/01/04030000.xhp
index a97e8f6bf7..15cb0265ef 100644
--- a/helpcontent2/source/text/swriter/01/04030000.xhp
+++ b/helpcontent2/source/text/swriter/01/04030000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04030000.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,24 +32,20 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
<topic id="textswriter0104030000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert Footnote</title>
+<title id="tit" xml-lang="en-US">Footnote/Endnote</title>
<filename>/text/swriter/01/04030000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-03T13:43:52">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FOOTNOTE_DLG" id="bm_id1360835" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFootnoteDialog" id="bm_id3148770" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FOOTNOTE" id="bm_id4793576" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFootnote" id="bm_id3148773" localize="false"/>
-<paragraph role="heading" id="hd_id3145241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Insert Footnote</link></paragraph>
+<paragraph role="heading" id="hd_id3145241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Footnote/Endnote</link></paragraph>
<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="2"><variable id="fussnoteein"><ahelp hid=".uno:InsertFootnote">Inserts a footnote or an endnote in the document. The anchor for the note is inserted at the current cursor position.</ahelp> You can choose between automatic numbering or a custom symbol.
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154645" xml-lang="en-US" l10n="U" oldref="23"><variable id="endnoten">The following applies to both footnotes and endnotes.
@@ -57,13 +53,13 @@
<paragraph role="paragraph" id="par_id3151175" xml-lang="en-US" l10n="U" oldref="24"><variable id="endnotetext">Footnotes are inserted at the end of a page, and endnotes are inserted at the end of a document.
</variable><comment>UFI: what about sections? Will endnotes be placed there?</comment></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#fussnoteein"/>
+<embed href="text/swriter/00/00000404.xhp#fussnoteein"/>
</section>
<paragraph role="heading" id="hd_id3154106" xml-lang="en-US" level="2" l10n="U" oldref="7">Numbering</paragraph>
<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="16">Select the type of numbering that you want to use for footnotes and endnotes.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO" id="bm_id3154482" localize="false"/>
<paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="8">Automatic</paragraph>
-<paragraph role="paragraph" id="par_id3153670" xml-lang="en-US" l10n="U" oldref="17"><variable id="bearbeitenautomatisch"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</ahelp> To change the settings for automatic numbering, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes</emph></link>.
+<paragraph role="paragraph" id="par_id3153670" xml-lang="en-US" l10n="U" oldref="17"><variable id="bearbeitenautomatisch"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</ahelp> To change the settings for automatic numbering, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>.
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR" id="bm_id3152963" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR" id="bm_id3152962" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04130000.xhp b/helpcontent2/source/text/swriter/01/04130000.xhp
index 9c2363cf8f..c1a426f509 100644
--- a/helpcontent2/source/text/swriter/01/04130000.xhp
+++ b/helpcontent2/source/text/swriter/01/04130000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04130000.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,29 +30,26 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0104130000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Frame</title>
<filename>/text/swriter/01/04130000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-14T10:10:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FRAME" id="bm_id2796990" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FRAME" id="bm_id2796990" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFrame" id="bm_id3154640" localize="false"/>
<paragraph role="heading" id="hd_id3151189" xml-lang="en-US" level="1" l10n="U" oldref="1">Frame</paragraph>
<paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="rahm"><ahelp hid=".uno:InsertFrame">Inserts a frame that you can use to create a layout of one or more columns of text and objects.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#rahmen"/>
+<embed href="text/swriter/00/00000404.xhp#rahmen"/>
</section>
-<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US" l10n="CHG" oldref="37">To edit a frame, click the border to select it, and then choose <emph>Format - Frame</emph>. You can also resize or move a selected frame using special <link href="text/swriter/01/04130100.xhp" name="shortcut keys">shortcut keys</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US" l10n="CHG" oldref="37">To edit a frame, click the border to select it, and then choose <emph>Format - Frame/Object</emph>. You can also resize or move a selected frame using special <link href="text/swriter/01/04130100.xhp" name="shortcut keys">shortcut keys</link>.</paragraph>
<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="38">To delete a frame, click the border of the frame, and then press Delete.</paragraph>
<paragraph role="paragraph" id="par_id3151311" xml-lang="en-US" l10n="U" oldref="23">If you see small red arrows at the beginning and the end of text in frame, use the arrow keys to scroll through the remaining text.</paragraph>
<paragraph role="paragraph" id="par_id3155896" xml-lang="en-US" l10n="U" oldref="25">In the preview area of the <emph>Frame</emph> dialog, the frame is represented by a green rectangle, and the reference area by a red rectangle.</paragraph>
@@ -65,7 +63,7 @@
<embed href="text/swriter/01/05040500.xhp#spalten"/>
<embed href="text/swriter/01/05060700.xhp#makro"/>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
-<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FRAME_INTERACT" id="bm_id8960281" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FRAME_INTERACT" id="bm_id8960281" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFrameInteract" id="bm_id3147096" localize="false"/>
<paragraph role="heading" id="hd_id3149107" xml-lang="en-US" level="3" l10n="CHG" oldref="5">Icon on the Insert toolbar:</paragraph>
<paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="CHG" oldref="6"><variable id="syrahmentext"><ahelp hid=".uno:InsertFrameInteract">Draws a frame where you drag in the document. Click the arrow next to the icon to select the number of columns for the frame.</ahelp>
diff --git a/helpcontent2/source/text/swriter/01/05150000.xhp b/helpcontent2/source/text/swriter/01/05150000.xhp
index e72f0d559a..9b956daeda 100755
--- a/helpcontent2/source/text/swriter/01/05150000.xhp
+++ b/helpcontent2/source/text/swriter/01/05150000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150000.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,34 +30,32 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">AutoFormat</title>
+<topic id="textswriter0105150000xml" indexer="include">
+<title id="tit" xml-lang="en-US">AutoCorrect</title>
<filename>/text/swriter/01/05150000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-02T13:30:47">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="autoformat">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153925"><bookmark_value>AutoFormat function; text documents</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3153925" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoFormat</link></paragraph>
-<paragraph role="paragraph" id="par_id3151182" xml-lang="en-US" l10n="U" oldref="2">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph></link>.</paragraph>
+<paragraph role="heading" id="hd_id3153925" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
+<paragraph role="paragraph" id="par_id3151182" xml-lang="en-US" l10n="U" oldref="2">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph>
+<emph> Options</emph></link>.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#autoformat1"/>
+<embed href="text/swriter/00/00000405.xhp#autoformat1"/>
</section>
<embed href="text/swriter/01/05150100.xhp#eingabe"/>
<embed href="text/swriter/01/05150200.xhp#dokument"/>
<embed href="text/swriter/01/05150300.xhp#ananbe"/>
+<paragraph role="heading" id="hd_id1029200810080924" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/06040000.xhp">AutoCorrect Options</link></paragraph>
+<paragraph role="paragraph" id="par_id1029200810080924" xml-lang="en-US" l10n="NEW">Opens the AutoCorrect dialog.</paragraph>
<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="CHG" oldref="3">To open the <link href="text/swriter/01/05150101.xhp" name="AutoFormat for Tables">AutoFormat for Tables</link> dialog, click in a table cell, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05150100.xhp b/helpcontent2/source/text/swriter/01/05150100.xhp
index 3047d56e7b..2f0fbdf8c8 100644
--- a/helpcontent2/source/text/swriter/01/05150100.xhp
+++ b/helpcontent2/source/text/swriter/01/05150100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150100.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,33 +30,31 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150100xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105150100xml" indexer="include">
<title id="tit" xml-lang="en-US">While Typing</title>
<filename>/text/swriter/01/05150100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-16T09:51:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="eingabe">
<bookmark xml-lang="en-US" branch="hid/HID_AUTOFORMAT_EXEC" id="bm_id3145252" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_AUTO" id="bm_id3894242" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_AUTO" id="bm_id3894242" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OnlineAutoFormat" id="bm_id3154491" localize="false"/>
<paragraph role="heading" id="hd_id3147436" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150100.xhp" name="While Typing">While Typing</link></paragraph>
-<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:OnlineAutoFormat">Automatically formats the document while you type. To set the formatting options, choose <emph>Tools - AutoCorrect</emph>, and then click the <emph>Options </emph>tab.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:OnlineAutoFormat">Automatically formats the document while you type. To set the formatting options, choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>, and then click the <emph>Options </emph>tab.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#eingabe"/>
+<embed href="text/swriter/00/00000405.xhp#eingabe"/>
</section>
-<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="U" oldref="3">You can use AutoFormat to format text documents and plain ASCII text files, but not characters that you have manually formatted. Automatic <link href="text/shared/01/06040100.xhp" name="word completion">word completion</link> only occurs after you type a word for the second time in a document.</paragraph>
-<paragraph role="tip" id="par_id3147407" xml-lang="en-US" l10n="U" oldref="24">To reverse the last AutoFormat action, choose <emph>Edit - </emph><link href="text/shared/01/02010000.xhp" name="Undo"><emph>Undo</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="U" oldref="3">You can use AutoCorrect to format text documents and plain ASCII text files, but not characters that you have manually formatted. Automatic <link href="text/shared/01/06040100.xhp" name="word completion">word completion</link> only occurs after you type a word for the second time in a document.</paragraph>
+<paragraph role="tip" id="par_id3147407" xml-lang="en-US" l10n="U" oldref="24">To reverse the last AutoCorrect action, choose <emph>Edit - </emph><link href="text/shared/01/02010000.xhp" name="Undo"><emph>Undo</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="25"><link href="text/swriter/01/05150200.xhp" name="Other AutoFormat rules">Other AutoFormat rules</link></paragraph>
+<paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="25"><link href="text/swriter/01/05150200.xhp" name="Other AutoFormat rules">Other AutoCorrect rules</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05150200.xhp b/helpcontent2/source/text/swriter/01/05150200.xhp
index a037db1121..aef854f350 100644
--- a/helpcontent2/source/text/swriter/01/05150200.xhp
+++ b/helpcontent2/source/text/swriter/01/05150200.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150200.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -29,22 +30,19 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150200xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105150200xml" indexer="include">
<title id="tit" xml-lang="en-US">Apply</title>
<filename>/text/swriter/01/05150200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-16T09:52:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="dokument">
-<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_APPLY" id="bm_id9349581" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_APPLY" id="bm_id9349581" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormatApply" id="bm_id3154656" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id5028839"><bookmark_value>automatic heading formatting</bookmark_value>
</bookmark>
@@ -53,16 +51,17 @@
<bookmark_value>separator lines;AutoFormat function</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150200.xhp" name="Apply">Apply</link></paragraph>
-<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#autoformat2"/>
+<embed href="text/swriter/00/00000405.xhp#autoformat2"/>
</section>
<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
<paragraph role="paragraph" id="par_id3147404" xml-lang="en-US" l10n="U" oldref="15">When you apply automatic formats, the following rules apply:</paragraph>
-<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">AutoFormat for Headings</paragraph>
+<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">AutoCorrect for Headings</paragraph>
<paragraph role="paragraph" id="par_id3154505" xml-lang="en-US" l10n="U" oldref="4">A paragraph is formatted as a heading when the following conditions are met:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="19">paragraph begins with a capital letter</paragraph>
</listitem>
@@ -73,13 +72,13 @@
<paragraph role="listitem" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="21">empty paragraph above and below the paragraph</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="2" l10n="U" oldref="8">AutoFormat for Bullets / Numbering</paragraph>
+<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="2" l10n="U" oldref="8">AutoCorrect for Bullets / Numbering</paragraph>
<paragraph role="paragraph" id="par_id3156316" xml-lang="en-US" l10n="U" oldref="9">To create a bulleted list, type a hyphen (-), star (*), or plus sign (+), followed by a space or tab at the beginning of a paragraph.</paragraph>
<paragraph role="paragraph" id="par_id3150763" xml-lang="en-US" l10n="U" oldref="18">To create a numbered list, type a number followed by a period (.), followed by a space or tab at the beginning of a paragraph. </paragraph>
<paragraph role="note" id="par_id3147507" xml-lang="en-US" l10n="U" oldref="16">Automatic numbering is only applied to paragraphs formatted with the <emph>Standard</emph>, <emph>Text body</emph> or <emph>Text body indent</emph> paragraph styles.</paragraph>
-<paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="2" l10n="U" oldref="10">AutoFormat for Separator Lines</paragraph>
+<paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="2" l10n="U" oldref="10">AutoCorrect for Separator Lines</paragraph>
<paragraph role="paragraph" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="11">If you type three or more hyphens (---), underscores (___) or equal signs (===) on line and then press Enter, the paragraph is replaced by a horizontal line as wide as the page. The line is actually the <link href="text/shared/01/05030500.xhp" name="lower border">lower border</link> of the preceding paragraph. The following rules apply:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="12">Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 mm).</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/01/05150300.xhp b/helpcontent2/source/text/swriter/01/05150300.xhp
index b91314cf24..7e960cc611 100644
--- a/helpcontent2/source/text/swriter/01/05150300.xhp
+++ b/helpcontent2/source/text/swriter/01/05150300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150300.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,28 +30,26 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105150300xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105150300xml" indexer="include">
<title id="tit" xml-lang="en-US">Apply and Edit Changes</title>
<filename>/text/swriter/01/05150300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-16T09:56:16">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ananbe">
-<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_REDLINE_APPLY" id="bm_id766634" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_REDLINE_APPLY" id="bm_id766634" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormatRedlineApply" id="bm_id3145829" localize="false"/>
<paragraph role="heading" id="hd_id3149353" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150300.xhp" name="Apply and Edit Changes">Apply and Edit Changes</link></paragraph>
-<paragraph role="paragraph" id="par_id3152999" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatRedlineApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>. In a dialog, you are asked to accept or reject the changes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152999" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatRedlineApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>. In a dialog, you are asked to accept or reject the changes.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#autoformat3"/>
+<embed href="text/swriter/00/00000405.xhp#autoformat3"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_AUTOFORMAT_ACCEPT" id="bm_id3149022" localize="false"/>
<paragraph role="heading" id="hd_id3148775" xml-lang="en-US" level="2" l10n="U" oldref="4">Accept All</paragraph>
@@ -60,8 +59,8 @@
<paragraph role="paragraph" id="par_id3149711" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_AUTOFORMAT_REJECT">Rejects all of the formatting changes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_AUTOFORMAT_EDIT_CHG" id="bm_id3147564" localize="false"/>
<paragraph role="heading" id="hd_id3150756" xml-lang="en-US" level="2" l10n="U" oldref="8">Edit Changes</paragraph>
-<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_AUTOFORMAT_EDIT_CHG">Opens a dialog where you can accept or reject AutoFormat changes. You can also view the changes made by a specific author or on a specific date.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_AUTOFORMAT_EDIT_CHG">Opens a dialog where you can accept or reject AutoCorrect changes. You can also view the changes made by a specific author or on a specific date.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/01/02230402.xhp" name="Accept or Reject AutoFormat Changes, Filter tab">Accept or Reject AutoFormat Changes, Filter tab</link></paragraph>
+<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/01/02230402.xhp" name="Accept or Reject AutoFormat Changes, Filter tab">Accept or Reject Changes, Filter tab</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/06080000.xhp b/helpcontent2/source/text/swriter/01/06080000.xhp
index 16e47b953d..8bafaa4ba9 100644
--- a/helpcontent2/source/text/swriter/01/06080000.xhp
+++ b/helpcontent2/source/text/swriter/01/06080000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06080000.xhp,v $
- * $Revision: 1.6 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,27 +30,26 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
<topic id="textswriter0106080000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Footnote options</title>
+<title id="tit" xml-lang="en-US">Footnotes/Endnotes Settings</title>
<filename>/text/swriter/01/06080000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <bookmark xml-lang="en-US" branch="hid/FN_FORMAT_FOOTNOTE_DLG" id="bm_id3799245" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:FootnoteDialog" xml-lang="en-US" id="bm_id3150014"/><paragraph id="hd_id3153004" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/06080000.xhp" name="Footnote options">Footnote options</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149882" xml-lang="en-US" oldref="2"><variable id="fnoten"><ahelp hid=".uno:FootnoteDialog" visibility="visible">Specifies the display settings for footnotes and endnotes.</ahelp></variable></paragraph>
- <section id="howtoget">
- <embed href="text/swriter/00/00000406.xhp#fussnoteneinstellung"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FORMAT_FOOTNOTE_DLG" id="bm_id3799245" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FootnoteDialog" id="bm_id3150014" localize="false"/>
+<paragraph role="heading" id="hd_id3153004" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/06080000.xhp" name="Footnote options">Footnotes/Endnotes Settings</link></paragraph>
+<paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="U" oldref="2"><variable id="fnoten"><ahelp hid=".uno:FootnoteDialog">Specifies the display settings for footnotes and endnotes.</ahelp>
+</variable></paragraph>
+<section id="howtoget">
+<embed href="text/swriter/00/00000406.xhp#fussnoteneinstellung"/>
</section>
- <embed href="text/swriter/01/06080100.xhp#fussnoten"/>
- <embed href="text/swriter/01/06080200.xhp#endnoten"/>
- </body>
+<embed href="text/swriter/01/06080100.xhp#fussnoten"/>
+<embed href="text/swriter/01/06080200.xhp#endnoten"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/06090000.xhp b/helpcontent2/source/text/swriter/01/06090000.xhp
index 35697f8fe1..18beb3247a 100644
--- a/helpcontent2/source/text/swriter/01/06090000.xhp
+++ b/helpcontent2/source/text/swriter/01/06090000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06090000.xhp,v $
- * $Revision: 1.11 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0106090000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0106090000xml" indexer="include">
<title id="tit" xml-lang="en-US">Convert Text to Table</title>
<filename>/text/swriter/01/06090000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-15T16:23:23">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147402"><bookmark_value>converting; text, into tables</bookmark_value>
@@ -55,7 +51,7 @@
<paragraph role="paragraph" id="par_id3145829" xml-lang="en-US" l10n="U" oldref="2"><variable id="texttab"><ahelp hid=".uno:ConvertTableText">Converts the selected text into a table, or the selected table into text.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000406.xhp#texttabelle"/>
+<embed href="text/swriter/00/00000406.xhp#texttabelle"/>
</section>
<paragraph role="paragraph" id="par_id3150015" xml-lang="en-US" l10n="U" oldref="15">The options available in this dialog depending on the type of conversion.</paragraph>
<paragraph role="heading" id="hd_id3145247" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Separate text at</paragraph>
@@ -79,7 +75,7 @@
<paragraph role="heading" id="hd_id3147508" xml-lang="en-US" level="3" l10n="CHG" oldref="18">Equal width for all columns</paragraph>
<paragraph role="paragraph" id="par_id3154278" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN">Creates columns of equal width, regardless of the position of the column marker.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT" id="bm_id3152939" localize="false"/>
-<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="U" oldref="14">AutoFormat</paragraph>
+<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="U" oldref="14">AutoCorrect</paragraph>
<embed href="text/swriter/01/04150000.xhp#autoformattext"/>
<paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="2" l10n="U" oldref="22">Options</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_HEADER" id="bm_id3153528" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/guide/auto_numbering.xhp b/helpcontent2/source/text/swriter/guide/auto_numbering.xhp
index b31ffd31c7..abb596dba7 100644
--- a/helpcontent2/source/text/swriter/guide/auto_numbering.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_numbering.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: auto_numbering.xhp,v $
- * $Revision: 1.10 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,19 +32,15 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideauto_numberingxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Creating Numbered or Bulleted Lists as You Type</title>
+<topic id="textswriterguideauto_numberingxml" indexer="include">
+<title id="tit" xml-lang="en-US">Creating Numbered or Bulleted Lists as You Type</title>
<filename>/text/swriter/guide/auto_numbering.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3147407"><bookmark_value>numbering; lists, while typing</bookmark_value>
<bookmark_value>bullet lists;creating while typing</bookmark_value>
<bookmark_value>lists;automatic numbering</bookmark_value>
@@ -54,36 +49,36 @@
<bookmark_value>bullets; using automatically</bookmark_value>
<bookmark_value>automatic bullets</bookmark_value>
<bookmark_value>paragraphs; automatic numbering</bookmark_value>
-</bookmark>
- <comment>MW deleted "applying;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3147407" role="heading" level="1" l10n="U" oldref="26"><variable id="auto_numbering"><link href="text/swriter/guide/auto_numbering.xhp" name="Creating Numbered or Bulleted Lists as You Type">Creating Numbered or Bulleted Lists as You Type</link>
+</bookmark><comment>MW deleted "applying;"</comment>
+<paragraph role="heading" id="hd_id3147407" xml-lang="en-US" level="1" l10n="U" oldref="26"><variable id="auto_numbering"><link href="text/swriter/guide/auto_numbering.xhp" name="Creating Numbered or Bulleted Lists as You Type">Creating Numbered or Bulleted Lists as You Type</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155525" role="paragraph" l10n="U" oldref="16">$[officename] can automatically apply numbering or bullets as you type.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3154243" role="heading" level="3" l10n="U" oldref="28">To Enable Automatic Numbering and Bulleting</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152830" role="listitem" l10n="U" oldref="29">Choose <emph>Tools - AutoCorrect</emph>, click the <emph>Options</emph> tab, and then select <emph>Apply Numbering - Symbol</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152867" role="listitem" l10n="U" oldref="30">Choose <emph>Format - AutoFormat</emph>, and ensure that <emph>While Typing</emph> is selected.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id2357860" role="tip" l10n="NEW">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3152897" role="heading" level="3" l10n="U" oldref="21">To Create a Numbered or Bulleted List While You Type</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147773" role="listitem" l10n="U" oldref="22">Type 1., i., or I. to start a numbered list. Type * or - to start a bulleted list. You can also type a right parenthesis after the number instead of a period , for example, 1) or i).</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147794" role="listitem" l10n="U" oldref="23">Enter a space, type your text, and then press Enter. The new paragraph automatically receives the next number or bullet.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147814" role="listitem" l10n="U" oldref="31">Press Enter again to finish the list.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3147287" role="note" l10n="U" oldref="25">You can start a numbered list with any number.</paragraph>
- <embed href="text/shared/00/00000004.xhp#related"/>
- <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
- <paragraph xml-lang="en-US" id="par_id3154083" role="paragraph" l10n="U" oldref="27"><link href="text/shared/01/06050000.xhp" name="Format - Numbering/Bullets">Format - Bullets and Numbering</link></paragraph>
- </body>
+<paragraph role="paragraph" id="par_id3155525" xml-lang="en-US" l10n="U" oldref="16">$[officename] can automatically apply numbering or bullets as you type.</paragraph>
+<paragraph role="heading" id="hd_id3154243" xml-lang="en-US" level="3" l10n="U" oldref="28">To Enable Automatic Numbering and Bulleting</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3152830" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>, click the <emph>Options</emph> tab, and then select <emph>Apply Numbering - Symbol</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3152867" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Format - AutoCorrect</emph>, and ensure that <emph>While Typing</emph> is selected.</paragraph>
+</listitem>
+</list>
+<paragraph role="tip" id="par_id2357860" xml-lang="en-US" l10n="NEW">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
+<paragraph role="heading" id="hd_id3152897" xml-lang="en-US" level="3" l10n="U" oldref="21">To Create a Numbered or Bulleted List While You Type</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3147773" xml-lang="en-US" l10n="U" oldref="22">Type 1., i., or I. to start a numbered list. Type * or - to start a bulleted list. You can also type a right parenthesis after the number instead of a period , for example, 1) or i).</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3147794" xml-lang="en-US" l10n="U" oldref="23">Enter a space, type your text, and then press Enter. The new paragraph automatically receives the next number or bullet.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3147814" xml-lang="en-US" l10n="U" oldref="31">Press Enter again to finish the list.</paragraph>
+</listitem>
+</list>
+<paragraph role="note" id="par_id3147287" xml-lang="en-US" l10n="U" oldref="25">You can start a numbered list with any number.</paragraph>
+<embed href="text/shared/00/00000004.xhp#related"/>
+<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+<paragraph role="paragraph" id="par_id3154083" xml-lang="en-US" l10n="U" oldref="27"><link href="text/shared/01/06050000.xhp" name="Format - Numbering/Bullets">Format - Bullets and Numbering</link></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/auto_off.xhp b/helpcontent2/source/text/swriter/guide/auto_off.xhp
index d91537eb08..2301a9431c 100755
--- a/helpcontent2/source/text/swriter/guide/auto_off.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_off.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: auto_off.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguideauto_offxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Turning Off AutoFormat and AutoCorrect</title>
+<topic id="textswriterguideauto_offxml" indexer="include">
+<title id="tit" xml-lang="en-US">Turning Off AutoCorrect </title>
<filename>/text/swriter/guide/auto_off.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-06T08:40:18">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154250"><bookmark_value>turning off automatic correction</bookmark_value>
@@ -59,22 +55,23 @@
<bookmark_value>AutoCorrect function;turning off</bookmark_value>
</bookmark>
<paragraph role="paragraph" id="par_id3154250" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<paragraph role="heading" id="hd_id3147812" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="auto_off"><link href="text/swriter/guide/auto_off.xhp" name="Turning Off AutoFormat and AutoCorrect">Turning Off AutoFormat and AutoCorrect</link>
+<paragraph role="heading" id="hd_id3147812" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="auto_off"><link href="text/swriter/guide/auto_off.xhp" name="Turning Off AutoFormat and AutoCorrect">Turning Off AutoCorrect</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147833" xml-lang="en-US" l10n="CHG" oldref="2">By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. </paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN1081B" xml-lang="en-US" l10n="NEW">To quickly undo an automatic correction or completion, press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z. </paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US" l10n="NEW">To turn off most AutoFormat features, remove the check mark from the menu <emph>Format - AutoFormat - While Typing</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US" l10n="NEW">To turn off most AutoCorrect features, remove the check mark from the menu <emph>Format - AutoCorrect - While Typing</emph>.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3147251" xml-lang="en-US" level="2" l10n="U" oldref="12">To remove a word from the AutoCorrect list:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3147274" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Tools - AutoCorrect</emph>.<comment>name changed for SO8</comment></paragraph>
+<paragraph role="listitem" id="par_id3147274" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145596" xml-lang="en-US" l10n="U" oldref="23">Click the <emph>Replace</emph> tab.</paragraph>
@@ -89,7 +86,8 @@
<paragraph role="heading" id="hd_id3145668" xml-lang="en-US" level="2" l10n="U" oldref="4">To stop replacing quotation marks:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3151196" xml-lang="en-US" l10n="CHG" oldref="6">Choose <emph>Tools - AutoCorrect</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3151196" xml-lang="en-US" l10n="CHG" oldref="6">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151220" xml-lang="en-US" l10n="U" oldref="7">Click the <emph>Custom Quotes</emph> tab</paragraph>
@@ -101,7 +99,8 @@
<paragraph role="heading" id="hd_id3155076" xml-lang="en-US" level="2" l10n="U" oldref="8">To stop capitalizing the first letter of a sentence:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155099" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - AutoCorrect</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155099" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155123" xml-lang="en-US" l10n="U" oldref="11">Click the <emph>Options</emph> tab.</paragraph>
@@ -114,7 +113,8 @@
<paragraph role="paragraph" id="par_id3155415" xml-lang="en-US" l10n="U" oldref="22">$[officename] automatically draws a line when you type three of the following characters and press Enter: - _ = * ~ #</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155439" xml-lang="en-US" l10n="CHG" oldref="19">Choose <emph>Tools - AutoCorrect</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155439" xml-lang="en-US" l10n="CHG" oldref="19">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155463" xml-lang="en-US" l10n="U" oldref="20">Click the <emph>Options</emph> tab.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
index c7f6b0f456..5f381dc7f8 100755
--- a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: auto_spellcheck.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideauto_spellcheckxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideauto_spellcheckxml" indexer="include">
<title id="tit" xml-lang="en-US">Automatically Check Spelling</title>
<filename>/text/swriter/guide/auto_spellcheck.xhp</filename>
</topic>
@@ -47,7 +45,8 @@
<bookmark_value>automatic spellcheck</bookmark_value>
<bookmark_value>checking spelling;while typing</bookmark_value>
<bookmark_value>words;disabling spellcheck</bookmark_value>
-</bookmark><comment>MW deleted "text;"</comment><paragraph role="heading" id="hd_id3154265" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="auto_spellcheck"><link href="text/swriter/guide/auto_spellcheck.xhp" name="Automatically Check Spelling">Automatically Check Spelling</link>
+</bookmark><comment>MW deleted "text;"</comment>
+<paragraph role="heading" id="hd_id3154265" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="auto_spellcheck"><link href="text/swriter/guide/auto_spellcheck.xhp" name="Automatically Check Spelling">Automatically Check Spelling</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154664" xml-lang="en-US" l10n="U" oldref="5">You can have $[officename] automatically check spelling while you type and underline possible misspelt words with a red wavy line.</paragraph>
<paragraph role="heading" id="hd_id3154678" xml-lang="en-US" level="2" l10n="U" oldref="41">To check spelling automatically while you type:</paragraph>
@@ -59,12 +58,13 @@
<paragraph role="listitem" id="par_id3155569" xml-lang="en-US" l10n="U" oldref="33">Right-click a word with a red wavy underline, and then choose a suggested replacement word from the list, or from the <emph>AutoCorrect </emph>submenu.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3147759" xml-lang="en-US" l10n="U" oldref="6">If you choose a word from the <emph>AutoCorrect</emph> submenu, the underlined word and the replacement word are automatically added to the <emph>AutoCorrect</emph> list for the current language. To view the <emph>AutoCorrect</emph> list, choose <emph>Tools - AutoCorrect</emph>, and then click the <emph>Replace</emph> tab.</paragraph>
+<paragraph role="listitem" id="par_id3147759" xml-lang="en-US" l10n="U" oldref="6">If you choose a word from the <emph>AutoCorrect</emph> submenu, the underlined word and the replacement word are automatically added to the <emph>AutoCorrect</emph> list for the current language. To view the <emph>AutoCorrect</emph> list, choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>, and then click the <emph>Replace</emph> tab.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147819" xml-lang="en-US" l10n="U" oldref="7">You can also add the underlined word to your custom dictionary by choosing <emph>Add</emph>.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/guide/autocorr_except.xhp b/helpcontent2/source/text/swriter/guide/autocorr_except.xhp
index 22eb148190..1cc56d54da 100644
--- a/helpcontent2/source/text/swriter/guide/autocorr_except.xhp
+++ b/helpcontent2/source/text/swriter/guide/autocorr_except.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: autocorr_except.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguideautocorr_exceptxml" indexer="exclude" status="PUBLISH">
+<topic id="textswriterguideautocorr_exceptxml" indexer="exclude">
<title id="tit" xml-lang="en-US">Adding Exceptions to the AutoCorrect List</title>
<filename>/text/swriter/guide/autocorr_except.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-05T10:16:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152887"><bookmark_value>AutoCorrect function; adding exceptions</bookmark_value>
@@ -58,13 +54,14 @@
<paragraph role="heading" id="hd_id3155554" xml-lang="en-US" level="2" l10n="U" oldref="12">To Add an Exception to the AutoCorrect Exceptions List</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155576" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Tools - AutoCorrect</emph>, and then click the <emph>Exceptions </emph>tab.</paragraph>
+<paragraph role="listitem" id="par_id3155576" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>, and then click the <emph>Exceptions </emph>tab.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3147762" xml-lang="en-US" l10n="U" oldref="18">Do one of the following:</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147786" xml-lang="en-US" l10n="U" oldref="19">Type the abbreviation followed by a period in the <emph>Abbreviations (no subsequent capital) </emph>box and click <emph>New</emph>.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
index ee4827364f..1e1b9c6e47 100644
--- a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
+++ b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: footnote_usage.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguidefootnote_usagexml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidefootnote_usagexml" indexer="include">
<title id="tit" xml-lang="en-US">Inserting and Editing Footnotes or Endnotes</title>
<filename>/text/swriter/guide/footnote_usage.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:26:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145819"><bookmark_value>endnotes;inserting and editing</bookmark_value>
@@ -61,7 +57,7 @@
<paragraph role="listitem" id="par_id3155903" xml-lang="en-US" l10n="U" oldref="25">Click in your document where you want to place the anchor of the note.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147120" xml-lang="en-US" l10n="U" oldref="26">Choose <link href="text/swriter/01/04030000.xhp" name="Insert - Footnote"><emph>Insert - Footnote</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3147120" xml-lang="en-US" l10n="U" oldref="26">Choose <link href="text/swriter/01/04030000.xhp" name="Insert - Footnote"><emph>Insert - Footnote/Endnote</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150937" xml-lang="en-US" l10n="U" oldref="34">In the <emph>Numbering </emph>area, select the format that you want to use. If you select <emph>Character</emph>, click the browse button (<emph>...</emph>) and select the character that you want to use for the footnote.</paragraph>
@@ -78,55 +74,56 @@
</list>
<table id="tbl_id3150745">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148843" xml-lang="en-US" l10n="E">
-<image id="img_id3148857" src="res/commandimagelist/sc_insertfootnote.png" width="5.64mm" height="5.64mm"><alt id="alt_id3148857" xml-lang="en-US">Icon</alt>
+<image id="img_id3148857" src="res/commandimagelist/sc_insertfootnote.png" width="0.222in" height="0.222in"><alt id="alt_id3148857" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153176" xml-lang="en-US" l10n="CHG" oldref="27">You can also insert footnotes by clicking the <emph>Insert Footnote Directly</emph> icon on the <emph>Insert</emph> toolbar.</paragraph>
</tablecell>
</tablerow>
</table>
<paragraph role="heading" id="hd_id3155543" xml-lang="en-US" level="2" l10n="U" oldref="28">Editing Footnotes or Endnotes</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155563" xml-lang="en-US" l10n="U" oldref="29">To edit the text of a footnote or endnote, click in the note, or click the anchor for the note in the text.</paragraph>
</listitem>
</list>
<table id="tbl_id3155582">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150119" xml-lang="en-US" l10n="E">
-<image id="img_id3150126" src="res/helpimg/refhand.png" width="8.47mm" height="8.47mm"><alt id="alt_id3150126" xml-lang="en-US">Mouse hand cursor</alt>
+<image id="img_id3150126" src="res/helpimg/refhand.png" width="0.3335in" height="0.3335in"><alt id="alt_id3150126" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150167" xml-lang="en-US" l10n="U" oldref="6">The mouse pointer changes to a hand when you rest it over a footnote or endnote anchor in your document.</paragraph>
</tablecell>
</tablerow>
</table>
-<list type="unordered">
+
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145029" xml-lang="en-US" l10n="U" oldref="40">To change the format of a footnote, click in the footnote, press F11 to open the Styles and Formatting window, right-click "Footnote" in the list, and then choose <emph>Modify</emph>.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3145062" xml-lang="en-US" l10n="U" oldref="30">To jump from the footnote or endnote text to the note anchor in the text, press <item type="keycode">PageUp</item>.</paragraph>
+<paragraph role="listitem" id="par_id3145062" xml-lang="en-US" l10n="U" oldref="30">To jump from the footnote or endnote text to the note anchor in the text, press PageUp.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145081" xml-lang="en-US" l10n="U" oldref="4">To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose <link href="text/swriter/01/02150000.xhp" name="Edit - Footnote"><emph>Edit - Footnote</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3145081" xml-lang="en-US" l10n="U" oldref="4">To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose <link href="text/swriter/01/02150000.xhp" name="Edit - Footnote"><emph>Edit - Footnote/Endnote</emph></link>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147776" xml-lang="en-US" l10n="U" oldref="3">To change the formatting that $[officename] applies to footnotes and endnotes, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3147776" xml-lang="en-US" l10n="U" oldref="3">To change the formatting that $[officename] applies to footnotes and endnotes, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3147813" xml-lang="en-US" l10n="U" oldref="15">To edit the properties of the text area for footnotes or endnotes, choose <emph>Format - Page</emph>, and then click the <link href="text/swriter/01/05040600.xhp" name="Footnote"><emph>Footnote</emph></link> tab.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147232" xml-lang="en-US" l10n="U" oldref="41">To remove a footnote, delete the footnote anchor in the text.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
index 1750b6f5c6..443248f9d2 100644
--- a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
+++ b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: nonprintable_text.xhp,v $
- * $Revision: 1.4 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguidenonprintable_textxhp" indexer="include" status="PUBLISH">
+<topic id="textswriterguidenonprintable_textxhp" indexer="include">
<title id="tit" xml-lang="en-US">Creating Non-printing Text</title>
<filename>/text/swriter/guide/nonprintable_text.xhp</filename>
</topic>
@@ -45,8 +43,10 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3148856"><bookmark_value>non-printing text</bookmark_value>
<bookmark_value>text; non-printable</bookmark_value>
-</bookmark><comment>mw copied two entries from hidden_text.xhp</comment><paragraph role="heading" id="hd_id3148856" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="nonprintable_text"><link href="text/swriter/guide/nonprintable_text.xhp" name="Creating Non-printing Text">Creating Non-printing Text</link>
-</variable></paragraph><comment>MW created this guide from hidden_text.xhp</comment><paragraph role="paragraph" id="par_id4685201" xml-lang="en-US" l10n="NEW">To create text that is not to be printed do the following:</paragraph>
+</bookmark><comment>mw copied two entries from hidden_text.xhp</comment>
+<paragraph role="heading" id="hd_id3148856" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="nonprintable_text"><link href="text/swriter/guide/nonprintable_text.xhp" name="Creating Non-printing Text">Creating Non-printing Text</link>
+</variable></paragraph><comment>MW created this guide from hidden_text.xhp</comment>
+<paragraph role="paragraph" id="par_id4685201" xml-lang="en-US" l10n="NEW">To create text that is not to be printed do the following:</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3149789" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Insert - Frame</emph>.</paragraph>
@@ -55,7 +55,7 @@
<paragraph role="listitem" id="par_id3150224" xml-lang="en-US" l10n="U" oldref="15">Enter text in the frame and if you want, resize the frame.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150242" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>Format - Frame</emph>, and then click the<emph> Options</emph> tab.</paragraph>
+<paragraph role="listitem" id="par_id3150242" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>Format - Frame/Object</emph>, and then click the<emph> Options</emph> tab.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145227" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Properties</emph> area, clear the <emph>Print</emph> check box.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
index 4a1e775885..38e1354f96 100644
--- a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
+++ b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: removing_line_breaks.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguideremoving_line_breaksxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideremoving_line_breaksxml" indexer="include">
<title id="tit" xml-lang="en-US">Removing Line Breaks</title>
<filename>/text/swriter/guide/removing_line_breaks.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:41:19">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149687"><bookmark_value>hard returns in pasted text</bookmark_value>
@@ -53,11 +49,13 @@
</bookmark><comment>MW changed "removing;..." to "deleting;...".</comment>
<paragraph role="heading" id="hd_id3155916" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="removing_line_breaks"><link href="text/swriter/guide/removing_line_breaks.xhp">Removing Line Breaks</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="2">Use the AutoFormat feature to remove line breaks that occur within sentences. Unwanted line breaks can occur when you copy text from another source and paste it into a text document.</paragraph>
-<paragraph role="note" id="par_id3153413" xml-lang="en-US" l10n="U" oldref="3">This AutoFormat feature only works on text that is formatted with the "Default" paragraph style. </paragraph>
+<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="2">Use the AutoCorrect feature to remove line breaks that occur within sentences. Unwanted line breaks can occur when you copy text from another source and paste it into a text document.</paragraph>
+<paragraph role="note" id="par_id3153413" xml-lang="en-US" l10n="U" oldref="3">This AutoCorrect feature only works on text that is formatted with the "Default" paragraph style. </paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153138" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - AutoCorrect.</emph>
+<paragraph role="listitem" id="par_id3153138" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
+<emph>.</emph>
</paragraph>
</listitem>
<listitem>
@@ -73,7 +71,7 @@
<paragraph role="listitem" id="par_id3156253" xml-lang="en-US" l10n="CHG" oldref="8">In the <emph>Apply Style </emph>box on the <emph>Formatting</emph> bar, choose <emph>Default</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153388" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - AutoFormat - Apply</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153388" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/swriter/guide/smarttags.xhp b/helpcontent2/source/text/swriter/guide/smarttags.xhp
index 765f187065..5c1cfd4106 100644
--- a/helpcontent2/source/text/swriter/guide/smarttags.xhp
+++ b/helpcontent2/source/text/swriter/guide/smarttags.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: smarttags.xhp,v $
- * $Revision: 1.6 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguidesmarttagsxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidesmarttagsxml" indexer="include">
<title id="tit" xml-lang="en-US">Using Smart Tags</title>
<filename>/text/swriter/guide/smarttags.xhp</filename>
</topic>
@@ -48,13 +46,14 @@
<bookmark_value>options;smart tags</bookmark_value>
<bookmark_value>disabling;smart tags</bookmark_value>
<bookmark_value>installing;smart tags</bookmark_value>
-</bookmark><comment>MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entries</comment><paragraph role="heading" id="hd_id3563951" xml-lang="en-US" level="1" l10n="NEW"><variable id="smarttags"><link href="text/swriter/guide/smarttags.xhp">Using Smart Tags</link>
+</bookmark><comment>MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entries</comment>
+<paragraph role="heading" id="hd_id3563951" xml-lang="en-US" level="1" l10n="NEW"><variable id="smarttags"><link href="text/swriter/guide/smarttags.xhp">Using Smart Tags</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id368358" xml-lang="en-US" l10n="NEW">Smart Tags provide additional information and functionality to specified words in a Writer document. The available features can be different for different Smart Tags extensions.</paragraph>
<paragraph role="heading" id="hd_id9298379" xml-lang="en-US" level="2" l10n="NEW">Installing Smart Tags</paragraph>
<paragraph role="paragraph" id="par_id1827448" xml-lang="en-US" l10n="NEW">Smart Tags can be supplied as <link href="text/shared/01/packagemanager.xhp">extensions</link> to %PRODUCTNAME Writer. </paragraph>
<paragraph role="paragraph" id="par_id2508621" xml-lang="en-US" l10n="NEW">To install a Smart Tag, do one of the following:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3856013" xml-lang="en-US" l10n="NEW">Save the *.oxt extension file to your harddrive, then double-click the *.oxt file in your file manager. Alternatively, in %PRODUCTNAME choose <item type="menuitem">Tools - Extension Manager</item> to open the Extension Manager, click Add and browse to the file.</paragraph>
</listitem>
@@ -65,9 +64,9 @@
<paragraph role="heading" id="hd_id8142338" xml-lang="en-US" level="2" l10n="NEW">Smart Tags menu</paragraph>
<paragraph role="paragraph" id="par_id1917477" xml-lang="en-US" l10n="NEW">Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in <item type="menuitem">Tools - Options - %PRODUCTNAME - Appearance</item>.</paragraph>
<paragraph role="paragraph" id="par_id192266" xml-lang="en-US" l10n="NEW">When you point to a Smart Tag, a tip help informs you to Ctrl-click to open the Smart Tags menu. If you don't use a mouse, position the cursor inside the marked text and open the context menu by Shift+F10.</paragraph>
-<paragraph role="paragraph" id="par_id1998962" xml-lang="en-US" l10n="NEW">In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The <item type="menuitem">Smart Tags Options</item> command opens the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page of Tools - Autocorrect.</paragraph>
+<paragraph role="paragraph" id="par_id1998962" xml-lang="en-US" l10n="NEW">In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The <item type="menuitem">Smart Tags Options</item> command opens the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page of Tools - Autocorrect Options.</paragraph>
<paragraph role="heading" id="hd_id2376476" xml-lang="en-US" level="2" l10n="NEW">To enable and disable Smart Tags</paragraph>
-<paragraph role="paragraph" id="par_id349131" xml-lang="en-US" l10n="NEW">When you have installed at least one Smart Tags extension, you see the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page in <item type="menuitem">Tools - Autocorrect</item>. Use this dialog to enable or disable Smart Tags and to manage the installed tags.</paragraph>
+<paragraph role="paragraph" id="par_id349131" xml-lang="en-US" l10n="NEW">When you have installed at least one Smart Tags extension, you see the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page in <item type="menuitem">Tools - Autocorrect Options</item>. Use this dialog to enable or disable Smart Tags and to manage the installed tags.</paragraph>
<paragraph role="note" id="par_id1216467" xml-lang="en-US" l10n="NEW">Text that is recognized as a Smart Tag is not checked by the automatic spellcheck.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/text_centervert.xhp b/helpcontent2/source/text/swriter/guide/text_centervert.xhp
index f098f4c5da..45949dd945 100644
--- a/helpcontent2/source/text/swriter/guide/text_centervert.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_centervert.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: text_centervert.xhp,v $
- * $Revision: 1.12 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguidetext_centervertxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidetext_centervertxml" indexer="include">
<title id="tit" xml-lang="en-US">Using a Frame to Center Text on a Page</title>
<filename>/text/swriter/guide/text_centervert.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-06T08:38:32">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155177"><bookmark_value>text frames; centering on pages</bookmark_value>
@@ -71,7 +67,7 @@
<paragraph role="listitem" id="par_id3153410" xml-lang="en-US" l10n="U" oldref="97">Click <emph>OK</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3149615" xml-lang="en-US" l10n="U" oldref="84">To hide the borders of the frame, select the frame, and then choose <emph>Format - Frame</emph>. Click the <emph>Borders</emph> tab, and then click in the<emph> Set No Border</emph> box in the<emph> Line Arrangement</emph> area.</paragraph>
+<paragraph role="note" id="par_id3149615" xml-lang="en-US" l10n="U" oldref="84">To hide the borders of the frame, select the frame, and then choose <emph>Format - Frame/Object</emph>. Click the <emph>Borders</emph> tab, and then click in the<emph> Set No Border</emph> box in the<emph> Line Arrangement</emph> area.</paragraph>
<paragraph role="paragraph" id="par_id3145098" xml-lang="en-US" l10n="U" oldref="83">To resize the frame, drag the edges of the frame.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
diff --git a/helpcontent2/source/text/swriter/guide/text_frame.xhp b/helpcontent2/source/text/swriter/guide/text_frame.xhp
index a21a565937..27ce10a933 100644
--- a/helpcontent2/source/text/swriter/guide/text_frame.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_frame.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: text_frame.xhp,v $
- *
- * $Revision: 1.16 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textswriterguidetext_framexml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidetext_framexml" indexer="include">
<title id="tit" xml-lang="en-US">Inserting, Editing, and Linking Text Frames</title>
<filename>/text/swriter/guide/text_frame.xhp</filename>
</topic>
@@ -84,7 +82,7 @@
<paragraph role="listitem" id="par_id3154858" xml-lang="en-US" l10n="U" oldref="100">Select the text frame (you see the eight handles).</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3155875" xml-lang="en-US" l10n="U" oldref="101">Choose <emph>Format - Frame - Options</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155875" xml-lang="en-US" l10n="U" oldref="101">Choose <emph>Format - Frame/Object - Options</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155899" xml-lang="en-US" l10n="U" oldref="102">In the <emph>Properties</emph> area, unmark the <emph>Print</emph> check box and click <emph>OK</emph>.</paragraph>
@@ -98,7 +96,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.222in" height="0.222in"><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">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image>.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/swriter/guide/word_completion.xhp b/helpcontent2/source/text/swriter/guide/word_completion.xhp
index 40c9eaa09b..d498dfd623 100755
--- a/helpcontent2/source/text/swriter/guide/word_completion.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideword_completionxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideword_completionxml" indexer="include">
<title id="tit" xml-lang="en-US">Word Completion for Text Documents</title>
<filename>/text/swriter/guide/word_completion.xhp</filename>
</topic>
@@ -52,12 +50,17 @@
<bookmark_value>deactivating;word completion</bookmark_value>
<bookmark_value>refusing word completions</bookmark_value>
<bookmark_value>rejecting word completions</bookmark_value>
-</bookmark><comment>mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry</comment><paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
+</bookmark><comment>mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry</comment>
+<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1076F" xml-lang="en-US" l10n="NEW">$[officename] collects words that you frequently use in the current session. When you later type the first three letters of a collected word, $[officename] automatically completes the word. </paragraph>
+<<<<<<< .working
+<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press Ctrl+Tab to cycle through the available words. To cycle in the opposite direction, press Ctrl+Shift+Tab. </paragraph>
+=======
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</item> to cycle through the available words. To cycle in the opposite direction, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</item>. </paragraph>
+>>>>>>> .merge-right.r265757
<paragraph role="heading" id="par_idN1078D" xml-lang="en-US" level="2" l10n="NEW"> Using word completion </paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10794" xml-lang="en-US" l10n="NEW">By default, you accept the word completion by pressing the Enter key. </paragraph>
</listitem>
@@ -68,7 +71,9 @@
<paragraph role="heading" id="par_idN1079E" xml-lang="en-US" level="2" l10n="NEW"> Switching off the word completion </paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN107A5" xml-lang="en-US" l10n="NEW"> Choose <emph>Tools - AutoCorrect - Word Completion</emph> . </paragraph>
+<paragraph role="paragraph" id="par_idN107A5" xml-lang="en-US" l10n="NEW"> Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
+<emph> - Word Completion</emph> . </paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN107AD" xml-lang="en-US" l10n="NEW"> Clear <emph>Enable word completion</emph> . </paragraph>
diff --git a/helpcontent2/source/text/swriter/main0102.xhp b/helpcontent2/source/text/swriter/main0102.xhp
index 09e749abd8..df834912aa 100755
--- a/helpcontent2/source/text/swriter/main0102.xhp
+++ b/helpcontent2/source/text/swriter/main0102.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0102.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0102xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0102xml" indexer="include">
<title id="tit" xml-lang="en-US">Edit</title>
<filename>/text/swriter/main0102.xhp</filename>
</topic>
</meta>
<body>
<section id="bearbeiten">
-<bookmark xml-lang="en-US" branch="hid/.uno:EditMenu" id="bm_id8177739" localize="false"/><paragraph role="heading" id="hd_id3149610" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0102.xhp" name="Edit">Edit</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:EditMenu" id="bm_id8177739" localize="false"/>
+<paragraph role="heading" id="hd_id3149610" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0102.xhp" name="Edit">Edit</link></paragraph>
<paragraph role="paragraph" id="par_id3149626" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains commands for editing the contents of the current document.</ahelp></paragraph>
</section>
<embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
@@ -64,7 +63,6 @@
<embed href="text/shared/01/02240000.xhp#dokver"/>
<paragraph role="heading" id="hd_id3147816" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link></paragraph>
<embed href="text/shared/01/02100000.xhp#suchenersetzentext"/>
-<embed href="text/swriter/01/02110000.xhp#navigator"/>
<paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/02120000.xhp" name="AutoText">AutoText</link></paragraph>
<embed href="text/swriter/01/02120000.xhp#autotexttext"/>
<paragraph role="heading" id="hd_id3147251" xml-lang="en-US" level="2" l10n="U" oldref="12"><link href="text/swriter/01/04180400.xhp" name="Exchange Database">Exchange Database</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/main0103.xhp b/helpcontent2/source/text/swriter/main0103.xhp
index c9c248921e..00b1034574 100755
--- a/helpcontent2/source/text/swriter/main0103.xhp
+++ b/helpcontent2/source/text/swriter/main0103.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0103xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0103xml" indexer="include">
<title id="tit" xml-lang="en-US">View</title>
<filename>/text/swriter/main0103.xhp</filename>
</topic>
</meta>
<body>
<section id="ansicht">
-<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id7882320" localize="false"/><paragraph role="heading" id="hd_id3147233" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0103.xhp" name="View">View</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id7882320" localize="false"/>
+<paragraph role="heading" id="hd_id3147233" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0103.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3147249" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains commands for controlling the on-screen display of the document.</ahelp></paragraph>
</section>
<embed href="text/swriter/01/03130000.xhp#drucklayout"/>
@@ -59,6 +58,7 @@
<embed href="text/swriter/01/03100000.xhp#steuerzeichen"/>
<embed href="text/swriter/01/03140000.xhp#versteckteabs"/>
<embed href="text/shared/01/04180100.xhp#datenanzeige"/>
+<embed href="text/swriter/01/02110000.xhp#navigator"/>
<embed href="text/shared/01/03110000.xhp#ganzerbildschirm"/>
<paragraph role="heading" id="hd_id3147265" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
<embed href="text/shared/01/03010000.xhp#massstabtext"/>
diff --git a/helpcontent2/source/text/swriter/main0104.xhp b/helpcontent2/source/text/swriter/main0104.xhp
index 086ffcdec4..5b79e2079b 100755
--- a/helpcontent2/source/text/swriter/main0104.xhp
+++ b/helpcontent2/source/text/swriter/main0104.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0104.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
@@ -33,18 +32,18 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0104xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0104xml" indexer="include">
<title id="tit" xml-lang="en-US">Insert</title>
<filename>/text/swriter/main0104.xhp</filename>
</topic>
</meta>
<body>
<section id="einfuegen">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2305978" localize="false"/><paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0104.xhp" name="Insert">Insert</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2305978" localize="false"/>
+<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0104.xhp" name="Insert">Insert</link></paragraph>
<paragraph role="paragraph" id="par_id3155358" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The Insert menu contains commands for inserting new elements in your document. This includes sections, footnotes, notes, special characters, graphics, and objects from other applications.</ahelp></paragraph>
</section>
<paragraph role="heading" id="hd_id3155376" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/swriter/01/04010000.xhp" name="Manual Break">Manual Break</link></paragraph>
@@ -59,7 +58,7 @@
<embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
<embed href="text/swriter/01/04220000.xhp#kopfzeile"/>
<embed href="text/swriter/01/04230000.xhp#fusszeile"/>
-<paragraph role="heading" id="hd_id3147231" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/04030000.xhp" name="Footnote">Footnote</link></paragraph>
+<paragraph role="heading" id="hd_id3147231" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/04030000.xhp" name="Footnote">Footnote/Endnote</link></paragraph>
<embed href="text/swriter/01/04030000.xhp#fussnoteein"/>
<paragraph role="heading" id="hd_id3147256" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/swriter/01/04060000.xhp" name="Caption">Caption</link></paragraph>
<embed href="text/swriter/01/04060000.xhp#beschrifttext"/>
diff --git a/helpcontent2/source/text/swriter/main0106.xhp b/helpcontent2/source/text/swriter/main0106.xhp
index 1d5524729f..75b6b54b22 100755
--- a/helpcontent2/source/text/swriter/main0106.xhp
+++ b/helpcontent2/source/text/swriter/main0106.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0106.xhp,v $
- * $Revision: 1.10 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,25 +32,23 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0106xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0106xml" indexer="include">
<title id="tit" xml-lang="en-US">Tools</title>
<filename>/text/swriter/main0106.xhp</filename>
</topic>
</meta>
<body>
<section id="extras">
-<bookmark xml-lang="en-US" branch="hid/.uno:ToolsMenu" id="bm_id8101443" localize="false"/><paragraph role="heading" id="hd_id3147241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0106.xhp" name="Tools">Tools</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ToolsMenu" id="bm_id8101443" localize="false"/>
+<paragraph role="heading" id="hd_id3147241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0106.xhp" name="Tools">Tools</link></paragraph>
<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Contains spelling tools, a gallery of object art that you can add to your document, as well as tools for configuring menus, and setting program preferences.</ahelp></paragraph>
</section>
<embed href="text/shared/01/06990000.xhp#rechtschreibung"/>
<embed href="text/shared/01/06010500.xhp#language"/>
<embed href="text/swriter/01/06040000.xhp#wordcount"/>
-<paragraph role="heading" id="hd_id3149939" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link></paragraph>
-<embed href="text/shared/01/06040000.xhp#autoko"/>
<paragraph role="heading" id="hd_id3149965" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/swriter/01/06060000.xhp" name="Outline Numbering">Outline Numbering</link></paragraph>
<embed href="text/swriter/01/06060000.xhp#kapnum"/>
<paragraph role="heading" id="hd_id3145688" xml-lang="en-US" level="2" l10n="U" oldref="15"><link href="text/swriter/01/06180000.xhp" name="Line Numbering">Line Numbering</link></paragraph>
@@ -70,6 +67,8 @@
<embed href="text/shared/01/06130001.xhp#macro"/>
<embed href="text/shared/01/packagemanager.xhp#packagemanager"/>
<embed href="text/shared/01/06150000.xhp#xmlfilter"/>
+<paragraph role="heading" id="hd_id3149939" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect Options</link></paragraph>
+<embed href="text/shared/01/06040000.xhp#autoko"/>
<paragraph role="heading" id="hd_id3147406" xml-lang="en-US" level="2" l10n="CHG" oldref="14"><link href="text/shared/01/06140000.xhp" name="Customize">Customize</link></paragraph>
<embed href="text/shared/01/06140000.xhp#anpassen"/>
<embed href="text/shared/optionen/01000000.xhp#optionen"/>