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

Update manpage formatting #9136

Merged
merged 5 commits into from Nov 16, 2020

Conversation

EricFromCanada
Copy link
Member

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • [n/a] Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew style with your changes locally?
  • Have you successfully run brew tests with your changes locally?
  • Have you successfully run brew man locally and committed any changes?

Various improvements to the text and formatting of the brew manpage and Markdown output; most notably better handling of lists under the analytics, cask, bundle, services, Global Cask Options and Environment sections.

Depends on Homebrew/homebrew-bundle#813 and Homebrew/homebrew-test-bot#519.

@EricFromCanada EricFromCanada force-pushed the man-page-formatting branch 2 times, most recently from 4857d98 to 1ece75f Compare November 16, 2020 12:55
Modify parser.rb to add a colon between each term and the line break, which `ronn` converts into a definition list.
The <br> that follows ensures each term description is on a new line in the manpage output, and also replaces the
double trailing space for generating the hard return that follows each term in the HTML output.
Also modify man.rb to print environment variables with list markup matching the cask commands, and then drop
trailing colons from both lists of terms (cask commands, env vars) and non-list terms (analytics, bundle, services;
a <br> is added here because it would prevent the term description from being indented in the manpage output).
https://docs.brew.sh/Manpage#cask-command-options-cask
@MikeMcQuaid MikeMcQuaid merged commit 40cc423 into Homebrew:master Nov 16, 2020
@MikeMcQuaid
Copy link
Member

Thanks @EricFromCanada!

@EricFromCanada EricFromCanada deleted the man-page-formatting branch November 16, 2020 14:49
@BrewTestBot BrewTestBot added the outdated PR was locked due to age label Dec 16, 2020
@Homebrew Homebrew locked as resolved and limited conversation to collaborators Dec 16, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
outdated PR was locked due to age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants