Imported Upstream version 8.24upstream/8.24upstream

11 files changed, 153 insertions, 44 deletions

diff --git a/man/chmod.x b/man/chmod.x
index f26d7631..76ea30d0 100644
--- a/man/chmod.x
+++ b/man/chmod.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2015 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/chown.x b/man/chown.x
index 96b0c237..1a36e185 100644
--- a/man/chown.x
+++ b/man/chown.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2015 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/df.x b/man/df.x
index 6fd040ac..8136d158 100644
--- a/man/df.x
+++ b/man/df.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2015 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/du.x b/man/du.x
index 7c302718..be9191cf 100644
--- a/man/du.x
+++ b/man/du.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2015 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/dummy-man b/man/dummy-man
index dca2b678..bf31912b 100755
--- a/man/dummy-man
+++ b/man/dummy-man
@@ -69,5 +69,5 @@ The full documentation for
 is maintained as a Texinfo manual, which should be accessible
 on your system via the command
 .IP
-.B info coreutils $bs(aq$progname invocation$bs(aq
+.B info $bs(aq(coreutils) $progname invocation$bs(aq
 END
diff --git a/man/help2man b/man/help2man
index bfeb9897..fe786ac2 100755
--- a/man/help2man
+++ b/man/help2man
@@ -405,16 +405,19 @@ s/\\/\x82/g;
 # "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
 # optional word, so that either "Report bugs" or "Report _program_ bugs" will
 # be matched.
-my $PAT_BUGS          = _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports +to');
+my $PAT_BUGS          = _('Report +(?:[\w-]+ +)?bugs|' .
+                          'Email +bug +reports +to|' .
+                          '.* +online +help:');
 my $PAT_AUTHOR        = _('Written +by');
 my $PAT_OPTIONS       = _('Options');
 my $PAT_ENVIRONMENT   = _('Environment');
 my $PAT_FILES         = _('Files');
 my $PAT_EXAMPLES      = _('Examples');
 my $PAT_FREE_SOFTWARE = _('This +is +free +software');
+my $PAT_SEE_ALSO      = _('Full +documentation');
 
 # Start a new paragraph (if required) for these.
-s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR) /$1\n\n$2 /og;
+s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR|$PAT_SEE_ALSO) /$1\n\n$2 /og;
 
 # Convert iso-8859-1 copyright symbol or (c) to nroff
 # character.
@@ -462,6 +465,12 @@ while (length)
 	$sect = _('AUTHOR');
     }
 
+    elsif (/^($PAT_SEE_ALSO)/o)
+    {
+	$sect = _('SEE ALSO');
+	$opt_no_info = 1;
+    }
+
     # Examples, indicated by an indented leading $, % or > are
     # rendered in a constant width font.
     if (/^( +)([\$\%>] )\S/)
@@ -588,6 +597,17 @@ while (length)
 	    #   ...
 	    s/\n([[:upper:]])/\n.br\n$1/g;
 	}
+	elsif ($sect eq _('SEE ALSO'))
+	{
+	    # Handle external references of the form:
+	    #
+	    #   GNU <package> online resources: <addr>
+	    #   Full documentation at: <addr>
+	    #   or available locally via: info ...
+	    #
+	    s/\'/\\(aq/g;			# shell quotes for info command
+	    s/\n(.)/\n.br\n$1/g;		# separate lines for each item
+	}
     }
 
     # Check if matched paragraph contains /pat/.
diff --git a/man/local.mk b/man/local.mk
index f4b213f7..45bda93e 100644
--- a/man/local.mk
+++ b/man/local.mk
@@ -1,7 +1,7 @@
 # Make coreutils man pages.				-*-Makefile-*-
 # This is included by the top-level Makefile.am.
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,33 +52,117 @@ mandeps += $(top_srcdir)/src/system.h
 
 $(ALL_MANS): $(mandeps)
 
-# Most prog.1 man pages depend on src/$prog, except when they are part of a
-# single binary, in which case they depend on src/coreutils. The exceptions
-# are handled by converting $name to $prog on the following code.
-# $(ALL_MANS) includes the $(EXTRA_MANS) so even the programs that are not
-# being installed will have the right dependency for the manpages.
-DISTCLEANFILES += man/dynamic-deps.mk
-man/dynamic-deps.mk: Makefile
-	$(AM_V_GEN)rm -f $@ $@-t
-	$(AM_V_at)for man in $(ALL_MANS); do				\
-		name=`echo "$$man"|sed 's|.*/||; s|\.1$$||'` || exit 1;	\
-		case $$name in						\
-		     arch) prog='uname';;				\
-		  install) prog='ginstall';;				\
-		     test) prog='[';;					\
-			*) prog=$$name;;				\
-		esac;							\
-		case " $(single_binary_progs) " in			\
-			*" $$prog "*)					\
-				echo $$man: src/coreutils$(EXEEXT);;	\
-			*)						\
-				echo $$man: src/$$prog$(EXEEXT);;	\
-		esac							\
-	done > $@-t							\
-	&& mv $@-t $@
-
-# Include the generated man dependencies.
-@AMDEP_TRUE@@am__include@ man/dynamic-deps.mk
+if SINGLE_BINARY
+mandeps += src/coreutils$(EXEEXT)
+else
+# Most prog.1 man pages depend on src/prog.  List the exceptions:
+man/arch.1:      src/uname$(EXEEXT)
+man/install.1:   src/ginstall$(EXEEXT)
+man/test.1:      src/[$(EXEEXT)
+
+man/base64.1:    src/base64$(EXEEXT)
+man/basename.1:  src/basename$(EXEEXT)
+man/cat.1:       src/cat$(EXEEXT)
+man/chcon.1:     src/chcon$(EXEEXT)
+man/chgrp.1:     src/chgrp$(EXEEXT)
+man/chmod.1:     src/chmod$(EXEEXT)
+man/chown.1:     src/chown$(EXEEXT)
+man/chroot.1:    src/chroot$(EXEEXT)
+man/cksum.1:     src/cksum$(EXEEXT)
+man/comm.1:      src/comm$(EXEEXT)
+man/coreutils.1: src/coreutils$(EXEEXT)
+man/cp.1:        src/cp$(EXEEXT)
+man/csplit.1:    src/csplit$(EXEEXT)
+man/cut.1:       src/cut$(EXEEXT)
+man/date.1:      src/date$(EXEEXT)
+man/dd.1:        src/dd$(EXEEXT)
+man/df.1:        src/df$(EXEEXT)
+man/dir.1:       src/dir$(EXEEXT)
+man/dircolors.1: src/dircolors$(EXEEXT)
+man/dirname.1:   src/dirname$(EXEEXT)
+man/du.1:        src/du$(EXEEXT)
+man/echo.1:      src/echo$(EXEEXT)
+man/env.1:       src/env$(EXEEXT)
+man/expand.1:    src/expand$(EXEEXT)
+man/expr.1:      src/expr$(EXEEXT)
+man/factor.1:    src/factor$(EXEEXT)
+man/false.1:     src/false$(EXEEXT)
+man/fmt.1:       src/fmt$(EXEEXT)
+man/fold.1:      src/fold$(EXEEXT)
+man/groups.1:    src/groups$(EXEEXT)
+man/head.1:      src/head$(EXEEXT)
+man/hostid.1:    src/hostid$(EXEEXT)
+man/hostname.1:  src/hostname$(EXEEXT)
+man/id.1:        src/id$(EXEEXT)
+man/join.1:      src/join$(EXEEXT)
+man/kill.1:      src/kill$(EXEEXT)
+man/link.1:      src/link$(EXEEXT)
+man/ln.1:        src/ln$(EXEEXT)
+man/logname.1:   src/logname$(EXEEXT)
+man/ls.1:        src/ls$(EXEEXT)
+man/md5sum.1:    src/md5sum$(EXEEXT)
+man/mkdir.1:     src/mkdir$(EXEEXT)
+man/mkfifo.1:    src/mkfifo$(EXEEXT)
+man/mknod.1:     src/mknod$(EXEEXT)
+man/mktemp.1:    src/mktemp$(EXEEXT)
+man/mv.1:        src/mv$(EXEEXT)
+man/nice.1:      src/nice$(EXEEXT)
+man/nl.1:        src/nl$(EXEEXT)
+man/nohup.1:     src/nohup$(EXEEXT)
+man/nproc.1:     src/nproc$(EXEEXT)
+man/numfmt.1:    src/numfmt$(EXEEXT)
+man/od.1:        src/od$(EXEEXT)
+man/paste.1:     src/paste$(EXEEXT)
+man/pathchk.1:   src/pathchk$(EXEEXT)
+man/pinky.1:     src/pinky$(EXEEXT)
+man/pr.1:        src/pr$(EXEEXT)
+man/printenv.1:  src/printenv$(EXEEXT)
+man/printf.1:    src/printf$(EXEEXT)
+man/ptx.1:       src/ptx$(EXEEXT)
+man/pwd.1:       src/pwd$(EXEEXT)
+man/readlink.1:  src/readlink$(EXEEXT)
+man/realpath.1:  src/realpath$(EXEEXT)
+man/rm.1:        src/rm$(EXEEXT)
+man/rmdir.1:     src/rmdir$(EXEEXT)
+man/runcon.1:    src/runcon$(EXEEXT)
+man/seq.1:       src/seq$(EXEEXT)
+man/sha1sum.1:   src/sha1sum$(EXEEXT)
+man/sha224sum.1: src/sha224sum$(EXEEXT)
+man/sha256sum.1: src/sha256sum$(EXEEXT)
+man/sha384sum.1: src/sha384sum$(EXEEXT)
+man/sha512sum.1: src/sha512sum$(EXEEXT)
+man/shred.1:     src/shred$(EXEEXT)
+man/shuf.1:      src/shuf$(EXEEXT)
+man/sleep.1:     src/sleep$(EXEEXT)
+man/sort.1:      src/sort$(EXEEXT)
+man/split.1:     src/split$(EXEEXT)
+man/stat.1:      src/stat$(EXEEXT)
+man/stdbuf.1:    src/stdbuf$(EXEEXT)
+man/stty.1:      src/stty$(EXEEXT)
+man/sum.1:       src/sum$(EXEEXT)
+man/sync.1:      src/sync$(EXEEXT)
+man/tac.1:       src/tac$(EXEEXT)
+man/tail.1:      src/tail$(EXEEXT)
+man/tee.1:       src/tee$(EXEEXT)
+man/timeout.1:   src/timeout$(EXEEXT)
+man/touch.1:     src/touch$(EXEEXT)
+man/tr.1:        src/tr$(EXEEXT)
+man/true.1:      src/true$(EXEEXT)
+man/truncate.1:  src/truncate$(EXEEXT)
+man/tsort.1:     src/tsort$(EXEEXT)
+man/tty.1:       src/tty$(EXEEXT)
+man/uname.1:     src/uname$(EXEEXT)
+man/unexpand.1:  src/unexpand$(EXEEXT)
+man/uniq.1:      src/uniq$(EXEEXT)
+man/unlink.1:    src/unlink$(EXEEXT)
+man/uptime.1:    src/uptime$(EXEEXT)
+man/users.1:     src/users$(EXEEXT)
+man/vdir.1:      src/vdir$(EXEEXT)
+man/wc.1:        src/wc$(EXEEXT)
+man/who.1:       src/who$(EXEEXT)
+man/whoami.1:    src/whoami$(EXEEXT)
+man/yes.1:       src/yes$(EXEEXT)
+endif
 
 .x.1:
 	$(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1;	\
@@ -97,12 +181,14 @@ man/dynamic-deps.mk: Makefile
 	  && t=$*.td							\
 	  && rm -rf $$t							\
 	  && $(MKDIR_P) $$t						\
-	  && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$argv) \
+	  && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog$(EXEEXT) \
+				$$argv$(EXEEXT))			\
 	  && $(run_help2man)						\
 		     --source='$(PACKAGE_STRING)'			\
 		     --include=$(srcdir)/man/$$name.x			\
-		     --output=$$t/$$name.1 $$t/$$argv			\
-		     --info-page='coreutils \(aq'$$name' invocation\(aq' \
+		     --output=$$t/$$name.1				\
+		     --info-page='\(aq(coreutils) '$$name' invocation\(aq' \
+		     $$t/$$argv$(EXEEXT)				\
 	  && sed \
 	       -e 's|$*\.td/||g' \
 	       -e '/For complete documentation/d' \
diff --git a/man/rm.x b/man/rm.x
index 6da82c42..d3a77817 100644
--- a/man/rm.x
+++ b/man/rm.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2015 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/stdbuf.x b/man/stdbuf.x
index 0f50219b..1076c82c 100644
--- a/man/stdbuf.x
+++ b/man/stdbuf.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 2009-2014 Free Software Foundation, Inc.
+'\" Copyright (C) 2009-2015 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
@@ -13,5 +13,5 @@ Run COMMAND, with modified buffering operations for its standard streams.
 .br
 This will immedidately display unique entries from access.log
 [BUGS]
-On GLIBC platforms, specifying a buffer size, i.e. using fully buffered mode
+On GLIBC platforms, specifying a buffer size, i.e., using fully buffered mode
 will result in undefined operation.
diff --git a/man/sync.x b/man/sync.x
index 7947bb77..18ee3fc4 100644
--- a/man/sync.x
+++ b/man/sync.x
@@ -1,6 +1,9 @@
 [NAME]
-sync \- flush file system buffers
+sync \- Synchronize cached writes to persistent storage
 [DESCRIPTION]
 .\" Add any additional description here
+[BUGS]
+Persistence guarantees vary per system.
+See the system calls below for more details.
 [SEE ALSO]
-sync(2)
+fdatasync(2), fsync(2), sync(2), syncfs(2)
diff --git a/man/timeout.x b/man/timeout.x
index 41b42954..cefa1228 100644
--- a/man/timeout.x
+++ b/man/timeout.x
@@ -5,4 +5,4 @@ timeout \- run a command with a time limit
 [SEE ALSO]
 kill(1)
 [BUGS]
-Some platforms don't curently support timeouts beyond 2038
+Some platforms don't curently support timeouts beyond the year 2038.