and so on

Signed-off-by: Ian Maddaus <[email protected]>

Author: IanMadd

content/azure_chef_cli.md

@@ -196,7 +196,7 @@ The extension has the following options that can be provided in the
 
 `chef_node_name`
 
-: Determines which configuration should be applied and sets the `client_name`, which is the name used when authenticating to a Chef Infra Server. The default value is the the Chef Infra Client FQDN, as detected by Ohai. In general, Chef recommends that you leave this setting blank and let Ohai assign the FQDN of the node as the `node_name` during each Chef Infra Client run.
+: Determines which configuration should be applied and sets the `client_name`, which is the name used when authenticating to a Chef Infra Server. The default value is the Chef Infra Client FQDN, as detected by Ohai. In general, Chef recommends that you leave this setting blank and let Ohai assign the FQDN of the node as the `node_name` during each Chef Infra Client run.
 
 `chef_server_url`
 

content/chef_client_security.md

@@ -45,7 +45,7 @@ The `trusted_certs` directory on Chef Workstation and in Chef Infra Client works
 
 Place private and self-signed certificates in the `trusted_certs` directory to use them within Chef Infra Client and Workstation tools.
 
-Use the the [chef_client_trusted_certificate]({{< relref "/resources/chef_client_trusted_certificate" >}}) Chef Infra Client resource to manage these certificates continuously.
+Use the [chef_client_trusted_certificate]({{< relref "/resources/chef_client_trusted_certificate" >}}) Chef Infra Client resource to manage these certificates continuously.
 
 #### trusted_certs Locations
 

content/chef_deprecations_client.md

@@ -246,7 +246,7 @@ of Chef comes out.
 </tr>
 <tr>
 <td><a href="/deprecations_map_collision/">CHEF-25</a></td>
-<td>Resource(s) in a cookbook collide with the same resource(s) now included in Chef Infra Client.</td>
+<td>Resources in a cookbook collide with the same resources now included in Chef Infra Client.</td>
 <td>XX.X</td>
 <td>15.0</td>
 </tr>

content/community_contributions.md

@@ -49,7 +49,7 @@ Questions on how to use Chef Infra should be sent as Support Tickets if you have
 
 ## Contribution Process
 
-We have a four step process for contributions:
+Follow these steps to submit a contribution:
 
 1. Fork the project repository to your own GitHub account.
 2. Commit your changes to your fork, making sure to sign-off those changes for the Developer Certificate of Origin with `git commit -s`
@@ -114,7 +114,7 @@ By making a contribution to this project, I certify that:
     are public and that a record of the contribution (including
     all personal information I submit with it, including my
     sign-off) is maintained indefinitely and may be redistributed
