From 08aeaa6f524fa2f9be2e3919f2a20254e023f4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Thu, 27 Jan 2005 17:12:41 +0000 Subject: [PATCH] INTEGRATION: CWS hc680postbeta (1.3.2); FILE MERGED 2005/01/25 15:45:38 fpe 1.3.2.2: fixed slashes in filenames 2005/01/18 12:44:28 fpe 1.3.2.1: Regular Update --- helpcontent2/source/text/swriter/01/mailmerge08.xhp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/helpcontent2/source/text/swriter/01/mailmerge08.xhp b/helpcontent2/source/text/swriter/01/mailmerge08.xhp index 9e8f067c6e..a4a34c07f9 100755 --- a/helpcontent2/source/text/swriter/01/mailmerge08.xhp +++ b/helpcontent2/source/text/swriter/01/mailmerge08.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. @@ -58,11 +58,11 @@ Mail Merge Wizard - Save, Print & Send -text/swriter/01/mailmerge08.xhp +/text/swriter/01/mailmerge08.xhp UFI: Mail Merge Wizard page 8 -DEDR: Reviewed +DEDR: Reviewed @@ -128,7 +128,7 @@ Send as Select the mail format for the e-mail messages. -The Plain text and HTML message formats are sent in the body of the message, whereas the *.oot, *.doc, and *.pdf formats are sent as attachments. +The Plain text and HTML message formats are sent in the body of the message, whereas the *.odt, *.doc, and *.pdf formats are sent as attachments. Properties Opens the E-Mail Message dialog where you can enter the e-mail message for the mail merge files that are sent as attachments.