Clean up outer docbook files for 1.0.0.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24706 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml
index a28698e3fe89cc389290fcc361ef5c12fc6b3752..dd415ea70d22d097abd056631ab0e074e46c8c2e 100644 (file)
--- a/docbook/developer-guide.xml
+++ b/docbook/developer-guide.xml
@@ -45,7 +45,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
-  <!ENTITY WiresharkCurrentVersion "0.99.7">
+  <!ENTITY WiresharkCurrentVersion "1.0.0">
   <!ENTITY WiresharkWebSite "http://www.wireshark.org">
   <!ENTITY WiresharkDownloadPage "&WiresharkWebSite;/download/">
   <!ENTITY WiresharkAuthorsPage "http://anonsvn.wireshark.org/wireshark/trunk/AUTHORS">
@@ -89,8 +89,6 @@ FILE SECTION
 
   <!ENTITY AppGPL SYSTEM    "GPL_appendix.xml">
 
-<!-- These refer to graphics files and figures contained in the document -->
-  <!-- 1st Chapter -->
 ]>
 
 <book>
@@ -126,9 +124,6 @@ to change the sources (e.g. adding a new dissector).
 <part id="PartDevelopment" label="II">
 <title>Wireshark Development (incomplete)</title>
 <partintro>
-<!--<para>
-This is the second of two parts:
-</para>-->
 <para>
 Part I. Wireshark Build Environment
 </para>

diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index 4ff6ec560ad859576779ade02f2460acf72127c1..d2f790976107d8ace9ff0650de2f2f24f78cb3e3 100644 (file)
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -80,16 +80,16 @@ DOCUMENT SECTION
 
   <!ENTITY % SvnVersionFile SYSTEM "svn_version.xml">
   %SvnVersionFile;
-<!ENTITY DocumentLegalNotice "<para>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.</para><para>All logos and trademarks in this document are property of their respective owner.</para>">
+  <!ENTITY DocumentLegalNotice "<para>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.</para><para>All logos and trademarks in this document are property of their respective owner.</para>">
 
 <!--
 Wireshark Info
 -->
-  <!ENTITY WiresharkCurrentVersion "0.99.7">
+  <!ENTITY WiresharkCurrentVersion "1.0.0">
   <!ENTITY WiresharkWebSite "http://www.wireshark.org">
-  <!ENTITY WiresharkUsersGuidePage "&WiresharkWebSite;/docs/#usersguide">
+  <!ENTITY WiresharkUsersGuidePage "&WiresharkWebSite;/docs/">
   <!ENTITY WiresharkDownloadPage "&WiresharkWebSite;/download.html">
-  <!ENTITY WiresharkBinariesPage "&WiresharkWebSite;/download.html#releases">
+  <!ENTITY WiresharkBinariesPage "&WiresharkWebSite;/download.html">
   <!ENTITY WiresharkAuthorsPage "&WiresharkWebSite;/about.html">
   <!ENTITY WiresharkProtocolsPage "&WiresharkWebSite;/docs/dfref/">
   <!ENTITY WiresharkFAQPage "&WiresharkWebSite;/faq.html">
@@ -98,7 +98,6 @@ Wireshark Info
   <!ENTITY WiresharkMediaPage "&WiresharkWikiPage;/CaptureSetup/NetworkMedia">
   <!ENTITY WiresharkWikiCaptureFiltersPage "&WiresharkWikiPage;/CaptureFilters">
   <!ENTITY WiresharkWikiDisplayFiltersPage "&WiresharkWikiPage;/DisplayFilters">
-  <!ENTITY WiresharkWikiPreferencesPage "&WiresharkWikiPage;/Preferences">
   <!ENTITY WiresharkWikiColoringRulesPage "&WiresharkWikiPage;/ColoringRules">
   <!ENTITY WiresharkWikiPreferencesPage "&WiresharkWikiPage;/Preferences">
 
@@ -264,8 +263,7 @@ FILE SECTION
   <!ENTITY WiresharkExportPSDialog SYSTEM "./wsug_graphics/ws-export-ps.png" NDATA PNG>
   <!ENTITY WiresharkExportPSMLDialog SYSTEM "./wsug_graphics/ws-export-psml.png" NDATA PNG>
   <!ENTITY WiresharkExportPDMLDialog SYSTEM "./wsug_graphics/ws-export-pdml.png" NDATA PNG>
-  <!ENTITY WiresharkExportSelectedDialog SYSTEM
-  "./wsug_graphics/ws-export-selected.png" NDATA PNG>
+  <!ENTITY WiresharkExportSelectedDialog SYSTEM "./wsug_graphics/ws-export-selected.png" NDATA PNG>
   <!ENTITY WiresharkExportObjectsDialog SYSTEM "./wsug_graphics/ws-export-objects.png" NDATA PNG>
   <!ENTITY WiresharkPrint SYSTEM "./wsug_graphics/ws-print.png" NDATA PNG>
   <!ENTITY WiresharkPacketRangeFrame SYSTEM "./wsug_graphics/ws-packet-range.png" NDATA PNG>