summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/00
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-08 16:21:21 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-08 16:21:21 +0000
commit893bae18feeb9a4a09f65927fe777d57650b059f (patch)
treee5195fc8065867e347f834ef2497b026a684793c /helpcontent2/source/text/swriter/00
parent982f709d64762d1da9dcdf27eec1fbf8e3d7ad09 (diff)
INTEGRATION: CWS hc680pb2 (1.2.16); FILE MERGED
2005/02/21 16:43:07 fpe 1.2.16.1: regular update
Diffstat (limited to 'helpcontent2/source/text/swriter/00')
-rwxr-xr-xhelpcontent2/source/text/swriter/00/00000406.xhp28
1 files changed, 22 insertions, 6 deletions
diff --git a/helpcontent2/source/text/swriter/00/00000406.xhp b/helpcontent2/source/text/swriter/00/00000406.xhp
index 6174da283c..8b0b2f339c 100755
--- a/helpcontent2/source/text/swriter/00/00000406.xhp
+++ b/helpcontent2/source/text/swriter/00/00000406.xhp
@@ -37,8 +37,8 @@
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
@@ -62,12 +62,12 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-18T09:49:51">converted from old format - fpe</lastedited>
+<lastedited date="2005-02-11T14:42:48">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>
-<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2"><variable id="silbentrennung">Choose <emph>Tools - Hyphenation</emph>
+<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="silbentrennung">Choose <emph>Tools - Language - Hyphenation</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US" l10n="NEW"><variable id="wordcount">Choose <emph>Tools - Word Count</emph>
</variable></paragraph>
@@ -112,7 +112,23 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147220" xml-lang="en-US" l10n="U" oldref="41"><variable id="adiagr">Choose <emph>Tools - Update - All Charts</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10792" xml-lang="en-US" l10n="NEW"><variable id="mmwizard">Choose <emph>Tools - Mail Merge Wizard</emph>
-</variable></paragraph>
+<section id="mmwizard">
+<paragraph role="paragraph" id="par_idN10792" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Mail Merge Wizard</emph>
+</paragraph>
+<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="">
+<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></paragraph>
+</tablecell>
+<tablecell colspan="" rowspan="">
+<paragraph role="paragraph" id="par_idN10823" xml-lang="en-US" l10n="NEW">Mail Merge</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
</body>
</helpdocument>