diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 16:44:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 16:44:59 +0000 |
| commit | c124ab563ceb035acfaf6549a32f16ef2607c227 (patch) | |
| tree | b25be4aca6c7e866b7f043b1aae67b11011c5440 /helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp | |
| parent | 09bace33aca905140499a356bd6615a70f80420c (diff) | |
INTEGRATION: CWS hc680pb2 (1.4.4); FILE MERGED
2005/02/21 16:43:15 fpe 1.4.4.1: regular update
Diffstat (limited to 'helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp')
| -rwxr-xr-x | helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp b/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp index d29be00ceb..d55eae9a6f 100755 --- a/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp +++ b/helpcontent2/source/text/swriter/01/mm_cusgrelin.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="2004-07-08T12:27:42">UFI: Custom Greeting Line dialog in mail merge</created> -<lastedited date="2004-10-05T11:08:32">DEDR: reviewed</lastedited> +<lastedited date="2005-02-16T11:44:34">DEDR: reviewed</lastedited> </history> </meta> <body> <paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1" l10n="NEW">Custom Salutation</paragraph> -<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Specify the greeting line layout for <link href="text/swriter/01/mailmerge04.xhp">mail merge</link> or <link href="text/swriter/01/mm_emabod.xhp">e-mail merge</link> documents. The name of this dialog is different for female recipients and male recipients.</paragraph> +<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Specify the salutation layout for <link href="text/swriter/01/mailmerge04.xhp">mail merge</link> or <link href="text/swriter/01/mm_emabod.xhp">e-mail merge</link> documents. The name of this dialog is different for female recipients and male recipients.</paragraph> <bookmark xml-lang="en-US" branch="hid/HID_MM_CUSTOMFIELDS" id="bm_id8578142" localize="false"/> <paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2" l10n="NEW">Salutation elements</paragraph> <paragraph role="paragraph" id="par_idN10555" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field and drag the field to the other list.</ahelp></paragraph> |