Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 manpages (3.54-1) unstable; urgency=low
 .
   * Imported Upstream version 3.54
     . dir_colors.5: Add various synonyms (Closes: #553477)
     . ip.7: IP_MULTICAST_IF setsockopt recognizes struct mreq (Closes: #607979)
Author: Simon Paillard <spaillard@debian.org>
Bug-Debian: http://bugs.debian.org/553477
Bug-Debian: http://bugs.debian.org/607979

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- manpages-3.54.orig/Makefile
+++ manpages-3.54/Makefile
@@ -55,7 +55,7 @@ install:
 		install -m 644 "$$i"/* $(DESTDIR)$(MANDIR)/"$$i" || exit $$?; \
 	done; \
 
-# Check if groff reports warnings (may be words of sentances not displayed)
+# Check if groff reports warnings (may be words or sentences not displayed)
 # from http://lintian.debian.org/tags/manpage-has-errors-from-man.html 
 GROFF_LOG := $(shell mktemp /tmp/manpages-checksXXXX)
 check-groff-warnings:
--- /dev/null
+++ manpages-3.54/man7/LDP.7
@@ -0,0 +1,90 @@
+.\" Copyright (C) 2000 Stein Gjoen
+.\" 
+.\" %%%LICENSE_START(VERBATIM_TRANSLATIONS)
+.\" Permission is granted to make and distribute verbatim copies of this
+.\" manual provided the copyright notice and this permission notice are
+.\" preserved on all copies.
+.\"
+.\" Permission is granted to copy and distribute modified versions of this
+.\" manual under the conditions for verbatim copying, provided that the
+.\" entire resulting derived work is distributed under the terms of a
+.\" permission notice identical to this one.
+.\" 
+.\" Permission is granted to copy and distribute translations of this
+.\" manual into another language, under the above conditions for modified
+.\" versions, except that this permission notice may be included in
+.\" translations approved by the Free Software Foundation instead of in
+.\" the original English.
+.\" %%%LICENSE_END
+.TH LDP 7 2001-11-15 "LDP"
+.SH NAME
+LDP \- Intro to the Linux Documentation Project, with help, guides and documents
+.SH SYNOPSIS
+The Linux Documentation Project (LDP) provides a variety of
+free documentation resources including
+guides, FAQs, HOWTOs, and man-pages to the Linux community.
+.SH AUTHORS
+The various documents in the LDP archives are maintained by individual
+authors, and are listed in the beginning of each HOWTO.
+If you have
+any questions or inputs to a document we encourage you to contact the
+authors directly.
+.SH "WEB PAGES"
+The LDP has its own dedicated web site as do many of
+the various translations projects which are linked from the
+main LDP web site at:
+
+.RS
+\fBhttp://www\&.tldp\&.org/\fP
+.RE
+.SH "MAN PAGES"
+A web page with status information for manual pages and translations
+is found at:
+
+.RS
+\fBhttp://www\&.win\&.tue\&.nl/~aeb/linux/man/\fP
+.RE
+.SH "MAILING LISTS"
+LDP has a number of mailing lists, such as
+.PP
+.PD 0
+.TP
+.PD
+\fB<announce@en\&.tlpd\&.org>\fP
+Announcements from the LDP project
+.TP
+\fB<discuss@en\&.tldp\&.org>\fP
+General discussion on the LDP project
+.TP
+\fB<docbook@en\&.tldp\&.org>\fP
+Questions about the use of DocBook
+.PP
+For subscription information, see the website.
+.PP
+If you are interested in DocBook beyond the simple markup of your LDP
+document, you may want to consider joining one of the OASIS DocBook
+mailing lists.
+Please see
+\fBhttp://docbook\&.org/mailinglist/index\&.html\fP
+for more information.
+.SH FILES
+Most distributions include the HOWTOs and mini-HOWTOs in the installation
+.PD 0
+.TP
+\fI/usr/doc/\fP                   (old place for documentation)
+.TP
+\fI/usr/share/doc/\fP             (new place for documentation)
+.TP
+\fI/usr/share/doc/HOWTO/\fP       (HOWTO files)
+.TP
+\fI/usr/share/doc/HOWTO/mini/\fP  (mini-HOWTO files)
+.PD
+.SH "SEE ALSO"
+.BR info (1),
+.BR man (1),
+.BR xman (1x)
+.PP
+\fBinfo\fP pages as read with
+.BR emacs (1)
+or
+.BR info (1)
--- manpages-3.54.orig/man7/man.7
+++ manpages-3.54/man7/man.7
@@ -563,12 +563,12 @@ is not implemented.
 .BR lexgrog (1),
 .BR man (1),
 .BR man2html (1),
+.BR groff_mdoc (7),
 .BR whatis (1),
 .BR groff_man (7),
 .BR groff_www (7),
 .BR man-pages (7),
-.BR mdoc (7),
-.BR mdoc.samples (7)
+.BR mdoc (7)
 .SH COLOPHON
 This page is part of release 3.54 of the Linux
 .I man-pages
--- manpages-3.54.orig/man7/rtnetlink.7
+++ manpages-3.54/man7/rtnetlink.7
@@ -18,6 +18,8 @@ rtnetlink \- Linux IPv4 routing socket
 .SH SYNOPSIS
 .B #include <asm/types.h>
 .br
+.B #include <linux/if_link.h>
+.br
 .B #include <linux/netlink.h>
 .br
 .B #include <linux/rtnetlink.h>
--- /dev/null
+++ manpages-3.54/man7/undocumented.7
@@ -0,0 +1,106 @@
+.\" Copyright (C) 1996 Erick Branderhorst <branderh@debian.org>
+.\"
+.\" %%%LICENSE_START(GPLv2+_SW_3_PARA)
+.\" This is free software; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2,
+.\" or (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+.\" the GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, see
+.\" <http://www.gnu.org/licenses/>.
+.\" %%%LICENSE_END
+.\"
+.\" This manpage is created thanks to:
+.\" Kai Henningsen <kai@khms.westfalen.de>,
+.\" Ian Jackson <iwj10@cus.cam.ac.uk>,
+.\" David H. Silber <dhs@firefly.com>,
+.\" Carl Streeter <streeter@cae.wisc.edu>,
+.\" Martin Michlmayr <tbm@cyrius.com>.
+.\"
+.TH UNDOCUMENTED 7 "August 24th, 2003" "Debian GNU/Linux" "Linux Programmer's Manual"
+.SH NAME
+undocumented \- No manpage for this program, utility or function.
+.SH DESCRIPTION
+This
+.BR program ", " utility
+or 
+.B function 
+does not have a useful manpage.  Before opening a bug to report this,
+please check with the Debian Bug Tracking System (BTS) at
+.RI < http://bugs.debian.org/ >
+if a bug has already been reported.  If not, you can submit a wishlist bug
+if you want.
+
+If you are a competent and accurate writer and are willing to spend
+the time reading the source code and writing good manpages please
+write a better man page than this one.  Please 
+.B contact 
+the 
+.B package maintainer 
+and copy
+.I man-pages@qa.debian.org
+in order to avoid several people working on the same manpage.
+
+Even if you are not an accurate writer, your input may be helpful.
+Writing manual pages is quite easy, the format is described in
+.BR man (7).
+The most important and time-consuming task is to collect the
+information to be put in the new manpage.
+
+.SH DIAGNOSTICS
+.PP
+It is possible that the man page for the command you specified is installed
+and that your manual page index caches are out of sync. You should try
+running
+.BR mandb (8).
+.PP
+Try the following options if you want more information:
+.PP
+.I foo
+.BR \-\-help ,
+.I foo
+.BR \-h ,
+.IB foo " \-?"
+.PP 
+.BI info " foo"
+.PP 
+.B whatis
+.BR foo ,
+.BI apropos " foo"
+.PP 
+.B dpkg \-\-listfiles
+.IR foo ,
+.BI "dpkg \-\-search " foo
+.PP
+.BI "locate '*" foo "*'"
+.PP
+.BI "find / \-name '*" foo "*'"
+.PP
+Additionally, check the directories
+.IR /usr/share/doc/foo ,
+.IR /usr/lib/foo .
+.PP
+The documentation might be in a package starting with the same
+name as the package the software belongs to, but ending with -doc or -docs.
+.PP
+If you still didn't find the information you are looking for you might
+consider posting a call for help to
+.IR debian-user@lists.debian.org .
+.SH SEE ALSO
+.BR info (1),
+.BR whatis (1),
+.BR apropos (1),
+.BR dpkg (8),
+.BR locate (1),
+.BR find (1),
+.BR updatedb (1),
+.BR undocumented (3),
+.BR man (7),
+.BR mandb (8),
+.BR missing (7).
--- manpages-3.54.orig/man7/mdoc.7
+++ manpages-3.54/man7/mdoc.7
@@ -62,7 +62,7 @@ The macro names and their meanings are
 listed below for quick reference; for
 a detailed explanation on using the package,
 see the tutorial sampler
-.Xr mdoc.samples 7 .
+.Xr groff_mdoc 7 .
 .Pp
 Note that this is not the usual macro package for Linux documentation,
 although it is used for documentation of several widely used programs;
--- /dev/null
+++ manpages-3.54/man7/missing.7
@@ -0,0 +1,192 @@
+.\"  Copyright (c) 2001 Martin Schulze <joey@infodrom.org>
+.\"
+.\" %%%LICENSE_START(GPLv2_MISC)
+.\" 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 the Free Software Foundation; version 2 dated June, 1991.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, see
+.\" <http://www.gnu.org/licenses/>.
+.\" %%%LICENSE_END
+.\"
+.TH MISSING 7 "December 14th, 2001" "Debian GNU/Linux" "Linux Programmer's Manual"
+.SH NAME
+missing \- missing manual pages
+.SH DESCRIPTION
+This manual page intends to document which manual pages are missing in
+various sections.  Bug reports against the package
+.B manpages-dev
+or
+.B manpages
+were opened for all of them through the Debian Bug Tracking System
+(BTS).  Some of these bug reports were reported upstream while some
+weren't.  Upstream, however, is not able to create arbitrary manpages
+without additional information and additional spare time.  Hence, it's
+completely useless to simply report them upstream.
+
+Manpages represent an important means of documentation which can
+easily be read and converted into various formats.  They are very
+helpful for checking how things work, rather than for a tutorial.  If
+you notice that more pages are missing, please try to find additional
+information and report it as wishlist bug against this package.
+
+If you are confident with the issue, please write up a preliminary
+manpage and attach it to the bug report.  It doesn't matter if your
+English is bad or if you mixed up markup, as long as the content can
+be used as source for a new manpage.  A detailed documentation on how
+to write manpages is available in
+.BR man (7).
+
+When writing manual pages please ensure that they are conforming with
+The Single UNIX Specification (see below).  Linux ought to be
+conforming to this specification.  Differences need to be documented,
+in additional sections, though.
+.SH "MISSING PAGES"
+The following is a list of missing pages sorted by section and bug
+number.  If you can contribute content or even a manual page, please
+send a mail to
+.IB nnnnn @bugs.debian.org
+where
+.I nnnnn
+refers to the bug number from below.
+.\" .SS "Section 2 - System calls"
+.SS "Section 3 - Library calls"
+.TP
+.RI Bug# 123999
+.BR obstack_alloc (3)
+\- allocate memory
+.br
+.BR obstack_free (3)
+\- free formerly allocated memory
+.br
+.BR obstack_copy (3)
+\- allocate block with content
+.br
+.BR obstack_copy0 (3)
+\- allocate block with content, zero terminated
+.br
+.BR obstack_blank (3)
+\- increase object size
+.br
+.BR obstack_grow (3)
+\- increase object size with content
+.br
+.BR obstack_grow0 (3)
+\- increase object size with content, zero term.
+.br
+.BR obstack_1grow (3)
+\- increase object size by 1 character
+.br
+.BR obstack_ptr_grow (3)
+\- increase object size by value of pointer
+.br
+.BR obstack_int_grow (3)
+\- increase object size by sizeof(int)
+.br
+.BR obstack_finish (3)
+\- finish growing of an obstack object
+.br
+.BR obstack_object_size (3)
+\- return the size of an obstack object
+.br
+.BR obstack_room (3)
+\- available room in current chunk
+.br
+.BR obstack_1grow_fast (3)
+\- fast increase object size by 1 character
+.br
+.BR obstack_ptr_grow_fast (3)
+\- fast increase object by pointer value
+.br
+.BR obstack_int_grow_fast (3)
+\- fast increase object size by sizeof(int)
+.br
+.BR obstack_blank_fast (3)
+\- fast increase object size
+.br
+.BR obstack_base (3)
+\- return tentative address of beginning
+.br
+.BR obstack_next_free (3)
+\- return address of the first free byte
+.br
+.BR obstack_object_size (3)
+\- return size of currently growing object
+.br
+.BR obstack_alignment_mask (3)
+\- alter mask assignment
+.br
+.BR obstack_chunk_size (3)
+\- return chunk size of given obstack
+.br
+.BR obstack_init (3)
+\- initialize use of an obstack
+.TP
+.RI Bug# 172139
+.BR wcstol (3)
+\- convert a wide-character string to a long integer
+.TP
+.RI Bug# 202022
+.BR iruserok_sa (3)
+\- routines for returning a stream to a remote command (see
+.BR rcmd (3)).
+.TP
+.RI Bug# 208856
+.BR cap_set_proc "(3), " cap_get_proc (3)
+\- POSIX capability manipulation on processes
+.br
+.BR capsetp "(3), " capgetp (3)
+\- Linux specific capability manipulation on arbitrary processes
+.TP
+.RI Bug# 349388
+.BR argp_parse (3)
+\- main interface to argp.
+.\" .SS "Section 4 - Special files"
+.SS "Section 9 - Kernel routines"
+.TP
+.RI Bug# 102724
+Mandrake seems to deliver section 9 manual pages, though their source
+is obscure and they do seem to be out-dated.  Nevertheless, some
+section 9 manpages would be nice, indeed.
+.TP
+.RI Bug# 179475
+.BR kapmd (9)
+\- kernel APM thread
+.br
+.BR keventd (9)
+\- manage hotplug events
+.br
+.BR khubd (9)
+\- kernel USB hub daemon thread
+.br
+.BR kjournald (9)
+\- maintain the filesystem journal
+.br
+.BR ksoftirqd (9)
+\- software handling of incoming IRQs
+.br
+.BR kswapd (9)
+\- kernel swap daemon thread
+.br
+.BR kupdated (9)
+\- flush the journal
+.br
+.BR scsi_eh (9)
+\- kernel SCSI error handler thread
+.SH "SEE ALSO"
+.BR undocumented (3),
+.BR undocumented (7),
+.BR man (7).
+.br
+Debian Bug Tracking System at
+.RB < http://bugs.debian.org/manpages-dev >,
+the Single UNIX Specification, Version 2, at
+.RB < http://www.opengroup.org/onlinepubs/007908799/toc.htm >,
+the Single UNIX Specification, Version 3, at
+.RB < http://www.UNIX-systems.org/version3/ >.
--- manpages-3.54.orig/man4/console_codes.4
+++ manpages-3.54/man4/console_codes.4
@@ -19,6 +19,7 @@
 .\" Tiny correction, aeb, 961107.
 .\"
 .\" 2006-05-27, Several corrections - Thomas E. Dickey
+.\" Modified Thu Dec 13 23:23:41 2001 by Martin Schulze <joey@infodrom.org>
 .\"
 .TH CONSOLE_CODES 4 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
@@ -550,8 +551,11 @@ ESC m		Memory unlock (per HP terminals).
 ESC n	LS2	Invoke the G2 character set.
 ESC o	LS3	Invoke the G3 character set.
 ESC |	LS3R	Invoke the G3 character set as GR.
+		Has no visible effect in xterm.
 ESC }	LS2R	Invoke the G2 character set as GR.
+		Has no visible effect in xterm.
 ESC ~	LS1R	Invoke the G1 character set as GR.
+		Has no visible effect in xterm.
 .TE
 .PP
 It also recognizes ESC % and provides a more complete UTF-8
--- manpages-3.54.orig/man3/getpwnam.3
+++ manpages-3.54/man3/getpwnam.3
@@ -210,10 +210,18 @@ structure.
 .TP
 .B ERANGE
 Insufficient buffer space supplied.
+.SH NOTE
+The user password database mostly refers to \fI/etc/passwd\fP.
+However, with recent systems it also refers to network wide databases
+using NIS, LDAP and other local files as configured in
+\fI/etc/nsswitch.conf\fP.
 .SH FILES
 .TP
 .I /etc/passwd
 local password database file
+.TP
+.I /etc/nsswitch.conf
+System Databases and Name Service Switch configuration file
 .SH ATTRIBUTES
 .SS Multithreading (see pthreads(7))
 The
@@ -332,6 +340,7 @@ main(int argc, char *argv[])
 .BR getspnam (3),
 .BR putpwent (3),
 .BR setpwent (3),
+.BR nsswitch.conf (5),
 .BR passwd (5)
 .SH COLOPHON
 This page is part of release 3.54 of the Linux
--- manpages-3.54.orig/man3/fclose.3
+++ manpages-3.54/man3/fclose.3
@@ -56,6 +56,16 @@ function flushes the stream pointed to b
 (writing any buffered output data using
 .BR fflush (3))
 and closes the underlying file descriptor.
+.\" Reviewed by upstream and rejected, May 2012, Debian#67239
+.PP
+The behaviour of
+.BR fclose ()
+is undefined if the
+.I stream
+parameter is an illegal pointer, or is a descriptor already passed
+to a previous invocation of
+.BR fclose ().
+.\" End of patch
 .SH RETURN VALUE
 Upon successful completion 0 is returned.
 Otherwise,
--- manpages-3.54.orig/man3/puts.3
+++ manpages-3.54/man3/puts.3
@@ -65,7 +65,7 @@ more than once.
 .PP
 .BI "putchar(" c );
 is equivalent to
-.BI "putc(" c , stdout ).
+.BI "putc(" c ", " stdout ).
 .PP
 .BR puts ()
 writes the string
--- manpages-3.54.orig/man3/nl_langinfo.3
+++ manpages-3.54/man3/nl_langinfo.3
@@ -31,6 +31,8 @@ in a more flexible way than
 does.
 Individual and additional elements of the locale categories can
 be queried.
+.BR setlocale (3)
+needs to be executed with proper arguments before.
 .PP
 Examples for the locale elements that can be specified in \fIitem\fP
 using the constants defined in \fI<langinfo.h>\fP are:
--- manpages-3.54.orig/man3/getpwent.3
+++ manpages-3.54/man3/getpwent.3
@@ -28,7 +28,8 @@
 .\"     386BSD man pages
 .\"
 .\" Modified Sat Jul 24 19:22:14 1993 by Rik Faith (faith@cs.unc.edu)
-.\" Modified Mon May 27 21:37:47 1996 by Martin Schulze (joey@linux.de)
+.\" Modified Mon May 27 21:37:47 1996 by Martin Schulze <joey@linux.de>
+.\" Modified Thu Dec 13 21:10:55 2001 by Martin Schulze <joey@infodrom.org>
 .\"
 .TH GETPWENT 3  2013-06-21 "GNU" "Linux Programmer's Manual"
 .SH NAME
@@ -97,6 +98,21 @@ struct passwd {
 };
 .fi
 .in
+.\" Next paragraph rejected upstream
+.PP
+When
+.BR shadow (5)
+passwords are enabled (which is default on many GNU/Linux
+installations) the content of
+.I pw_passwd
+is usually not very useful.  In such a case most passwords are stored
+in a separate file.
+.PP
+The variable
+.I pw_shell
+may be empty, in which case the system will execute the default shell
+.RB ( /bin/sh )
+for the user.
 .PP
 For more information about the fields of this structure, see
 .BR passwd (5).
@@ -106,7 +122,7 @@ The
 function returns a pointer to a
 .I passwd
 structure, or NULL if
-there are no more entries or an error occurs.
+there are no more entries or an error occured.
 If an error occurs,
 .I errno
 is set appropriately.
@@ -174,6 +190,8 @@ field is not specified in POSIX, but is
 .BR getpwnam (3),
 .BR getpwuid (3),
 .BR putpwent (3),
+.\" Next line rejected upstream
+.BR shadow (5),
 .BR passwd (5)
 .SH COLOPHON
 This page is part of release 3.54 of the Linux
--- /dev/null
+++ manpages-3.54/man5/mailname.5
@@ -0,0 +1,41 @@
+.\" Copyright (c) 2002 Joe Wreschnig <piman@sacredchao.net>
+.\"
+.\" %%%LICENSE_START(GPLv2+_DOC_FULL)
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, see
+.\" <http://www.gnu.org/licenses/>.
+.\" %%%LICENSE_END
+.\"
+.\" 2002-03-29, joey: polishing
+.\"
+.TH MAILNAME 5 2002-03-29 "Debian GNU/Linux" "Linux System Administration"
+.SH NAME
+mailname - the visible mail name of the system
+.SH DESCRIPTION
+The file \fI/etc/mailname\fR is a plain ASCII configuration file,
+which on a Debian system contains the visible mail name of the system.
+It is used by many different programs,
+usually programs that wish to send or relay mail, and need to know the
+name of the system.
+.PP
+The file contains only one line describing the fully qualified domain
+name that the program wishing to get the mail name should use (that
+is, everything after the @).
+.SH SEE ALSO
+.BR mailaddr (7),
+.BR sendmail (8)
--- manpages-3.54.orig/man5/dir_colors.5
+++ manpages-3.54/man5/dir_colors.5
@@ -407,6 +407,21 @@ RIGHTCODE	m
 The default
 .B ENDCODE
 is undefined.
+.SH FILES
+.TP
+.I /etc/DIR_COLORS
+.\" Rejected upstream
+(Slackware, SuSE and RedHat only; ignored by GNU
+.BR dircolors (1)
+and thus Debian.)
+System-wide configuration file.
+.TP
+.I ~/.dir_colors
+.\" Rejected upstream
+(Slackware, SuSE and RedHat only; ignored by GNU
+.BR dircolors (1)
+and thus Debian.)
+Per-user configuration file.
 .SH SEE ALSO
 .BR dircolors (1),
 .BR ls (1),
--- manpages-3.54.orig/man5/tzfile.5
+++ manpages-3.54/man5/tzfile.5
@@ -144,6 +144,28 @@ if either
 .I tzh_timecnt
 is zero or the time argument is less than the first transition time recorded
 in the file.
+.\" http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=122906#47
+.\" Reviewed by upstream and rejected, May 2012
+.SH NOTES
+This manual page documents
+.I <tzfile.h>
+in the glibc source archive, see
+.IR timezone/tzfile.h .
+
+It seems that timezone uses
+.B tzfile
+internally, but glibc refuses to expose it to userspace.  This is most
+likely because the standardised functions are more useful and
+portable, and actually documented by glibc.  It may only be in glibc
+just to support the non-glibc-maintained timezone data (which is
+maintained by some other entity).
+.SH "SEE ALSO"
+.BR time (3),
+.BR gettimeofday (3),
+.BR tzset (3),
+.BR ctime (3)
+.\" .BR newctime (3)
+.\" End of patch 
 .PP
 For version-2-format timezone files,
 the above header and data is followed by a second header and data,
--- manpages-3.54.orig/man5/resolv.conf.5
+++ manpages-3.54/man5/resolv.conf.5
@@ -204,6 +204,8 @@ This has the effect of trying a AAAA que
 .BR gethostbyname (3)
 function, and of mapping IPv4 responses in IPv6 "tunneled form"
 if no AAAA records are found but an A record set exists.
+
+Some programs behave strangely when this option is turned on.
 .TP
 .BR ip6-bytestring " (since glibc 2.3.4)"
 sets
--- manpages-3.54.orig/man5/nsswitch.conf.5
+++ manpages-3.54/man5/nsswitch.conf.5
@@ -271,6 +271,11 @@ Include the specified
 .I user
 from the NIS passwd map.
 .TP
+.BI + user::::::
+Include the specified
+.I user
+from the NIS passwd map, but override with non-empty passwd fields.
+.TP
 .BI +@ netgroup
 Include all users in the given
 .IR netgroup .
--- manpages-3.54.orig/man5/motd.5
+++ manpages-3.54/man5/motd.5
@@ -31,17 +31,32 @@ motd \- message of the day
 The contents of
 .I /etc/motd
 are displayed by
-.BR login (1)
+.\" Patched in Debian, maybe other distribs
+.BR pam_motd (8)
+.\" End of patch
+.\" .BR login (1)
 after a successful login but just before it executes the login shell.
 
 The abbreviation "motd" stands for "message of the day", and this file
 has been traditionally used for exactly that (it requires much less disk
 space than mail to all users).
+
+On Debian GNU/Linux, the content of 
+.I /run/motd.dynamic
+is also displayed.
+This file is generated by
+.I /etc/init.d/motd
+at boot.
 .SH FILES
-/etc/motd
+.I /etc/motd
+.br
+.I /run/motd.dynamic
+.br
+.I /etc/init.d/motd
 .SH SEE ALSO
 .BR login (1),
-.BR issue (5)
+.BR issue (5),
+.BR pam_motd (8)
 .SH COLOPHON
 This page is part of release 3.54 of the Linux
 .I man-pages
--- manpages-3.54.orig/man2/ptrace.2
+++ manpages-3.54/man2/ptrace.2
@@ -138,6 +138,17 @@ isn't expecting to trace it.
 and
 .IR data
 are ignored.)
+.IP
+Since Ubuntu 10.10,
+.BR PTRACE_ATTACH
+is not allowed against
+arbitrary matching-uid processes. The traced "child" must
+be a descendant of the tracer or must have called
+.BR prctl (2)
+using
+.BR PR_SET_PTRACER ,
+with the pid of the tracer (or one of its ancestors).
+For more details, see \fI/etc/sysctl.d/10-ptrace.conf\fP.
 .LP
 The
 .B PTRACE_TRACEME
