From 8444c2c1af48ac5f7f4fd9555bae695c88b682bc Mon Sep 17 00:00:00 2001
From: Michael Stahl <Michael.Stahl@cib.de>
Date: Fri, 22 May 2020 20:15:41 +0200
Subject: document new ODF 1.3 versions in Tools->Options->Load/Save

Change-Id: I40a7f06274d311a537b8290cec4d7708c4c4ea4d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94705
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
---
 source/text/shared/00/00000021.xhp | 46 +++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

(limited to 'source/text/shared/00/00000021.xhp')

diff --git a/source/text/shared/00/00000021.xhp b/source/text/shared/00/00000021.xhp
index dae1427ef5..3f867f2fec 100644
--- a/source/text/shared/00/00000021.xhp
+++ b/source/text/shared/00/00000021.xhp
@@ -78,6 +78,14 @@
                <paragraph xml-lang="en-US" id="par_idN1077D" role="tablecontent">*.odm</paragraph>
             </tablecell>
          </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10779" role="tablecontent">ODF Master Document Template</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1077E" role="tablecontent">*.otm</paragraph>
+            </tablecell>
+         </tablerow>
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_idN10783" role="tablecontent">HTML Document</paragraph>
@@ -219,7 +227,18 @@
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent">ODF 1.2 (Extended)</paragraph>
+               <paragraph xml-lang="en-US" id="par_id1001200912381154" role="tablecontent">ODF 1.2 Extended (compatibility mode)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id100120091238113" role="tablecontent">-</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1001200912381175" role="tablecontent">LibreOffice 3.5</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent">ODF 1.2 Extended</paragraph>
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent">-</paragraph>
@@ -228,9 +247,30 @@
                <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>
             </tablecell>
          </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1001200912381155" role="tablecontent">ODF 1.3</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id100120091238114" role="tablecontent">TBD</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1001200912381176" role="tablecontent">LibreOffice 7.0</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1001200912381156" role="tablecontent">ODF 1.3 Extended</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id100120091238115" role="tablecontent">-</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1001200912381177" role="tablecontent">LibreOffice 7.0</paragraph>
+            </tablecell>
+         </tablerow>
       </table>
-      <paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US">In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - General</menuitem> and select the ODF format version.</paragraph>
-<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
+      <paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US">In current versions, you can select to save your documents using ODF 1.2 or ODF 1.0/1.1 (for backward compatibility). Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - General</menuitem> and select the ODF format version.</paragraph>
 <paragraph role="tip" id="par_id3146907" xml-lang="en-US">If you want to define another file format as the default, choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - </menuitem><link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><menuitem>Load/Save - General</menuitem></link> to find alternative file formats for each $[officename] document type.</paragraph>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2">XML file structure</paragraph>
 <paragraph role="paragraph" id="par_id3149649" xml-lang="en-US">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph>
-- 
cgit