diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-24 13:14:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-24 13:14:58 +0000 |
| commit | b3f4e5a9d3cd05cbf26a2fbd7614496154290dc8 (patch) | |
| tree | eedb1c5f2c5a144a3cc2200cb8da446f9bbc1b8a | |
| parent | ac77b9de68822ff57d00a6faeb30fb07d9b8a86d (diff) | |
INTEGRATION: CWS hcshared15 (1.4.266); FILE MERGED
2007/12/18 12:12:18 ufi 1.4.266.1: saving
| -rwxr-xr-x | helpcontent2/source/text/swriter/01/mailmerge02.xhp | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/helpcontent2/source/text/swriter/01/mailmerge02.xhp b/helpcontent2/source/text/swriter/01/mailmerge02.xhp index 526734e041..9d9ed46d56 100755 --- a/helpcontent2/source/text/swriter/01/mailmerge02.xhp +++ b/helpcontent2/source/text/swriter/01/mailmerge02.xhp @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** + +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: mailmerge02.xhp,v $ + * $RCSfile: mailmerge02.xhp,v $fileonly,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 02:08:51 $ + * last change: $Author: vg $ $Date: 2008-01-24 14:14:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,34 +34,26 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> - -<helpdocument version="1.0"> + ************************************************************************ + --> + + + <helpdocument version="1.0"> <meta> <topic id="textswriter01mailmerge02xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Mail Merge Wizard - Document Type</title> <filename>/text/swriter/01/mailmerge02.xhp</filename> </topic> -<history> -<created date="2004-07-07T12:40:08">UFI: Mail Merge Wizard - page 2</created> -<lastedited date="2004-10-04T16:51:29">DEDR: Reviewed</lastedited> -</history> </meta> <body> <section id="documenttype"> <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard - Document Type</link></paragraph> -<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the type of mail merge document to create. You can create an e-mail or letter mail merge document.</paragraph> +<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG">Specify the type of mail merge document to create. </paragraph> </section> -<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_LETTER" id="bm_id2589190" localize="false"/> -<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_LETTER" id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph> <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a printable mail merge document.</ahelp></paragraph> -<switch select="distrib"> -<case select="COMMERCIAL"> -<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_MAIL" id="bm_id3822443" localize="false"/> -<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">E-mail message</paragraph> -<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge document that you can send as an e-mail message or an e-mail attachment.</ahelp> This feature needs Java Mail, which is installed with %PRODUCTNAME by default.</paragraph> -</case> -</switch> +<paragraph role="heading" id="hd_id6954863" xml-lang="en-US" level="2" l10n="NEW">E-mail message</paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_MAIL" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp> This feature needs Java Mail. If Java Mail is not installed, you can download the software from <link href="http://java.sun.com/products/javamail/">http://java.sun.com/products/javamail/</link>.</paragraph> <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard - Addresses">Mail Merge Wizard - Addresses</link></paragraph> </body> </helpdocument> |