diff options
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/README.packaging b/doc/README.packaging
index c1fae91333..f7830c3df3 100644
--- a/doc/README.packaging
+++ b/doc/README.packaging
@@ -8,14 +8,15 @@ distributing a software package containing Wireshark:
If your packaging system downloads a copy of the Wireshark sources,
- use this location.
+ use this location. Don't use http://www.wireshark.org/download/src.
2. The Wireshark web site URL is http://www.wireshark.org/ .
3. Wireshark is released under the GNU General Public License. Make sure
your package complies with this license, or we send in the marmots.
-4. Wireshark and the "fin" logo are trademarks of Gerald Combs.
+4. Wireshark and the "fin" logo are registered trademarks of Gerald
+ Combs.
5. Custom version information can be added by creating a file called
"version.conf". See make-version.pl for details. If your package
@@ -25,6 +26,9 @@ distributing a software package containing Wireshark:
6. Wireshark icons, logos, and other artwork can be found in the
"image" directory of the Wireshark sources.
+7. Wireshark is spelled with a capital "W", and with everything else
+ lower case. E.g., "WireShark" is incorrect.
If you have a question not addressed here, send it to
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index bc3e1d2b66..7d364e0b44 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -124,6 +124,11 @@ Wireshark Info
+ <listitem><para>
+ You must now explicitly pass "--disable-wireshark" to the build
+ environment if you only want to build TShark.
+ </para></listitem>