From e4c1da4323f6334c0a14e9a68392a0c12a37e117 Mon Sep 17 00:00:00 2001 From: carrychair Date: Sat, 9 Mar 2024 17:25:59 +0800 Subject: [PATCH] remove repetitive words Signed-off-by: carrychair --- doc/topics/development/salt_extensions.rst | 2 +- doc/topics/releases/2017.7.3.rst | 2 +- doc/topics/releases/2019.2.1.rst | 2 +- pkg/windows/nsis/installer/Salt-Minion-Setup.nsi | 2 +- salt/transport/base.py | 2 +- salt/utils/process.py | 2 +- tests/pytests/unit/modules/test_aptpkg.py | 6 +++--- tests/pytests/unit/states/test_win_wua.py | 10 +++++----- tests/pytests/unit/test_request_channel.py | 8 ++++---- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/topics/development/salt_extensions.rst b/doc/topics/development/salt_extensions.rst index 360f80a903d2..fe4eff865cc2 100644 --- a/doc/topics/development/salt_extensions.rst +++ b/doc/topics/development/salt_extensions.rst @@ -27,7 +27,7 @@ almost exclusively maintained by external corporations – if these corporations documentation outlining transfer of ownership it can be handled on a case-by-case basis. The community modules can be hosted either in individual or corporate source control systems, alternatively they can also be hosted in the community run Salt Extensions Github organization, -that will operate like the the Salt Formulas Github organization. +that will operate like the Salt Formulas Github organization. The criteria to determine which category to place modules in will follow these rules: ## Core Modules diff --git a/doc/topics/releases/2017.7.3.rst b/doc/topics/releases/2017.7.3.rst index d08562f37dfd..dfb66a18ad6b 100644 --- a/doc/topics/releases/2017.7.3.rst +++ b/doc/topics/releases/2017.7.3.rst @@ -1768,7 +1768,7 @@ Changelog for v2017.7.2..v2017.7.3 * 04b97bcfad Merge pull request `#44663`_ from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file - * c9122e4b85 fixed pylint error, and updated description on at the top the the module and state. + * c9122e4b85 fixed pylint error, and updated description on at the top the module and state. * 7fb208b5ad Update note in topics/grains to reflect that not all grains are ignored. only those set in the minion config diff --git a/doc/topics/releases/2019.2.1.rst b/doc/topics/releases/2019.2.1.rst index 5c84a644de27..22d40d68d444 100644 --- a/doc/topics/releases/2019.2.1.rst +++ b/doc/topics/releases/2019.2.1.rst @@ -5680,7 +5680,7 @@ Changelog for v2019.2.0..v2019.2.1 * 41ae390 Merge pull request `#51231`_ from terminalmage/issue51056 - * 4a61477 Clarify documentation for the the gitfs "all_saltenvs" config param + * 4a61477 Clarify documentation for the gitfs "all_saltenvs" config param * 0574476 Merge branch '2018.3' into fix_test_pkg diff --git a/pkg/windows/nsis/installer/Salt-Minion-Setup.nsi b/pkg/windows/nsis/installer/Salt-Minion-Setup.nsi index 10ec8419b45a..d081dae10b48 100644 --- a/pkg/windows/nsis/installer/Salt-Minion-Setup.nsi +++ b/pkg/windows/nsis/installer/Salt-Minion-Setup.nsi @@ -284,7 +284,7 @@ Function pageMinionConfig `hostname` no changes will be made." ${Else} ${NSD_CreateLabel} 0 75u 100% 60u \ - "Clicking `Install` will backup the the existing minion config \ + "Clicking `Install` will backup the existing minion config \ file and minion.d directories. The values above will be used in \ the custom config.$\n\ $\n\ diff --git a/salt/transport/base.py b/salt/transport/base.py index 4a491d87ce54..582d69485317 100644 --- a/salt/transport/base.py +++ b/salt/transport/base.py @@ -407,7 +407,7 @@ async def connect( # pylint: disable=arguments-differ,invalid-overridden-method self, port=None, connect_callback=None, disconnect_callback=None, timeout=None ): """ - Create a network connection to the the PublishServer or broker. + Create a network connection to the PublishServer or broker. """ raise NotImplementedError diff --git a/salt/utils/process.py b/salt/utils/process.py index af2f4cc5b0f0..51f2b91b38f4 100644 --- a/salt/utils/process.py +++ b/salt/utils/process.py @@ -208,7 +208,7 @@ def get_process_info(pid=None): # pid_exists can have false positives # for example Windows reserves PID 5 in a hack way - # another reasons is the the process requires kernel permissions + # another reasons is the process requires kernel permissions try: raw_process_info.status() except psutil.NoSuchProcess: diff --git a/tests/pytests/unit/modules/test_aptpkg.py b/tests/pytests/unit/modules/test_aptpkg.py index f1be3ca8b29f..f95bdcf63f6c 100644 --- a/tests/pytests/unit/modules/test_aptpkg.py +++ b/tests/pytests/unit/modules/test_aptpkg.py @@ -1181,7 +1181,7 @@ def test__expand_repo_def(): # Make sure last character in of the URI is still a / assert sanitized["uri"][-1] == "/" - # Pass the architecture and make sure it is added the the line attribute + # Pass the architecture and make sure it is added the line attribute repo = "deb http://cdn-aws.deb.debian.org/debian/ stretch main\n" sanitized = aptpkg._expand_repo_def( os_name="debian", @@ -1220,7 +1220,7 @@ def test__expand_repo_def_cdrom(): # Make sure last character in of the URI is still a / assert sanitized["uri"][-1] == "/" - # Pass the architecture and make sure it is added the the line attribute + # Pass the architecture and make sure it is added the line attribute repo = "deb http://cdn-aws.deb.debian.org/debian/ stretch main\n" sanitized = aptpkg._expand_repo_def( os_name="debian", @@ -1258,7 +1258,7 @@ def test_expand_repo_def_cdrom(): # Make sure last character in of the URI is still a / assert sanitized["uri"][-1] == "/" - # Pass the architecture and make sure it is added the the line attribute + # Pass the architecture and make sure it is added the line attribute repo = "deb http://cdn-aws.deb.debian.org/debian/ stretch main\n" sanitized = aptpkg._expand_repo_def( os_name="debian", repo=repo, file=source_file, architectures="amd64" diff --git a/tests/pytests/unit/states/test_win_wua.py b/tests/pytests/unit/states/test_win_wua.py index cc6e169b0f4c..d9989acf6777 100644 --- a/tests/pytests/unit/states/test_win_wua.py +++ b/tests/pytests/unit/states/test_win_wua.py @@ -307,7 +307,7 @@ def test_installed(update_records, update_records_identity): mock_wua.search = MagicMock() # Mocks the number of updates found. mock_wua.search().count.return_value = 1 - # Mocks the the updates collection object + # Mocks the updates collection object mock_wua.search().updates = update_search_obj # This mocks the updates collection in the install variable. This will @@ -414,7 +414,7 @@ def test_installed_test_mode(update_records, update_records_identity): mock_wua.search = MagicMock() # Mocks the number of updates found. mock_wua.search().count.return_value = 1 - # Mocks the the updates collection object + # Mocks the updates collection object mock_wua.search().updates = update_search_obj # This mocks the updates collection in the install variable. This will @@ -476,7 +476,7 @@ def test_installed_already_installed(update_records, update_records_identity): mock_wua.search = MagicMock() # Mocks the number of updates found. mock_wua.search().count.return_value = 1 - # Mocks the the updates collection object + # Mocks the updates collection object mock_wua.search().updates = update_search_obj # This mocks the updates collection in the install variable. This will @@ -569,7 +569,7 @@ def test_removed(update_records, update_records_identity): mock_wua.search = MagicMock() # Mocks the number of updates found. mock_wua.search().count.return_value = 1 - # Mocks the the updates collection object + # Mocks the updates collection object mock_wua.search().updates = update_search_obj # This mocks the updates collection in the uninstall variable. This will @@ -645,7 +645,7 @@ def test_removed_test_mode(update_records, update_records_identity): mock_wua.search = MagicMock() # Mocks the number of updates found. mock_wua.search().count.return_value = 1 - # Mocks the the updates collection object + # Mocks the updates collection object mock_wua.search().updates = update_search_obj # This mocks the updates collection in the install variable. This will diff --git a/tests/pytests/unit/test_request_channel.py b/tests/pytests/unit/test_request_channel.py index f4a0f0312660..26254708fc67 100644 --- a/tests/pytests/unit/test_request_channel.py +++ b/tests/pytests/unit/test_request_channel.py @@ -662,7 +662,7 @@ def mocksend(msg, timeout=60, tries=3): client.transport.send = mocksend - # Note the 'ver' value in 'load' does not represent the the 'version' sent + # Note the 'ver' value in 'load' does not represent the 'version' sent # in the top level of the transport's message. load = { "id": target, @@ -738,7 +738,7 @@ def mocksend(msg, timeout=60, tries=3): client.transport.send = mocksend - # Note the 'ver' value in 'load' does not represent the the 'version' sent + # Note the 'ver' value in 'load' does not represent the 'version' sent # in the top level of the transport's message. load = { "id": target, @@ -830,7 +830,7 @@ def mocksend(msg, timeout=60, tries=3): client.transport.send = mocksend - # Note the 'ver' value in 'load' does not represent the the 'version' sent + # Note the 'ver' value in 'load' does not represent the 'version' sent # in the top level of the transport's message. load = { "id": target, @@ -929,7 +929,7 @@ def mocksend(msg, timeout=60, tries=3): client.transport.send = mocksend - # Note the 'ver' value in 'load' does not represent the the 'version' sent + # Note the 'ver' value in 'load' does not represent the 'version' sent # in the top level of the transport's message. load = { "id": target,