From 222d4a8e4fae00d6d03c59df6639ac4f63405e7b Mon Sep 17 00:00:00 2001
From: mwh <mwh@bbbe8e31-12d6-0310-92fd-ac37d47ddeeb>
Date: Thu, 18 Jun 2009 07:52:40 +0000
Subject: [PATCH] Merge twisted-docs.patch: Fix some typos in the howtos.

Author: avu
Reviewer: mwh
Fixes: #3883
---
 doc/core/howto/application.xhtml      | 6 +++---
 doc/core/howto/choosing-reactor.xhtml | 2 +-
 doc/core/howto/deferredindepth.xhtml  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/core/howto/application.xhtml b/doc/core/howto/application.xhtml
index 9110db239..683715f01 100644
--- a/doc/core/howto/application.xhtml
+++ b/doc/core/howto/application.xhtml
@@ -56,7 +56,7 @@ done through Services.</p>
 <p>By <q>Service</q>, we mean anything in your application that can be started
 and stopped.  Typical services include web servers, FTP servers and SSH
 clients.  Your Application object can contain many services, and can even
-contain structured heirarchies of Services using <code class="API"
+contain structured hierarchies of Services using <code class="API"
 base="twisted.application.service">IServiceCollection</code>s.</p>
 
 <p>Here's a simple example of constructing an Application object which
@@ -79,12 +79,12 @@ echoService.setServiceParent(application)
 <p>See <a href="servers.xhtml">Writing Servers</a> for an explanation of
 EchoFactory.</p>
 
-<p>This example creates a simple heirarchy:
+<p>This example creates a simple hierarchy:
 <pre>
    application
    |
    `- echoService
-</pre> More complicated heirarchies of services can be created using
+</pre> More complicated hierarchies of services can be created using
 IServiceCollection.  You will most likely want to do this to manage Services
 which are dependent on other Services.  For example, a proxying Twisted
 application might want its server Service to only start up after the associated
diff --git a/doc/core/howto/choosing-reactor.xhtml b/doc/core/howto/choosing-reactor.xhtml
index 9f5abd05a..efa1d9a6b 100644
--- a/doc/core/howto/choosing-reactor.xhtml
+++ b/doc/core/howto/choosing-reactor.xhtml
@@ -163,7 +163,7 @@ iocpreactor.install()
 
     <p>The EPollReactor will work on any platform that provides
     <code class="python">epoll</code>, today only Linux 2.6 and over. The
-    implementation of the epoll reactor currently use the Level Triggered
+    implementation of the epoll reactor currently uses the Level Triggered
     interface, which is basically like poll() but scales much better.</p>
 
 <pre class="python">
diff --git a/doc/core/howto/deferredindepth.xhtml b/doc/core/howto/deferredindepth.xhtml
index 3e07ad604..9a7edfc6f 100644
--- a/doc/core/howto/deferredindepth.xhtml
+++ b/doc/core/howto/deferredindepth.xhtml
@@ -264,7 +264,7 @@ the errback at the end of the chain is never called </p>
 
 <h3>The deferred callback chain is stateful</h3>
 
-<p>A deferred that has been called back will call it's addCallback and
+<p>A deferred that has been called back will call its addCallback and
 addErrback methods as appropriate in the order they are added, when they are
 added. So we see in the following example, deferredExample1 and
 deferredExample2 are equivalent. The first sets up the processing chain