cppcheck-opensource#8178 Remove all references to XML version 1

amai2012 · amai2012 · commit 2f2172e1a7cb · 2017-11-22T10:49:59.000+01:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -1009,8 +1009,7 @@ void CmdLineParser::PrintHelp()
               "    --version            Print out version number.\n"
               "    --xml                Write results in xml format to error stream (stderr).\n"
               "    --xml-version=<version>\n"
-              "                         Select the XML file version. Currently versions 1 and\n"
-              "                         2 are available. The default version is 1."
+              "                         Select the XML file version. Currently only versions 2 is available."
               "\n"
               "Example usage:\n"
               "  # Recursively check the current folder. Print the progress on the screen and\n"
diff --git a/man/manual.docbook b/man/manual.docbook
@@ -525,23 +525,15 @@ cppcheck -DA --force file.c</programlisting>
   <chapter>
     <title>XML output</title>
 
-    <para>Cppcheck can generate output in <literal>XML</literal> format. There
-    is an old <literal>XML</literal> format (version 1) and a new
-    <literal>XML</literal> format (version 2). Please use the new version if
-    you can.</para>
-
-    <para>The old version is kept for backwards compatibility only. It will
-    not be changed, but it will likely be removed someday. Use
+    <para>Cppcheck can generate output in <literal>XML</literal> format. Use
     <parameter>--xml</parameter> to enable this format.</para>
 
-    <para>The new version fixes a few problems with the old format. The new
-    format will probably be updated in future versions of cppcheck with new
-    attributes and elements. A sample command to check a file and output
-    errors in the new <literal>XML</literal> format:</para>
+    <para>A sample command to check a file and output
+    errors in the <literal>XML</literal> format:</para>
 
-    <programlisting>cppcheck --xml-version=2 file1.cpp</programlisting>
+    <programlisting>cppcheck --xml file1.cpp</programlisting>
 
-    <para>Here is a sample version 2 report:</para>
+    <para>Here is a sample report:</para>
 
     <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;results version="2"&gt;
