]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'master' of https://github.com/eric-s-raymond/util-linux
authorKarel Zak <kzak@redhat.com>
Thu, 13 Jun 2013 11:32:02 +0000 (13:32 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 13 Jun 2013 11:32:02 +0000 (13:32 +0200)
* 'master' of https://github.com/eric-s-raymond/util-linux:
  Fix broken list syntax.
  Restore use of correct alternation syntax using { | }.
  Re-layout a FILES section in the traditional style.
  Remove another .ti for .RS/.RE, and remove a .TP that broke list parsing.
  Replace .IP o with .IP \(bu, using the [nt]roff bullet character.
  Replace .ti operations with equivalent .RS/.RE pairs.


Trivial merge