Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing grammar future tense to present tense, removing pronouns #8644

Closed
wants to merge 4 commits into from
Closed

fixing grammar future tense to present tense, removing pronouns #8644

wants to merge 4 commits into from

Conversation

rlopez133
Copy link

Fixing some grammatical mistakes, removing use of future tense wording and keeping it present tense i.e. will. Removed use of pronouns i.e. you, your. Included sudo to the diagnostic commands as a certain amount of privilege is required to run the commands.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 9, 2018
Copy link
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have more changes. :)

the diagnostics were added to the `openshift` binary so that wherever there is
an {product-title} server or client, the diagnostics can run in the exact same
environment.
{product-title} may be deployed in numerous scenarios including:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can deploy {product-title} by using several methods:

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to start sentences with You?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Our style guide says that docs are supposed to favor active, user-focused sentences. It's always better to say "you," meaning the user, "do <the thing>" instead of "<The thing> can be done."

environment.
{product-title} may be deployed in numerous scenarios including:

* built from source
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalize the first letter in each line of the list.

* as a container image
* via enterprise RPMs

Each method implies a different configuration and environment. The diagnostics
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/implies/is suited for
s/The diagnostics were included within openshift binary/The diagnostic tool is included in the {project-title} binary file
s/assumptions and provide the ability to run the diagnostics tool within/assumptions. You can run the diagnostics tool from


To use the diagnostics tool, preferably on a master host and as cluster
administrator, run:
administrator, run a `sudo` user:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/run a/run as a

----

This runs all available diagnostics, skipping any that do not apply.
The above command runs all available diagnostis skipping any that do not apply
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/above/previous
s/diagnostis skipping/diagnostics and skips

Keep this in mind for these volume mount specifications because it could have
unexpected consequences. For example, if you mount (and therefore relabel) your
*_$HOME/.ssh_* directory, *sshd* will become unable to access your public keys
It is important to note these volume mount specifications because it could have
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/it could/they can

unexpected consequences. For example, if you mount (and therefore relabel) your
*_$HOME/.ssh_* directory, *sshd* will become unable to access your public keys
It is important to note these volume mount specifications because it could have
unexpected consequences. For example, if one mounts (and therefore relabels) the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/one mounts (and therefore relabels)/you mount, and therefore relabel,

*_$HOME/.ssh_* directory, *sshd* will become unable to access your public keys
It is important to note these volume mount specifications because it could have
unexpected consequences. For example, if one mounts (and therefore relabels) the
*_$HOME/.ssh_* directory, *sshd* becomes unable to access the public keys
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/becomes/is

a *_known_hosts_* file and have SSH validate host keys, which is disabled by the
default configuration and can be re-enabled with an environment variable by
adding `-e ANSIBLE_HOST_KEY_CHECKING=True` to the `docker` command line.
It is plausible to want to mount an entire *_.ssh_* directory for various
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you mount an entire .ssh directory:

  • You can use an SSH configuration to match keys with hosts or modify other connection parameters.
  • You can provide a known_hosts file and use SSH to validate host keys. To use this feature, which
    +is disabled by default, use the docker command line to add the -e ANSIBLE_HOST_KEY_CHECKING=True environment variable to the container.

Standard location of the configuration files placed by an Ansible-deployed
cluster ensures that running `sudo oc adm diagnostics` works without any flags.
In the event, the standard location of the configuration files is not used,
options flags as those listed in the example below may be used.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/example below/following example

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 16, 2018
@vikram-redhat
Copy link
Contributor

@rlopez133 - will you be updating this PR based on @kalexand-rh's changes? Please make sure to rebase before you do.

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 19, 2018
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2018
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 19, 2018
@bfallonf
Copy link

Sorry, I should've noted that this PR came before my PR of #8741 and this was left open so we could discuss it (over email), and I created #8741 out of that discussion. I'd suggest this PR be closed.

That said, I can see that there was a rebase (that probably took time) so it's up to @rlopez133 and maybe @vikram-redhat to determine what to do.

@vikram-redhat
Copy link
Contributor

@bfallonf - is this undoing any of the work in 8741?

@bfallonf
Copy link

@vikram-redhat Merging this would undo some of 8741, yes.

@rlopez133
Copy link
Author

rlopez133 commented Jul 19, 2018

I'm just trying to help out :) I did the rebase (yes it did take sometime to do all that). And then I incorporated all the changes that @kalexand-rh wanted which were quite a few. I'm open to suggestions as long as it doesn't mean re-doing all those changes because it was a lot of changes...

@vikram-redhat
Copy link
Contributor

Hey @rlopez133 - all that help is really appreciated :).

We just need to figure out the best way to merge this PR so that we don't override 8741. @bfallonf let's look at this in the office today.

@rlopez133
Copy link
Author

@vikram-redhat @bfallonf - Also when I did the rebase, I did do a "this sounds the best" when having to make some decisions... I won't be offended if you want to change it back or to something else. Probably my biggest thing is starting sentences with pronouns like "You" but to each his own :)

@bfallonf
Copy link

I'll paste the above msg from @kalexand-rh here, cos it's worded well:

Yes. Our style guide says that docs are supposed to favor active, user-focused sentences. It's always better to say "you," meaning the user, "do " instead of " can be done."

Big thanks again @rlopez133 ! I'll do a quick followup PR.

@bfallonf bfallonf mentioned this pull request Jul 23, 2018
@bfallonf
Copy link

Followup PR at #10983

I'll close this PR. If anyone has thoughts, please let me know.

@bfallonf bfallonf closed this Jul 23, 2018
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jul 23, 2018
bfallonf pushed a commit that referenced this pull request Jul 23, 2018
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Jul 23, 2018
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Jul 24, 2018
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jul 24, 2018
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jul 24, 2018
bfallonf pushed a commit that referenced this pull request Jul 24, 2018
…-10983-to-enterprise-3.10

[enterprise-3.10] Edits after #8644
bfallonf pushed a commit that referenced this pull request Jul 24, 2018
…-10983-to-enterprise-3.9

[enterprise-3.9] Edits after #8644
bfallonf pushed a commit that referenced this pull request Jul 24, 2018
bfallonf pushed a commit that referenced this pull request Jul 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants