From: Karel Zak <kzak@redhat.com>
Date: Tue, 5 Jun 2012 14:57:01 +0000 (+0200)
Subject: Merge branch '2012wk22' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.22-rc1~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abb53be5cb53db9168a2fc5ff4f73aa240fcc290;p=thirdparty%2Futil-linux.git

Merge branch '2012wk22' of git://github.com/kerolasa/lelux-utiliteetit

* '2012wk22' of git://github.com/kerolasa/lelux-utiliteetit:
  docs: clean up getopt.1 manual
  docs: clean up dmesg.1 manual
  docs: clean up chcpu.8 manual
  fileutils: xmkstemp() interface change
  docs: fix all man page groff warnings
  tools: add checkmans.sh
  docs: clean up wdctl.8 manual
  docs: clean up login.1 manual
  login: allow TTYGROUP name begin by number
  build-sys: add su executable to .gitignore
  logindefs: change getlogindefs_num() to return unsigned long

Conflicts:
	login-utils/su.c
	sys-utils/dmesg.1
---

abb53be5cb53db9168a2fc5ff4f73aa240fcc290
diff --cc sys-utils/dmesg.1
index 4fb833d393,1d1aaf8faa..5bb0dd2dde
--- a/sys-utils/dmesg.1
+++ b/sys-utils/dmesg.1
@@@ -87,27 -96,31 +96,31 @@@ option is used
  will
  .I not
  print or clear the kernel ring buffer.
- .IP "\fB\-r, \-\-raw\fP"
- Print the raw message buffer, i.e., don't strip the log level prefixes.
- .IP "\fB\-s, \-\-buffer-size \fIsize\fP
+ .IP "\fB\-r\fR, \fB\-\-raw\fR"
+ Print the raw message buffer, i.e., do not strip the log level prefixes.
+ .IP "\fB\-s\fR, \fB\-\-buffer-size \fIsize\fR
  Use a buffer of
  .I size
- to query the kernel ring buffer.  This is 16392 by default.
- (The default kernel syslog buffer size was 4096
- at first, 8192 since 1.3.54, 16384 since 2.1.113.)
- If you have set the kernel buffer to be larger than the default
+ to query the kernel ring buffer.  This is 16392 by default.  (The default
+ kernel syslog buffer size was 4096 at first, 8192 since 1.3.54, 16384 since
+ 2.1.113.)  If you have set the kernel buffer to be larger than the default
  then this option can be used to view the entire buffer.
- .IP "\fB\-T, \-\-ctime\fP"
- Print human readable timestamps. The timestamp could be inaccurate!
- 
- .B The time source used for the logs is not updated after system SUSPEND/RESUME.
- .IP "\fB\-t, \-\-notime\fP"
- Don't print kernel's timestamps.
- .IP "\fB\-u, \-\-userspace\fP"
+ .IP "\fB\-T\fR, \fB\-\-ctime\fR"
+ Print human readable timestamps.  The timestamp could be inaccurate!
+ .IP
+ The
+ .B time
+ source used for the logs is
+ .B not updated after
+ system
+ .BR SUSPEND / RESUME .
+ .IP "\fB\-t\fR, \fB\-\-notime\fR"
 -Do not print kernel's timestampts.
++Do not print kernel's timestamps.
+ .IP "\fB\-u\fR, \fB\-\-userspace\fR"
  Print userspace messages.
- .IP "\fB\-V, \-\-version\fP"
+ .IP "\fB\-V\fR, \fB\-\-version\fR"
  Output version information and exit.
- .IP "\fB\-x, \-\-decode\fP"
+ .IP "\fB\-x\fR, \fB\-\-decode\fR"
  Decode facility and level (priority) number to human readable prefixes.
  .SH SEE ALSO
  .BR syslogd (8)