path: root/doc
diff options
authorGerald Combs <gerald@wireshark.org>2007-05-22 19:05:27 +0000
committerGerald Combs <gerald@wireshark.org>2007-05-22 19:05:27 +0000
commitf0377b44afa422bdb5309cc028d04e43cfd3bfe2 (patch)
treeb0bcacb4f4ce960cad2d4b2f33adc5828997a978 /doc
parent59d2c52ac3a57cf174a988535c9fef9d731b343c (diff)
Add a note about the recent change in "--disable-wireshark" behavior to
the release notes. Add a couple of updates to the packaging doc. svn path=/trunk/; revision=21891
Diffstat (limited to 'doc')
1 files changed, 6 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