Index: manual/getting_started/installation.tex
===================================================================
--- manual/getting_started/installation.tex	(revision 15914)
+++ manual/getting_started/installation.tex	(working copy)
@@ -5,7 +5,7 @@
   \note{Rockbox presently runs only on the original Ipod Nano. Rockbox does
   \emph{not} run on the newer, second generation Ipod Nano (the all alumminum
   verion). For information on identifying which Ipod you own, see this page on
-  Apple's web site: \url{http://www.info.apple.com/kbnum/n61688}
+  Apple's website: \url{http://www.info.apple.com/kbnum/n61688}
   }
 }
 
@@ -133,7 +133,7 @@
   initialized by iTunes for the Mac). More information and instructions for
   converting an Ipod to FAT32 can be found on the
   \wikilink{IpodConversionToFAT32} wiki
-  page on the Rockbox web site.  Note that after conversion, you can still use
+  page on the Rockbox website.  Note that after conversion, you can still use
   a FAT32 Ipod on a Mac.
   }
 }
@@ -405,7 +405,7 @@
 \opt{m5,x5}{
   If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, download the original \playername{}
-  firmware from the \playerman{} web site. And copy it to the \fname{FIRMWARE}
+  firmware from the \playerman{} website. And copy it to the \fname{FIRMWARE}
   directory on your \playername{}. Turn off the \dap{}, remove the USB cable
   and insert the charger. The original firmware will automatically be flashed.
 }
Index: manual/getting_started/main.tex
===================================================================
--- manual/getting_started/main.tex	(revision 15914)
+++ manual/getting_started/main.tex	(working copy)
@@ -38,7 +38,7 @@
 Another option are the mailing lists which can be found at
 \url{http://www.rockbox.org/mail/}. From that page you can subscribe to the
 lists and browse the archives. For searching the list archives simply use
-the search field that is located on the left side of the web site.
+the search field that is located on the left side of the website.
 Also you can ask on IRC. The main channel for Rockbox is \texttt{\#rockbox}
 on \url{irc://irc.freenode.net}. A bunch of helpful developers and users
 are usually around. Just join and ask -- if someone knows the answer you'll
Index: manual/configure_rockbox/theme_settings.tex
===================================================================
--- manual/configure_rockbox/theme_settings.tex	(revision 15914)
+++ manual/configure_rockbox/theme_settings.tex	(working copy)
@@ -22,7 +22,7 @@
   \opt{ipodmini}{\wikilink{WpsIpodMini}}%
   \opt{x5}{\wikilink{WpsIaudioX5}}%
   .
-  Some of the downloads from this site will actually be standalone WPS files, 
+  Some of the downloads from this website will actually be standalone WPS files, 
   others will be full-blown themes. 
 
   \note{Themes do not have to be purely visual. It is quite possible to create