diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2005-01-27 17:10:28 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2005-01-27 17:10:28 +0000 |
commit | 842408f8ba0824c57e4acf0a1da9d386f698ecac (patch) | |
tree | 56ffdecc29efd34320d7a051ebf4ba0eafe153b1 /helpcontent2/source/text/swriter/01/mailmerge00.xhp | |
parent | INTEGRATION: CWS hc680postbeta (1.2.22); FILE MERGED (diff) | |
download | help-842408f8ba0824c57e4acf0a1da9d386f698ecac.tar.gz help-842408f8ba0824c57e4acf0a1da9d386f698ecac.zip |
INTEGRATION: CWS hc680postbeta (1.2.2); FILE MERGED
2005/01/25 15:45:36 fpe 1.2.2.2: fixed slashes in filenames
2005/01/18 12:44:28 fpe 1.2.2.1: Regular Update
Diffstat (limited to 'helpcontent2/source/text/swriter/01/mailmerge00.xhp')
-rwxr-xr-x | helpcontent2/source/text/swriter/01/mailmerge00.xhp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp index 5a5ab0ecbf..b8fbceceb8 100755 --- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp +++ b/helpcontent2/source/text/swriter/01/mailmerge00.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 @@ <meta> <topic id="textswriter01mailmerge00xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Mail Merge Wizard</title> -<filename>text/swriter/01/mailmerge00.xhp</filename> +<filename>/text/swriter/01/mailmerge00.xhp</filename> </topic> <history> <created date="2004-07-07T11:49:32">UFI: new Mail Merge Wizard</created> -<lastedited date="2004-10-05T13:55:56">DEDR: Reviewed</lastedited> +<lastedited date="2004-12-16T13:42:09">DEDR: Reviewed</lastedited> </history> </meta> <body> @@ -71,6 +71,7 @@ <bookmark_value>Mail Merge Wizard</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/20367" id="bm_id4642780" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id5430463" localize="false"/> <paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph> <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp></paragraph> </section> |