-    consistent with this project or the open source license(s)
+    consistent with this project or the open source licenses
     involved.
 ```
 

content/community_guidelines.md

@@ -133,53 +133,6 @@ Community Organizers who don't follow or enforce the Code of Conduct in
 good faith may face temporary or permanent repercussions as determined
 by other members of the project's leadership.
 
-## Roles
-
-The following are the various roles of our **Community Organizers** and
-the person(s) assigned to each role:
-
-- The **Deciders** have final say on community guidelines and final
-    authority on correct actions and appeals.
-- The **Community Advocates** may be assigned for each area where the
-    community convenes online (Slack, email list, GitHub, etc.).
-    Community Advocates are volunteers who have the best interests of
-    our community in mind. They act in good faith to help enforce our
-    community guidelines and respond to incidents when they occur.
-- The **Project Maintainers** are expected to conduct their behavior
-    in line with the Code of Conduct and are individually responsible
-    for both escalating to a **Community Advocate** in case of
-    witnessing an incident, and helping to foster the community.
-- A **Community Member** is anyone who participates with the community
-    whether in-person or using online channels. Community members are
-    responsible for following the community guidelines, suggesting
-    updates to the guidelines when warranted, and helping enforce
-    community guidelines.
-
-<!-- markdownlint-disable MD033 -->
-
-<table>
-<colgroup>
-<col style="width: 33%" />
-<col style="width: 33%" />
-<col style="width: 33%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Role</th>
-<th>Name</th>
-<th>Contact Info</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Community Advocate</td>
-<td>benny Vasquez</td>
-<td><a href="[email protected]">[email protected]</a></td>
-</tr>
-</tbody>
-</table>
-<!-- markdownlint-enable MD033 -->
-
 ## Consequences of Unacceptable Behavior
 
 Unacceptable behavior from any community member, including sponsors and

content/ctl_chef_client.md

@@ -631,7 +631,7 @@ When running the Chef Infra Client using the `--local-mode` option,
 Another example of running the Chef Infra Client as a non-root user
 involves using resources to pass sudo commands as as an attribute on the
 resource. For example, the **service** resource uses a series of
-`_command` attributes (like `start_command`, `stop_command`, and so on),
+`_command` attributes (like `start_command` or `stop_command`),
 the **package**-based resources use the `options` attribute, and the
 **script**-based resources use the `code` attribute.
 

content/debug.md

@@ -134,7 +134,7 @@ include:
 
 * Using the **chef_handler** resource
 * Using the chef-shell and the **breakpoint** resource to add breakpoints to recipes, and to then step through the recipes using the breakpoints
-* Using the `debug_value` method from chef-shell to identify the location(s) from which attribute values are being set
+* Using the `debug_value` method from chef-shell to identify the locations from which attribute values are being set
 * Using the `ignore_failure` method in a recipe to force Chef Infra Client to move past an error to see what else is going on in the recipe, outside of a known failure
 * Using chef-solo to run targeted Chef Infra Client runs for specific scenarios
 
@@ -335,9 +335,9 @@ where
 * Each attribute value shown is the value that's set for that precedence level
 * `:not_present` is shown for any attribute precedence level that has no attributes
 
-### ignore_failure Method
+### ignore_failure method
 
-All resources share a set of common actions, attributes, and so on. Use the following attribute in a resource to help identify where an issue within a recipe may be located:
+All resources share a set of common actions, attributes, and other properties. Use the following attribute in a resource to help identify where an issue within a recipe may be located:
 
 | Attribute      | Description                                                                           |
 |----------------|---------------------------------------------------------------------------------------|

content/deprecations_map_collision.md

@@ -8,7 +8,7 @@ sitemapExclude = true
 aliases = "/deprecations_map_collision.html"
 +++
 
-The resource(s) referenced in the error message has been loaded from a
+The resources referenced in the error message has been loaded from a
 cookbook. This resource is now included in Chef Infra Client and will
 take precedence over the existing cookbook resource in the next major
 release of Chef Infra Client (15.0, April 2019). Alternatively, there

content/handlers.md

@@ -169,7 +169,7 @@ A custom handler can be created to support any situation. The easiest way to bui
 
 ### Syntax
 
-The syntax for a handler can vary, depending on what the the situations the handler is being asked to track, the type of handler being used, and so on. All custom exception and report handlers are defined using Ruby and must be a subclass of the `Chef::Handler` class.
+The syntax for a handler can vary depending on what the situations the handler is being asked to track, for example the handler type being used. All custom exception and report handlers are defined using Ruby and must be a subclass of the `Chef::Handler` class.
 
 ```ruby
 require 'chef/log'

content/infra_language/editing_resources.md

@@ -23,7 +23,7 @@ declare_resource(:resource_type, 'resource_name', resource_attrs_block)
 
 where:
 
-- `:resource_type` is the resource type, such as `:file` (for the **file** resource), `:template` (for the **template** resource), and so on. Any resource available to Chef may be declared.
+- `:resource_type` is the resource type, such as `:file` (for the **file** resource) or `:template` (for the **template** resource). Any resource available to Chef may be declared.
 - `resource_name` the property that's the default name of the resource, typically the string that appears in the `resource 'name' do` block of a resource (but not always); see the Syntax section for the resource to be declared to verify the default name property.
 - `resource_attrs_block` is a block in which properties of the instantiated resource are declared.
 
@@ -55,7 +55,7 @@ delete_resource(:resource_type, 'resource_name')
 
 where:
 
-- `:resource_type` is the resource type, such as `:file` (for the **file** resource), `:template` (for the **template** resource), and so on. Any resource available to Chef may be declared.
+- `:resource_type` is the resource type, such as `:file` (for the **file** resource) or `:template` (for the **template** resource). Any resource available to Chef may be declared.
 - `resource_name` the property that's the default name of the resource, typically the string that appears in the `resource 'name' do` block of a resource (but not always); see the Syntax section for the resource to be declared to verify the default name property.
 
 For example:
@@ -78,7 +78,7 @@ delete_resource!(:resource_type, 'resource_name')
 
 where:
 
-- `:resource_type` is the resource type, such as `:file` (for the **file** resource), `:template` (for the **template** resource), and so on. Any resource available to Chef Infra may be declared.
+- `:resource_type` is the resource type, such as `:file` (for the **file** resource) or `:template` (for the **template** resource). Any resource available to Chef Infra may be declared.
 - `resource_name` the property that's the default name of the resource, typically the string that appears in the `resource 'name' do` block of a resource (but not always); see the Syntax section for the resource to be declared to verify the default name property.
 
 For example:
@@ -102,7 +102,7 @@ edit_resource(:resource_type, 'resource_name', resource_attrs_block)
 
 where:
 
-- `:resource_type` is the resource type, such as `:file` (for the **file** resource), `:template` (for the **template** resource), and so on. Any resource available to Chef may be declared.
+- `:resource_type` is the resource type, such as `:file` (for the **file** resource) or `:template` (for the **template** resource). Any resource available to Chef may be declared.
 - `resource_name` the property that's the default name of the resource, typically the string that appears in the `resource 'name' do` block of a resource (but not always); see the Syntax section for the resource to be declared to verify the default name property.
 - `resource_attrs_block` is a block in which properties of the instantiated resource are declared.
 
@@ -142,7 +142,7 @@ edit_resource!(:resource_type, 'resource_name')
 
 where:
 
-- `:resource_type` is the resource type, such as `:file` (for the **file** resource), `:template` (for the **template** resource), and so on. Any resource available to Chef may be declared.
+- `:resource_type` is the resource type, such as `:file` (for the **file** resource) or `:template` (for the **template** resource). Any resource available to Chef may be declared.
 - `resource_name` the property that's the default name of the resource, typically the string that appears in the `resource 'name' do` block of a resource (but not always); see the Syntax section for the resource to be declared to verify the default name property.
 - `resource_attrs_block` is a block in which properties of the instantiated resource are declared.
 
@@ -167,7 +167,7 @@ find_resource(:resource_type, 'resource_name')
 
 where:
 
-- `:resource_type` is the resource type, such as `:file` (for the **file** resource), `:template` (for the **template** resource), and so on. Any resource available to Chef may be declared.
+- `:resource_type` is the resource type, such as `:file` (for the **file** resource) or `:template` (for the **template** resource). Any resource available to Chef may be declared.
 - `resource_name` the property that's the default name of the resource, typically the string that appears in the `resource 'name' do` block of a resource (but not always); see the Syntax section for the resource to be declared to verify the default name property.
 
 For example:
@@ -199,7 +199,7 @@ find_resource!(:resource_type, 'resource_name')
 
 where:
 
-- `:resource_type` is the resource type, such as `:file` (for the **file** resource), `:template` (for the **template** resource), and so on. Any resource available to Chef may be declared.
+- `:resource_type` is the resource type, such as `:file` (for the **file** resource) or `:template` (for the **template** resource). Any resource available to Chef may be declared.
 - `resource_name` the property that's the default name of the resource, typically the string that appears in the `resource 'name' do` block of a resource (but not always); see the Syntax section for the resource to be declared to verify the default name property.
 
 For example: