From df4d4db7408ed3fc135eded6787bad80853619fd Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Wed, 12 Dec 2012 19:20:46 +0000
Subject: re-base on ALv2 code. Includes:

    Patch contributed by Oliver Rainer-Wittmann
    i#118572 - remove ui string and help content regarding
    usage of Java Mail in Writer's Mail Merge as Java
    Mail is not used.
    http://svn.apache.org/viewvc?view=revision&revision=1197035

    Patches contributed by Herbert Duerr
    updated help text for regexp word boundaries
    http://svn.apache.org/viewvc?view=revision&revision=1228026
    improved help text for word boundary regexp expression \b
    http://svn.apache.org/viewvc?view=revision&revision=1234738

    Patches contributed by Jurgen Schmidt
    remove onlineregistration with dependencies
    http://svn.apache.org/viewvc?view=revision&revision=1240245

    Patch contributed by Regina Henschel
    Extended tips for corner and cap style
    http://svn.apache.org/viewvc?view=revision&revision=1242287

* re-enable on-line update help, remove obsolete on-line purchasing.
---
 source/text/shared/01/04060200.xhp | 39 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

(limited to 'source/text/shared/01/04060200.xhp')

diff --git a/source/text/shared/01/04060200.xhp b/source/text/shared/01/04060200.xhp
index a34fffb6fe..abfdfc50cd 100644
--- a/source/text/shared/01/04060200.xhp
+++ b/source/text/shared/01/04060200.xhp
@@ -1,32 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 
-<!--***********************************************************************
+<!--
+ * 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.
- *
- ************************************************************************--><helpdocument version="1.0">
+ *   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 .
+ -->
+
+<helpdocument version="1.0">
 <meta>
 <topic id="textshared0104060200xml" indexer="include" status="PUBLISH">
 <title xml-lang="en-US" id="tit">Request</title>
-- 
cgit