diff --git a/deployer/console.py b/deployer/console.py index 9834524..99a02ed 100644 --- a/deployer/console.py +++ b/deployer/console.py @@ -4,7 +4,7 @@ input. It has output methods that take the terminal size into account, like pagination -and multi-column display. It takes care of the pseudo terminal underneat. +and multi-column display. It takes care of the pseudo terminal underneath. Example: diff --git a/deployer/host/base.py b/deployer/host/base.py index 762fba3..ca92973 100644 --- a/deployer/host/base.py +++ b/deployer/host/base.py @@ -205,7 +205,7 @@ def __init__(self, pty=None, logger=None): def copy(self, pty=None): """ Create a deep copy of this Host class. - (the pty-parameter allows to bind it to anothor pty) + (the pty-parameter allows to bind it to another pty) """ h = self.__class__(pty=(pty or self.pty), logger=self.logger) h.host_context = self.host_context.copy() @@ -385,7 +385,7 @@ def set_size(): # Execute if use_sudo: - # We use 'sudo su' instead of 'sudo -u', because shell expension + # We use 'sudo su' instead of 'sudo -u', because shell expansion # of ~ is threated differently. e.g. # # 1. This will still show the home directory of the original user diff --git a/deployer/host/local.py b/deployer/host/local.py index 37c1895..52b6e12 100644 --- a/deployer/host/local.py +++ b/deployer/host/local.py @@ -27,7 +27,7 @@ class LocalStat(Stat): class LocalHost(Host): """ ``LocalHost`` can be used instead of :class:`SSHHost` for local execution. - It uses ``pexpect`` underneat. + It uses ``pexpect`` underneath. """ slug = 'localhost' address = 'localhost' diff --git a/deployer/node/decorators.py b/deployer/node/decorators.py index 89c8cec..76e4415 100644 --- a/deployer/node/decorators.py +++ b/deployer/node/decorators.py @@ -18,9 +18,9 @@ def suppress_action_result(action): def dont_isolate_yet(func): """ - If the node has not yet been separated in serveral parallel, isolated + If the node has not yet been separated in several parallel, isolated nodes per host. Don't do it yet for this function. - When anothor action of the same host without this decorator is called, + When another action of the same host without this decorator is called, the node will be split. It's for instance useful for reading input, which is similar for all diff --git a/deployer/run/socket_server.py b/deployer/run/socket_server.py index 2320c71..758b7b4 100644 --- a/deployer/run/socket_server.py +++ b/deployer/run/socket_server.py @@ -184,7 +184,7 @@ def __init__(self, protocol): stdin = os.fdopen(self.slave, 'r', 0) stdout = os.fdopen(self.slave, 'w', 0) - # Create pty object, for passing to deployment enviroment. + # Create pty object, for passing to deployment environment. self.pty = SocketPty(stdin, stdout, self.runInNewPtys, interactive=protocol.factory.interactive) diff --git a/deployer/run/telnet_server.py b/deployer/run/telnet_server.py index 8bd410a..8ba9d26 100644 --- a/deployer/run/telnet_server.py +++ b/deployer/run/telnet_server.py @@ -147,7 +147,7 @@ def __init__(self, protocol, writeCallback=None, doneCallback=None): # File descriptors for slave pty. stdin = stdout = os.fdopen(self.slave, 'r+w', 0) - # Create pty object, for passing to deployment enviroment. + # Create pty object, for passing to deployment environment. self.pty = Pty(stdin, stdout) def start(self): diff --git a/deployer/utils/string_utils.py b/deployer/utils/string_utils.py index 3b351be..abe0d46 100644 --- a/deployer/utils/string_utils.py +++ b/deployer/utils/string_utils.py @@ -16,7 +16,7 @@ def esc1(string): """ Escape single quotes, mainly for use in shell commands. Single quotes are usually preferred above double quotes, because they never do shell - expension inside. e.g. + expansion inside. e.g. :: diff --git a/docs/pages/architecture_of_roles_and_nodes.rst b/docs/pages/architecture_of_roles_and_nodes.rst index 10281cb..d98d2c1 100644 --- a/docs/pages/architecture_of_roles_and_nodes.rst +++ b/docs/pages/architecture_of_roles_and_nodes.rst @@ -10,7 +10,7 @@ Use cases --------- Before we go in depth, let's first look at a typical set-up of a web server. -The following picture displays serveral connected components. It contains a web +The following picture displays several connected components. It contains a web server connected to some database back-ends, and a load balancer in front of it. Every component appears exactly once. diff --git a/docs/pages/django-deployment.rst b/docs/pages/django-deployment.rst index 7c55320..2d9fc61 100644 --- a/docs/pages/django-deployment.rst +++ b/docs/pages/django-deployment.rst @@ -127,7 +127,7 @@ Probably obvious, we have a clone and checkout function that are meant to go to a certain directory on the server and run a shell command in there through :func:`~deployer.host.base.Host.run`. Some points worth noting: -- ``expand=True``: this means that we should do tilde-expension. You want the +- ``expand=True``: this means that we should do tilde-expansion. You want the tilde to be replaced with the home directory. If you have an absolute path, this isn't necessary. - :func:`~deployer.utils.string_utils.esc1`: This is important to avoid shell diff --git a/docs/pages/internals.rst b/docs/pages/internals.rst index 7fbe676..59029f0 100644 --- a/docs/pages/internals.rst +++ b/docs/pages/internals.rst @@ -5,7 +5,7 @@ Internals This page will try to give a high level overview of how the framework is working. While the end-user of the framework won't usually touch much more than -the ``Node`` and ``Host`` classes, there's a lot more going on underneat. +the ``Node`` and ``Host`` classes, there's a lot more going on underneath. There's a lot of meta-programming, some domain specific languages, and a mix of event-driven and blocking code. @@ -14,7 +14,7 @@ mix of event-driven and blocking code. Data flow ---------- -Roughly, this is the current flow from the interactive shell untill the actual +Roughly, this is the current flow from the interactive shell until the actual SSH client. .. graphviz::