Skip to content

Commit

Permalink
Merge twisted-docs.patch: Fix some typos in the howtos.
Browse files Browse the repository at this point in the history
Author: avu
Reviewer: mwh 
Fixes: #3883
  • Loading branch information
mwhudson committed Jun 18, 2009
1 parent de8ae65 commit 222d4a8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions doc/core/howto/application.xhtml
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/core/howto/choosing-reactor.xhtml
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion doc/core/howto/deferredindepth.xhtml
Expand Up @@ -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
Expand Down

0 comments on commit 222d4a8

Please sign in to comment.