aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2006-06-02 17:19:13 +0000
committerUlf Lamping <ulf.lamping@web.de>2006-06-02 17:19:13 +0000
commitac86320a464ecc879ab14b62c42cd9f1e0fa7f53 (patch)
tree091c1633ecc12c7a93adb87c3e78bd4502eeab53 /docbook
parent770777bd1763b7b3f4e603e4aab5f217ace089c4 (diff)
Ethereal -> Wireshark
svn path=/trunk/; revision=18319
Diffstat (limited to 'docbook')
-rw-r--r--docbook/GPL_appendix.xml2
-rw-r--r--docbook/wsug_src/WSUG_chapter_introduction.xml5
2 files changed, 4 insertions, 3 deletions
diff --git a/docbook/GPL_appendix.xml b/docbook/GPL_appendix.xml
index f446308260..264174809f 100644
--- a/docbook/GPL_appendix.xml
+++ b/docbook/GPL_appendix.xml
@@ -3,7 +3,7 @@
<!-- $Id$ -->
<title>This Document's License (GPL)</title>
<para>As with the original licence and documentation distributed
- with Ethereal, this document is covered by the GNU General Public
+ with Wireshark, this document is covered by the GNU General Public
Licence (GNU GPL).</para>
<para>If you haven't read the GPL before, please do so. It
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.xml b/docbook/wsug_src/WSUG_chapter_introduction.xml
index 1dda50d412..136a2e8a90 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.xml
+++ b/docbook/wsug_src/WSUG_chapter_introduction.xml
@@ -283,7 +283,8 @@
<para>
In late 1997, Gerald Combs needed a tool for tracking down
networking problems and wanted to learn more about networking, so
- he started writing Ethereal as a way to solve both problems.
+ he started writing Ethereal (the former name of the Wireshark project)
+ as a way to solve both problems.
</para>
<para>
Ethereal was initially released, after several pauses in development,
@@ -314,7 +315,7 @@
dissector and contributed the code back to the team.
</para>
<para>
- In 2006 the project moved house and re-emerged as Wireshark.
+ In 2006 the project moved house and re-emerged under a new name: Wireshark.
</para>
</section>