aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
Diffstat (limited to 'docbook')
-rw-r--r--docbook/wsug_src/WSUG_app_files.xml6
-rw-r--r--docbook/wsug_src/WSUG_app_messages.xml4
-rw-r--r--docbook/wsug_src/WSUG_chapter_advanced.xml17
-rw-r--r--docbook/wsug_src/WSUG_chapter_build_install.xml4
-rw-r--r--docbook/wsug_src/WSUG_chapter_capture.xml3
-rw-r--r--docbook/wsug_src/WSUG_chapter_customize.xml3
-rw-r--r--docbook/wsug_src/WSUG_chapter_introduction.xml4
-rw-r--r--docbook/wsug_src/WSUG_chapter_io.xml9
-rw-r--r--docbook/wsug_src/WSUG_chapter_use.xml4
-rw-r--r--docbook/wsug_src/WSUG_preface.xml6
10 files changed, 32 insertions, 28 deletions
diff --git a/docbook/wsug_src/WSUG_app_files.xml b/docbook/wsug_src/WSUG_app_files.xml
index 6d162061ba..02bfe443fd 100644
--- a/docbook/wsug_src/WSUG_app_files.xml
+++ b/docbook/wsug_src/WSUG_app_files.xml
@@ -474,7 +474,7 @@ c0-a8-1c-00 CEO
<para>
Windows uses some special directories to store user configuration files
in, named the user profile. This can be confusing, as the default directory location
- changed from version to version and might also be different for english
+ changed from version to version and might also be different for English
and internationalized versions of windows.
</para>
<note><title>Note!</title>
@@ -486,7 +486,7 @@ c0-a8-1c-00 CEO
</note>
<para>
The following will try to guide
- you to the right place where to look for Wiresharks profile data.
+ you to the right place where to look for Wireshark's profile data.
</para>
<para>
<variablelist>
@@ -538,7 +538,7 @@ c0-a8-1c-00 CEO
The following will only be applicable if you are using roaming profiles.
This might be the case, if you work in a Windows domain environment
(used in huge company networks). The configurations of all
- programs you use won't be saved on the local harddrive of the computer
+ programs you use won't be saved on the local hard drive of the computer
you are currently working on, but on the domain server.
</para>
<para>
diff --git a/docbook/wsug_src/WSUG_app_messages.xml b/docbook/wsug_src/WSUG_app_messages.xml
index 298c7d3e65..16c08d6e08 100644
--- a/docbook/wsug_src/WSUG_app_messages.xml
+++ b/docbook/wsug_src/WSUG_app_messages.xml
@@ -20,7 +20,7 @@
<listitem>
<para>
<command>Wrong dissector</command>
- Wireshark errorneously has chosen the wrong protocol dissector for
+ Wireshark erroneously has chosen the wrong protocol dissector for
this packet. This will happen e.g. if you are using a protocol
not on it's well known TCP or UDP port. You may try Analyze|Decode As
to circumvent this problem.
@@ -58,7 +58,7 @@
then. You could (if it's TCP) enable reassembly for TCP and the specific
dissector (if possible) in the Edit|Preferences menu. You could check the
packet contents yourself by reading the packet bytes and comparing it to
- the protocol specification. This could reveil a dissector bug. Or you
+ the protocol specification. This could reveal a dissector bug. Or you
could find out that the packet is indeed wrong.
</para>
</section>
diff --git a/docbook/wsug_src/WSUG_chapter_advanced.xml b/docbook/wsug_src/WSUG_chapter_advanced.xml
index 7d66fe9f46..4fe38c77e6 100644
--- a/docbook/wsug_src/WSUG_chapter_advanced.xml
+++ b/docbook/wsug_src/WSUG_chapter_advanced.xml
@@ -151,7 +151,7 @@
<para>
So where do these time stamps come from?
While capturing, Wireshark gets the time stamps from the libpcap (WinPcap)
- library, which in turn get's them from the operating system kernel.
+ library, which in turn gets them from the operating system kernel.
If the capture data is loaded from a capture file, Wireshark obviously gets
the data from that file.
</para>
@@ -202,7 +202,7 @@
<section><title>Accuracy</title>
<para>
It's often asked: "Which time stamp accuracy is provided by Wireshark?".
- Well, Wireshark doesn't create any time stamps itself but simply get's them
+ Well, Wireshark doesn't create any time stamps itself but simply gets them
from "somewhere else" and displays them. So accuracy will depend on the
capture system (operating system, performance, ...) that you use.
Because of this, the above question is difficult to answer in a
@@ -351,7 +351,7 @@
<tip><title>Tip!</title>
<para>
You can use the Network Time Protocol (NTP) to automatically adjust your
- computer to the correct time, by synchronizing it to internet NTP clock
+ computer to the correct time, by synchronizing it to Internet NTP clock
servers. NTP clients are available for all operating systems that
Wireshark supports (and for a lot more), for examples see:
<ulink url="&NTPSite;">&NTPSite;</ulink>.
@@ -462,13 +462,13 @@
<para>
An example:
Let's assume that someone in Los Angeles captured a packet with
- Wireshark at exactly 2 o'clock local time and sents you this
+ Wireshark at exactly 2 o'clock local time and sends you this
capture file. The capture file's time stamp will be represented
in UTC as 10 o'clock. You are located in Berlin and will see 11
o'clock on your Wireshark display.
</para>
<para>
- Now you have a phone call, video conference or internet meeting with that
+ Now you have a phone call, video conference or Internet meeting with that
one to talk about that capture file.
As you are both looking at the displayed time on your local computers,
the one in Los Angeles still sees 2 o'clock but you in Berlin will see
@@ -659,11 +659,11 @@
something more "human readable".
</para>
<para><command>ARP name resolution (system service)</command>
- Wireshark will ask the operating system to convert an ethernet address
+ Wireshark will ask the operating system to convert an Ethernet address
to the corresponding IP address (e.g. 00:09:5b:01:02:03 -> 192.168.0.1).
</para>
<para><command>Ethernet codes (ethers file)</command>
- If the ARP name resolution failed, Wireshark tries to convert the ethernet
+ If the ARP name resolution failed, Wireshark tries to convert the Ethernet
address to a known device name, which has been assigned by the user using
an ethers file (e.g. 00:09:5b:01:02:03 -> homerouter).
</para>
@@ -813,7 +813,7 @@
</sidebar>
<section><title>Wireshark checksum validation</title>
<para>
- Wireshark will validate the checksums of several potocols, e.g.: IP, TCP, ...
+ Wireshark will validate the checksums of several protocols, e.g.: IP, TCP, ...
</para>
<para>
It will do the same calculation as a "normal receiver" would do,
@@ -895,3 +895,4 @@
</chapter>
<!-- End of WSUG Chapter Advanced -->
+
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.xml b/docbook/wsug_src/WSUG_chapter_build_install.xml
index 3a0e0f2c91..cdd8f678fc 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.xml
+++ b/docbook/wsug_src/WSUG_chapter_build_install.xml
@@ -208,7 +208,7 @@ make install
<para>
Under RedHat 6.x and beyond (and distributions based on it, like
Mandrake) you can simply install each of the packages you need from
- RPMs. Most Linux systems will install GTK+ and GLib in anycase,
+ RPMs. Most Linux systems will install GTK+ and GLib in any case,
however, you will probably need to install the devel versions of
each of these packages. The commands shown in <xref linkend="Ch02Ex4"/>
will install all the needed RPMs if they are not already installed.
@@ -709,7 +709,7 @@ wireshark-setup-&WiresharkCurrentVersion;.exe /NCRC /S /desktopicon=yes
<section id="ChBuildInstallWinPcapUninstall">
<title>Uninstall WinPcap</title>
<para>
- You can uninstall WinPcap independantly of Wireshark, using the "WinPcap"
+ You can uninstall WinPcap independently of Wireshark, using the "WinPcap"
entry in the "Add or Remove Programs" of the Control Panel.
</para>
<note><title>Note!</title>
diff --git a/docbook/wsug_src/WSUG_chapter_capture.xml b/docbook/wsug_src/WSUG_chapter_capture.xml
index ad0e3d0366..9bb3b06ff1 100644
--- a/docbook/wsug_src/WSUG_chapter_capture.xml
+++ b/docbook/wsug_src/WSUG_chapter_capture.xml
@@ -147,7 +147,7 @@ wireshark -i eth0 -k
<warning><title>Warning!</title>
<para>
As the "Capture Interfaces" dialog is showing live captured data, it is
- consuming a lot of system ressources. Close this dialog as soon as
+ consuming a lot of system resources. Close this dialog as soon as
possible to prevent excessive system load.
</para>
</warning>
@@ -1100,3 +1100,4 @@ tcp port 23 and not host 10.0.0.5
</chapter>
<!-- End of WSUG Chapter Capture -->
+
diff --git a/docbook/wsug_src/WSUG_chapter_customize.xml b/docbook/wsug_src/WSUG_chapter_customize.xml
index 6c1c6c3f09..e414b45ddc 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.xml
+++ b/docbook/wsug_src/WSUG_chapter_customize.xml
@@ -810,7 +810,7 @@ standard libpcap format.
<listitem>
<para>
The <command>Save</command> button will apply the preferences
- settings, save the settings on the harddisk and keep the dialog open.
+ settings, save the settings on the hard disk and keep the dialog open.
</para>
</listitem>
<listitem>
@@ -830,3 +830,4 @@ standard libpcap format.
</chapter>
<!-- End of WSUG Chapter Customizing -->
+
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.xml b/docbook/wsug_src/WSUG_chapter_introduction.xml
index 14fbe6bf10..4bef5f2b8d 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.xml
+++ b/docbook/wsug_src/WSUG_chapter_introduction.xml
@@ -392,7 +392,7 @@
<section id="ChIntroHomepage"><title>Website</title>
<para>
- You will find lot's of useful information on the Wireshark homepage at
+ You will find lots of useful information on the Wireshark homepage at
<ulink url="&WiresharkWebSite;">&WiresharkWebSite;</ulink>.
</para>
</section>
@@ -409,7 +409,7 @@
<para>
And best of all, if you would like to contribute your knowledge on a
specific topic (maybe a network protocol you know well), you can edit the
- wiki pages by simply using your webbrowser.
+ wiki pages by simply using your web browser.
</para>
</section>
diff --git a/docbook/wsug_src/WSUG_chapter_io.xml b/docbook/wsug_src/WSUG_chapter_io.xml
index 5f4c6f7dba..eda4bf51d9 100644
--- a/docbook/wsug_src/WSUG_chapter_io.xml
+++ b/docbook/wsug_src/WSUG_chapter_io.xml
@@ -427,7 +427,7 @@
</para>
</entry>
<entry valign="top">
- <para><command>Unix/Linux: GTK version &lt; 2.4 / Micosoft Windows
+ <para><command>Unix/Linux: GTK version &lt; 2.4 / Microsoft Windows
(GTK1 installed)</command></para>
<para>
This is the file save dialog of former Gimp/GNOME versions -
@@ -667,7 +667,7 @@
</para>
</entry>
<entry valign="top">
- <para><command>Unix/Linux: GTK version &lt; 2.4 / Micosoft Windows
+ <para><command>Unix/Linux: GTK version &lt; 2.4 / Microsoft Windows
(GTK1 installed)</command></para>
<para>
This is the file open dialog of former Gimp/GNOME versions -
@@ -839,13 +839,13 @@
</para>
</section>
<section id="ChIOExportCSVDialog">
- <title>The "Export as CSV (Comma Seperated Values) File" dialog box</title>
+ <title>The "Export as CSV (Comma Separated Values) File" dialog box</title>
<para>XXX - add screenshot</para>
<para>
Export packet summary into CSV, used e.g. by spreadsheet programs to
im-/export data.
<!--<figure>
- <title>The "Export as Comma Seperated Values File" dialog box</title>
+ <title>The "Export as Comma Separated Values File" dialog box</title>
<graphic entityref="WiresharkExportCSVDialog" format="PNG"/>
</figure>-->
<itemizedlist>
@@ -1153,3 +1153,4 @@ lpr -Pmypostscript
</chapter>
<!-- End of WSUG Chapter IO -->
+
diff --git a/docbook/wsug_src/WSUG_chapter_use.xml b/docbook/wsug_src/WSUG_chapter_use.xml
index d6b2142928..bd4b8c8015 100644
--- a/docbook/wsug_src/WSUG_chapter_use.xml
+++ b/docbook/wsug_src/WSUG_chapter_use.xml
@@ -797,7 +797,7 @@
<entry><command>Colorize Packet List</command></entry>
<entry></entry>
<entry><para>
- This item allows you to control wether or not Wireshark should colorize
+ This item allows you to control whether or not Wireshark should colorize
the packet list.</para>
<note><title>Note!</title><para>
Enabling colorization will slow down the display
@@ -1501,7 +1501,7 @@
<para>
If calling a Web browser fails on your machine, maybe because just nothing
happens or the browser is started but no page is shown, have a look at the
- webbrowser setting in the preferences dialog.
+ web browser setting in the preferences dialog.
</para>
</note>
</section>
diff --git a/docbook/wsug_src/WSUG_preface.xml b/docbook/wsug_src/WSUG_preface.xml
index b0d501c795..68e7767710 100644
--- a/docbook/wsug_src/WSUG_preface.xml
+++ b/docbook/wsug_src/WSUG_preface.xml
@@ -123,10 +123,10 @@
<title>About this document</title>
<para>
This book was originally developed by
- <ulink url="mailto:&AuthorEmail;">Richard Sharpe</ulink> with
+ <ulink url="mailto:&AuthorEmail2;">Richard Sharpe</ulink> with
funds provided from the Wireshark Fund. It was updated by
- <ulink url="mailto:&AuthorEmail2;">Ed Warnicke</ulink> and more recently
- redesigned and updated by <ulink url="mailto:&AuthorEmail3;">Ulf
+ <ulink url="mailto:&AuthorEmail3;">Ed Warnicke</ulink> and more recently
+ redesigned and updated by <ulink url="mailto:&AuthorEmail;">Ulf
Lamping</ulink>.
</para>
<para>