Skip to content

Conversation

@bergerhoffer
Copy link
Contributor

@bergerhoffer bergerhoffer commented Oct 20, 2020

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 20, 2020
@bergerhoffer bergerhoffer added this to the Next Release milestone Oct 20, 2020
_topic_map.yml Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

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

FYI @sfortner-RH This is what I commented out per our discussion earlier

@openshift-docs-preview-bot

The preview will be available shortly at:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@adellape You can't have more than one level 1 heading (= Heading) in a file, so this was my attempt at fixing this file. Can you take a look and see if this is okay how I added this, or if you have a different way/text you'd rather see?

Preview: https://fixin-build-issues--ocpdocs.netlify.app/openshift-enterprise/latest/operators/understanding/olm-common-terms.html#olm-common-terms-glossary_olm-common-terms

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, that works. Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ahardin-rh Can you check this file? It had some incorrect levels and I just want a sanity check that they indentation/levels are still what you were expecting. Thanks!

Preview: https://fixin-build-issues--ocpdocs.netlify.app/openshift-enterprise/latest/post_installation_configuration/storage-configuration.html

Copy link
Contributor

Choose a reason for hiding this comment

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

Your changes LGTM! Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@adellape Can you check this file too please?

Copy link
Contributor

Choose a reason for hiding this comment

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

Perfect, thanks. A casualty of a recent un-wrap. 😬

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, unfortunately gotta be careful about that happening!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@adellape This too please

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@JStickler Can you please check this? This is fixing a build warning about being at the wrong level. Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

@bergerhoffer, that's actually a serverless file, so calling @abrennan89 to make the call on this one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Apologies @JStickler - thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jboxman Can you check this update please?

Copy link
Contributor

Choose a reason for hiding this comment

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

Your change aligns with the usage elsewhere in the install docs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@apinnick This PR is fixing build issues. Can you please check that this fix is correct? Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, this looks fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mburke5678 Can you check the changes in this file please?

Copy link
Contributor

Choose a reason for hiding this comment

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

@bergerhoffer I think I used === to make the text smaller. Seems to large as ==. Is there a better/proper way to do this? Maybe definition lists?
While you are in the file, could you male Syslog parameters: and Additional RFC5424 syslog parameters consistent? One has a colon and one doesn't. Probably remove the colon?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mburke5678 Sure thing, removed the colon.

And yeah, you need to go in order of the heading level, you shouldn't use a lower level just because you want the font to be smaller.

If I had to make a suggestion here, I would say that these sections don't really belong in the procedure module, and should probably be reference modules included after the procedure.

Copy link
Contributor

Choose a reason for hiding this comment

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

And yeah, you need to go in order of the heading level, you shouldn't use a lower level just because you want the font to be smaller.
Makes sense. Not sure why I formatted it this way. Thanks for fixing!

@jboxman
Copy link
Contributor

jboxman commented Oct 20, 2020

@bergerhoffer thanks been thinking about these for weeks.

@vikram-redhat
Copy link
Contributor

/lgtm

Merging to get past build warnings and errors for l10n.

@vikram-redhat vikram-redhat merged commit 91aa104 into openshift:master Oct 22, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2020
@vikram-redhat
Copy link
Contributor

vikram-redhat commented Oct 22, 2020

/cherrypick enterprise-4.6

@vikram-redhat
Copy link
Contributor

vikram-redhat commented Oct 22, 2020

/cherrypick enterprise-4.5

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 22, 2020

@vikram-redhat: new pull request created: #26632

Details

In response to this:

/cherrypick enterprise-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 22, 2020

@vikram-redhat: #26603 failed to apply on top of branch "enterprise-4.5":

Applying: Fixing build issues and warnings
Using index info to reconstruct a base tree...
M	_topic_map.yml
A	modules/cluster-logging-collector-log-forward-syslog.adoc
M	modules/cnf-debugging-low-latency-cnf-tuning-status.adoc
A	modules/nw-aws-nlb-new-cluster.adoc
A	modules/olm-mirroring-catalog.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/olm-mirroring-catalog.adoc deleted in HEAD and modified in Fixing build issues and warnings. Version Fixing build issues and warnings of modules/olm-mirroring-catalog.adoc left in tree.
CONFLICT (modify/delete): modules/nw-aws-nlb-new-cluster.adoc deleted in HEAD and modified in Fixing build issues and warnings. Version Fixing build issues and warnings of modules/nw-aws-nlb-new-cluster.adoc left in tree.
Auto-merging modules/cnf-debugging-low-latency-cnf-tuning-status.adoc
CONFLICT (content): Merge conflict in modules/cnf-debugging-low-latency-cnf-tuning-status.adoc
CONFLICT (modify/delete): modules/cluster-logging-collector-log-forward-syslog.adoc deleted in HEAD and modified in Fixing build issues and warnings. Version Fixing build issues and warnings of modules/cluster-logging-collector-log-forward-syslog.adoc left in tree.
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fixing build issues and warnings
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 22, 2020

@vikram-redhat: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift-cherrypick-robot/openshift-docs\n ! [rejected] cherry-pick-26603-to-enterprise-4.6 -> cherry-pick-26603-to-enterprise-4.6 (non-fast-forward)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:[email protected]/openshift-cherrypick-robot/openshift-docs'\nhint: Updates were rejected because the tip of your current branch is behind\nhint: its remote counterpart. Integrate the remote changes (e.g.\nhint: 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n", error: exit status 1

Details

In response to this:

/cherrypick enterprise-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.4 branch/enterprise-4.5 branch/enterprise-4.6 lgtm Indicates that a PR is ready to be merged. peer-review-needed Signifies that the peer review team needs to review this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.