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

Fix some build issues and warnings #4864

Merged
merged 6 commits into from
Dec 11, 2016
Merged

Conversation

keszybz
Copy link
Member

@keszybz keszybz commented Dec 10, 2016

No description provided.

…CONDARY is

We define those macros, and there's no reason to have one without
the other.
This is already fixed upstream, so warning is not useful.
Let's keep the workaround until the fix has percolated downstream.
The loop must terminate after at most three iterations anyway.
Our warning message was misleading, because we wouldn't "correct" anything,
we'd just ignore unkown escapes. Update the message.

Also, print just the extracted word (which contains the offending sequences) in
the message, instead of the whole line.

Fixes systemd#4697.
backslash (<literal>\</literal>) may be used to merge lines.
</para>
<para>Each command line is split on whitespace, with the first item being the command to
execute, and the subsequent items being the arguments. Double quotes ("...") and single quotes
Copy link
Member

Choose a reason for hiding this comment

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

maybe "..." → "…"? (i.e. unicode ellipsis instead of three dots?)

@poettering poettering merged commit 4682047 into systemd:master Dec 11, 2016
@keszybz keszybz deleted the build-sys branch December 11, 2016 22:11
keszybz added a commit to keszybz/systemd that referenced this pull request Dec 11, 2016
As requested in
systemd#4864 (review).

docbook will substitute triple dots for the ellipsis in man output, so this has
no effect on the troff output, only on HTML, making it infinitesimally nicer.

In some places we show output from programs, which use dots, and those places
should not be changed. In some tables, the alignment would change if dots were
changed to the ellipsis which is only one character. Since docbook replaces the
ellipsis automatically, we should leave those be. This patch changes all other
places.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

2 participants