diff --git a/HACKING.rst b/HACKING.rst index ff7cfdaed373..13849821a109 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -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: diff --git a/README.rst b/README.rst index bc6db3837af0..4ac26cc8006f 100644 --- a/README.rst +++ b/README.rst @@ -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 salt-users+subscribe@googlegroups.com and you may post to the list by emailing salt-users@googlegroups.com diff --git a/doc/man/salt.7 b/doc/man/salt.7 index 3ae2fa62a122..06775a9af0df 100644 --- a/doc/man/salt.7 +++ b/doc/man/salt.7 @@ -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 @@ -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 @@ -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 diff --git a/doc/topics/development/hacking.rst b/doc/topics/development/hacking.rst index 5b3cf99b03f3..09e77249baf3 100644 --- a/doc/topics/development/hacking.rst +++ b/doc/topics/development/hacking.rst @@ -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: diff --git a/doc/topics/targeting/grains.rst b/doc/topics/targeting/grains.rst index e4d037cb9658..5270cfadf213 100644 --- a/doc/topics/targeting/grains.rst +++ b/doc/topics/targeting/grains.rst @@ -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 diff --git a/salt/modules/freebsdports.py b/salt/modules/freebsdports.py index a6702cb6068b..787cc734fb4d 100644 --- a/salt/modules/freebsdports.py +++ b/salt/modules/freebsdports.py @@ -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 ` to install ports, but it it also possible to use this module exclusively from the command line. diff --git a/salt/utils/network.py b/salt/utils/network.py index 6bebca9c8936..6ac6566ee6ce 100644 --- a/salt/utils/network.py +++ b/salt/utils/network.py @@ -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', {})