Skip to content

Commit

Permalink
Removed duplicate occurrences of the word "the"
Browse files Browse the repository at this point in the history
  • Loading branch information
sbellem committed Aug 11, 2014
1 parent 8eb3439 commit 9f6ecc4
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion HACKING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ Once the minion starts, you may see an error like the following::

zmq.core.error.ZMQError: ipc path "/path/to/your/virtualenv/var/run/salt/minion/minion_event_7824dcbcfd7a8f6755939af70b96249f_pub.ipc" is longer than 107 characters (sizeof(sockaddr_un.sun_path)).

This means the the path to the socket the minion is using is too long. This is
This means that the path to the socket the minion is using is too long. This is
a system limitation, so the only workaround is to reduce the length of this
path. This can be done in a couple different ways:

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Join the conversation!

https://groups.google.com/forum/#!forum/salt-users

You may subscribe the the list without a Google account by emailing
You may subscribe to the list without a Google account by emailing
[email protected] and you may post to the list by emailing
[email protected]

Expand Down
6 changes: 3 additions & 3 deletions doc/man/salt.7
Original file line number Diff line number Diff line change
Expand Up @@ -2707,7 +2707,7 @@ zmq.core.error.ZMQError: ipc path "/path/to/your/virtualenv/var/run/salt/minion/
.UNINDENT
.UNINDENT
.sp
This means the the path to the socket the minion is using is too long. This is
This means that the path to the socket the minion is using is too long. This is
a system limitation, so the only workaround is to reduce the length of this
path. This can be done in a couple different ways:
.INDENT 0.0
Expand Down Expand Up @@ -23724,7 +23724,7 @@ log = logging.getLogger(__name__)
.UNINDENT
.sp
Finally, load modules that are specific to what you are doing. You should catch
import errors and set a flag that the the \fB__virtual__\fP function can use later.
import errors and set a flag that the \fB__virtual__\fP function can use later.
.INDENT 0.0
.INDENT 3.5
.sp
Expand Down Expand Up @@ -37866,7 +37866,7 @@ New in version Hydrogen.

.sp
This module allows you to install ports using \fBBATCH=yes\fP to bypass
configuration prompts. It is recommended to use the the \fBports state\fP to install ports, but it it also possible to use
configuration prompts. It is recommended to use the \fBports state\fP to install ports, but it it also possible to use
this module exclusively from the command line.
.INDENT 0.0
.INDENT 3.5
Expand Down
2 changes: 1 addition & 1 deletion doc/topics/development/hacking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Once the minion starts, you may see an error like the following:
zmq.core.error.ZMQError: ipc path "/path/to/your/virtualenv/var/run/salt/minion/minion_event_7824dcbcfd7a8f6755939af70b96249f_pub.ipc" is longer than 107 characters (sizeof(sockaddr_un.sun_path)).
This means the the path to the socket the minion is using is too long. This is
This means that the path to the socket the minion is using is too long. This is
a system limitation, so the only workaround is to reduce the length of this
path. This can be done in a couple different ways:

Expand Down
2 changes: 1 addition & 1 deletion doc/topics/targeting/grains.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ the following configuration:
For this example to work, you would need to have defined the grain
``node_type`` for the minions you wish to match. This simple example is nice,
but too much of the code is similar. To go one step further, Jinja templating
can be used to simplify the the :term:`top file`.
can be used to simplify the :term:`top file`.

.. code-block:: yaml
Expand Down
2 changes: 1 addition & 1 deletion salt/modules/freebsdports.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.. versionadded:: 2014.1.0
This module allows you to install ports using ``BATCH=yes`` to bypass
configuration prompts. It is recommended to use the the :mod:`ports state
configuration prompts. It is recommended to use the :mod:`ports state
<salt.states.freebsdports>` to install ports, but it it also possible to use
this module exclusively from the command line.
Expand Down
4 changes: 2 additions & 2 deletions salt/utils/network.py
Original file line number Diff line number Diff line change
Expand Up @@ -711,14 +711,14 @@ def hw_addr(iface):

def interface(iface):
'''
Return the the interface details
Return the interface details
'''
return interfaces().get(iface, {}).get('inet', '')


def interface_ip(iface):
'''
Return the the interface details
Return the interface details
'''
return interfaces().get(iface, {}).get('inet', {})[0].get('address', {})

Expand Down

0 comments on commit 9f6ecc4

Please sign in to comment.