Skip to content

Conversation

@olehermanse
Copy link
Member

@olehermanse olehermanse commented Feb 20, 2024

This file is shown in our docs and could use a cleanup.

Went over this file trying to fix as many obvious / easy inconsistencies as I could:

  • Removed the use of h1, h5 and h6 headings.
  • Added JSON highlighting to code blocks.
  • Fixed invalid JSON (trailing commas, missing colons).
  • Fixed inconsistent indentation / formatting of code blocks.
  • Fixed capitalization of several headers to use sentence case.
  • Fixed capitalization of CFEngine, HTTP, HTTPS, etc. in a few places.
  • Added monospace font for binaries; cf-serverd, etc.
  • Fixed inconsistent markdown syntax (especially what should be bold and which symbols to use for bulleted lists).
  • Fixed small typos / grammer mistakes.
  • Renamed some headings to make them easier to understand.

Ticket: ENT-11371

This file is shown in our docs and could use a cleanup.

Went over this file trying to fix as many obvious / easy
inconsistencies as I could:
* Removed the use of h1, h5 and h6 headings.
* Added JSON highlighting to code blocks.
* Fixed invalid JSON (trailing commas, missing colons).
* Fixed inconsistent indentation / formatting of code blocks.
* Fixed capitalization of several headers to use sentence case.
* Fixed capitalization of CFEngine, HTTP, HTTPS, etc. in a few places.
* Added monospace font for binaries; cf-serverd, etc.
* Fixed inconsistent markdown syntax (especially what should be bold and which symbols to use for bulleted lists).
* Fixed small typos / grammer mistakes.
* Renamed some headings to make them easier to understand.

Ticket: ENT-11371
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
Copy link
Contributor

@larsewi larsewi left a comment

Choose a reason for hiding this comment

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

💩

Copy link
Contributor

@craigcomstock craigcomstock left a comment

Choose a reason for hiding this comment

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

good changes generally.

I would prefer we did one line per sentence style here but I guess some folks will read this in a console so 80-ish columns makes some sense.

thanks for all this busy work! appreciate it!

@nickanderson
Copy link
Member

I opened a PR in docs to see the result of this: cfengine/documentation#3221

@nickanderson
Copy link
Member

good changes generally.

I would prefer we did one line per sentence style here but I guess some folks will read this in a console so 80-ish columns makes some sense.

thanks for all this busy work! appreciate it!

humm, maybe we add the necessary doc comments to enable line wrapping in the editors. I sort of prefer 80 column limit but do find myself using long lines with visual wrapping more and more.

@olehermanse
Copy link
Member Author

I would prefer we did one line per sentence style here but I guess some folks will read this in a console so 80-ish columns makes some sense.

@craigcomstock I would also prefer it, but it didn't seem worth it, big file to edit.

@olehermanse
Copy link
Member Author

@nickanderson @craigcomstock IMO, it should be preferred, for the same reasons as in website repo:

https://github.com/cfengine/website/blob/master/README.md#sentences-and-wrapping

However, it's a big change and would require a lot of going around editing files manually, so I'm not about to venture down this path of doing it everywhere and making it required.

In other words: it's recommended for now.

Copy link
Member

@nickanderson nickanderson left a comment

Choose a reason for hiding this comment

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

Just a couple suggestions.

olehermanse and others added 2 commits February 20, 2024 16:58
Co-authored-by: Nick Anderson <nick@cmdln.org>
Co-authored-by: Nick Anderson <nick@cmdln.org>
@olehermanse olehermanse merged commit 1111df1 into cfengine:master Feb 20, 2024
@olehermanse olehermanse deleted the MPF.md branch February 20, 2024 19:13
@nickanderson
Copy link
Member

So fast docbuild won't pick up these changes until they are found in the nightly package.

olehermanse added a commit to olehermanse/masterfiles that referenced this pull request Feb 21, 2024
Too many conflicts, did this one manually.

Based on:
cfengine#2835

Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
olehermanse added a commit to olehermanse/masterfiles that referenced this pull request Feb 21, 2024
Too many conflicts, did this one manually.

Based on:
cfengine#2835

Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
@olehermanse
Copy link
Member Author

olehermanse commented Feb 21, 2024

Backport: #2836

@olehermanse olehermanse removed the cherry-pick? Fixes which may need to be cherry-picked to LTS branches label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants