Merge pull request #655 from crd/update_website

Replace all instances of 'web site' with 'website'

Author: ben

book/01-introduction/sections/installing.asc

@@ -96,7 +96,7 @@ $ sudo ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi
 due to binary name differences.
 
 When you have all the necessary dependencies, you can go ahead and grab the latest tagged release tarball from several places.
-You can get it via the Kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub web site, at https://github.com/git/git/releases[].
+You can get it via the Kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub website, at https://github.com/git/git/releases[].
 It's generally a little clearer what the latest version is on the GitHub page, but the kernel.org page also has release signatures if you want to verify your download.
 
 Then, compile and install:

book/03-git-branching/sections/basic-branching-and-merging.asc

@@ -3,7 +3,7 @@
 Let's go through a simple example of branching and merging with a workflow that you might use in the real world.
 You'll follow these steps:
 
-. Do work on a web site.
+. Do work on a website.
 . Create a branch for a new story you're working on.
 . Do some work in that branch.
 
@@ -44,7 +44,7 @@ $ git checkout iss53
 .Creating a new branch pointer
 image::images/basic-branching-2.png[Creating a new branch pointer.]
 
-You work on your web site and do some commits.
+You work on your website and do some commits.
 Doing so moves the `iss53` branch forward, because you have it checked out (that is, your `HEAD` is pointing to it):
 
 [source,console]
@@ -56,7 +56,7 @@ $ git commit -a -m 'added a new footer [issue 53]'
 .The iss53 branch has moved forward with your work
 image::images/basic-branching-3.png[The iss53 branch has moved forward with your work.]
 
-Now you get the call that there is an issue with the web site, and you need to fix it immediately.
+Now you get the call that there is an issue with the website, and you need to fix it immediately.
 With Git, you don't have to deploy your fix along with the `iss53` changes you've made, and you don't have to put a lot of effort into reverting those changes before you can work on applying your fix to what is in production.
 All you have to do is switch back to your `master` branch.
 

book/07-git-tools/sections/submodules.asc

@@ -6,7 +6,7 @@ Perhaps it’s a library that a third party developed or that you’re developin
 A common issue arises in these scenarios: you want to be able to treat the two projects as separate yet still be able to use one from within the other.
 
 Here’s an example.
-Suppose you’re developing a web site and creating Atom feeds.
+Suppose you’re developing a website and creating Atom feeds.
 Instead of writing your own Atom-generating code, you decide to use a library.
 You’re likely to have to either include this code from a shared library like a CPAN install or Ruby gem, or copy the source code into your own project tree.
 The issue with including the library is that it’s difficult to customize the library in any way and often more difficult to deploy it, because you need to make sure every client has that library available.