[Libreoffice-commits] help.git: source/text

Wed Jul 8 17:09:58 PDT 2015

source/text/scalc/01/ODFF.xhp           |   40 ++++++++++++++------------------
 source/text/scalc/01/func_timevalue.xhp |   38 +++++++++++++-----------------
 2 files changed, 35 insertions(+), 43 deletions(-)

New commits:
commit 3fb910bf25d846dd7bc1902e8fe54518b417e793
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date:   Wed Jul 8 18:36:35 2015 -0300

    Fix license header in these 2 files
    
    Change-Id: I1878ba033c025f5c8794ffd446b77c28de7b0342
    Reviewed-on: https://gerrit.libreoffice.org/16870
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/source/text/scalc/01/ODFF.xhp b/source/text/scalc/01/ODFF.xhp
index 85aebf9..ad3695b 100644
--- a/source/text/scalc/01/ODFF.xhp
+++ b/source/text/scalc/01/ODFF.xhp
@@ -1,35 +1,31 @@
 <?xml version="1.0"?>
 <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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- ***********************************************************-->
- 
+* This file is part of the LibreOffice project.
+*
+* 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/.
+*
+* This file incorporates work covered by the following license notice:
+*
+*   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 .
+****************************************************************-->
 <meta>
 <topic id="topic_0506201512363995">
 <title xml-lang="en-US" id="tit">ODFF</title>
-<filename>text/scalc/01/ODFF.xhp</filename>
+<filename>/text/scalc/01/ODFF.xhp</filename>
 </topic>
 </meta>
 <body>
 <section id="odff">
-<paragraph id="hd_id1000010" role="note" xml-lang="en-US">This function is a standard Open Document Formula version 1.2 function.</paragraph>
+<paragraph id="hd_id1000010" role="note" xml-lang="en-US">This function belongs to Open Document Formula version 1.2 Standard.</paragraph>
 </section>
 </body>
 </helpdocument>
\ No newline at end of file
diff --git a/source/text/scalc/01/func_timevalue.xhp b/source/text/scalc/01/func_timevalue.xhp
index d986caf..7f2f8d6 100644
--- a/source/text/scalc/01/func_timevalue.xhp
+++ b/source/text/scalc/01/func_timevalue.xhp
@@ -1,30 +1,26 @@
 <?xml version="1.0"?>
 <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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- ***********************************************************-->
- 
+* This file is part of the LibreOffice project.
+*
+* 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/.
+*
+* This file incorporates work covered by the following license notice:
+*
+*   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 .
+****************************************************************-->
 <meta>
 <topic id="topic_0506201512165345" status="PUBLISH">
 <title xml-lang="en-US" id="tit">TIMEVALUE </title>
-<filename>file:///home/tdf/git/core/helpcontent2/source/text/scalc/01/func_timevalue.xhp</filename>
+<filename>/text/scalc/01/func_timevalue.xhp</filename>
 </topic>
 </meta>
 <body>
