Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 150 insertions, 0 deletions

diff --git a/doc/wsug_src/user-guide-docinfo.xml b/doc/wsug_src/user-guide-docinfo.xml
new file mode 100644
index 00000000..4c1d50c7
--- /dev/null
+++ b/doc/wsug_src/user-guide-docinfo.xml
@@ -0,0 +1,150 @@
+<!-- Document information for the User's Guide. -->
+
+<!-- Updated by tools/make-version.py -->
+<subtitle>For Wireshark 4.4</subtitle>
+
+<!--
+  <title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title>
+-->
+
+<authorgroup>
+
+  <author><firstname>Ulf</firstname><surname>Lamping</surname>
+    <!-- <affiliation><orgname></orgname></affiliation> -->
+    <email>ulf.lamping[AT]web.de</email>
+  </author>
+
+  <author><firstname>Richard</firstname><surname>Sharpe</surname>
+    <affiliation><jobtitle>Director</jobtitle><orgname>NS Computer Software and Services P/L</orgname></affiliation>
+    <email>rsharpe[AT]ns.aus.com</email>
+  </author>
+
+  <author><firstname>Ed</firstname><surname>Warnicke</surname>
+    <!-- <affiliation><orgname></orgname></affiliation> -->
+    <email>hagbard[AT]physics.rutgers.edu</email>
+  </author>
+
+</authorgroup>
+
+
+<!-- Author information as listed in the old DocBook version. -->
+<!-- Author's Names -->
+<!--
+  <!ENTITY AuthorFullName "Ulf Lamping">
+  <!ENTITY AuthorFirstName "Ulf">
+  <!ENTITY AuthorOtherName "">
+  <!ENTITY AuthorSurname "Lamping">
+
+  <!ENTITY AuthorFullName2 "Richard Sharpe">
+  <!ENTITY AuthorFirstName2 "Richard">
+  <!ENTITY AuthorOtherName2 "">
+  <!ENTITY AuthorSurname2 "Sharpe">
+
+  <!ENTITY AuthorFullName3 "Ed Warnicke">
+  <!ENTITY AuthorFirstName3 "Ed">
+  <!ENTITY AuthorOtherName3 "">
+  <!ENTITY AuthorSurname3 "Warnicke">
+
+  <!ENTITY AuthorFullName4 "Luis E. Garcia Ontanon">
+  <!ENTITY AuthorFirstName4 "Luis">
+  <!ENTITY AuthorOtherName4 "Enrique">
+  <!ENTITY AuthorSurname4 "Garcia Ontanon">
+-->
+
+<!--Author's Affiliation -->
+<!--
+  <!ENTITY AuthorShortAffiliation "">
+  <!ENTITY AuthorJobTitle "">
+  <!ENTITY AuthorOrgName "">
+  <!ENTITY AuthorOrgDiv "">
+  <!ENTITY AuthorEmail "ulf.lamping[AT]web.de">
+
+  <!ENTITY AuthorShortAffiliation2 "">
+  <!ENTITY AuthorJobTitle2 "Director">
+  <!ENTITY AuthorOrgName2 "NS Computer Software and Services P/L">
+  <!ENTITY AuthorOrgDiv2 "">
+  <!ENTITY AuthorEmail2 "rsharpe[AT]ns.aus.com">
+
+  <!ENTITY AuthorShortAffiliation3 "">
+  <!ENTITY AuthorJobTitle3 "">
+  <!ENTITY AuthorOrgName3 "">
+  <!ENTITY AuthorOrgDiv3 "">
+  <!ENTITY AuthorEmail3 "hagbard[AT]physics.rutgers.edu">
+
+  <!ENTITY AuthorShortAffiliation4 "">
+  <!ENTITY AuthorJobTitle4 "">
+  <!ENTITY AuthorOrgName4 "">
+  <!ENTITY AuthorOrgDiv4 "">
+  <!ENTITY AuthorEmail4 "luis [at] ontanon.org">
+-->
+
+<copyright><year>2004-2014</year>
+  <holder>Ulf Lamping</holder>
+  <holder>Richard Sharpe</holder>
+  <holder>Ed Warnicke</holder>
+</copyright>
+
+<revhistory>
+
+<revision>
+  <revnumber>3.2</revnumber>
+  <date>9 Nov 2014</date>
+  <authorinitials>gcc</authorinitials>
+  <revremark>Converted from DocBook to AsciiDoc.</revremark>
+</revision>
+
+<revision>
+  <revnumber>3.1</revnumber>
+  <date>2 Nov 2014</date>
+  <authorinitials>gcc</authorinitials>
+  <revremark>Moved Lua reference from User's Guide to Developer's Guide.</revremark>
+</revision>
+
+<revision><!-- ge10e4fb -->
+  <revnumber>3.0.2</revnumber>
+  <date>31 May 2006</date>
+  <authorinitials>jk</authorinitials>
+  <revremark>Further cleanup of Wireshark User Guide</revremark>
+</revision>
+
+<revision>
+  <revnumber>2.0.2</revnumber>
+  <date>29 Jan 2005</date>
+  <authorinitials>ul</authorinitials>
+  <revremark>Add links to wiki example pages</revremark>
+</revision>
+
+<!-- We removed the protocol pages without incrementing revnumber -->
+
+<revision>
+  <revnumber>2.0</revnumber>
+  <date>6 Aug 2004</date>
+  <authorinitials>ul</authorinitials>
+  <revremark>Review updates</revremark>
+</revision>
+
+<!-- 1.91 - 1.94 were review updates. Should we include them? -->
+
+<revision>
+  <revnumber>1.90</revnumber>
+  <date>19 Jul 2004</date>
+  <authorinitials>ul</authorinitials>
+  <revremark>Updated for Ethereal 0.10.5.</revremark>
+</revision>
+
+<!-- Earlier versions in https://anonsvn.wireshark.org/wireshark-doc/ -->
+
+</revhistory>
+
+<legalnotice>
+    <simpara>
+        Permission is granted to copy, distribute
+        and/or modify this document under the terms of the GNU General Public
+        License, Version 2 or any later version published by the Free Software
+        Foundation.
+    </simpara>
+    <simpara>
+        All logos and trademarks in this document are property of their
+        respective owner.
+    </simpara>
+</legalnotice>