diff options
Diffstat (limited to 'source/text/swriter/01/mailmerge02.xhp')
| -rw-r--r-- | source/text/swriter/01/mailmerge02.xhp | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/source/text/swriter/01/mailmerge02.xhp b/source/text/swriter/01/mailmerge02.xhp index b56cf20467..b53363c087 100644 --- a/source/text/swriter/01/mailmerge02.xhp +++ b/source/text/swriter/01/mailmerge02.xhp @@ -3,32 +3,21 @@ <!-- - *********************************************************************** + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> @@ -47,7 +36,7 @@ <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> <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> +<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></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> |