From owner-cvs-src-old@FreeBSD.ORG Wed Oct 6 07:23:10 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4232010656A4 for ; Wed, 6 Oct 2010 07:23:10 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3125D8FC15 for ; Wed, 6 Oct 2010 07:23:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o967NAsx096324 for ; Wed, 6 Oct 2010 07:23:10 GMT (envelope-from gordon@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o967NAGP096323 for cvs-src-old@freebsd.org; Wed, 6 Oct 2010 07:23:10 GMT (envelope-from gordon@repoman.freebsd.org) Message-Id: <201010060723.o967NAGP096323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to gordon@repoman.freebsd.org using -f From: Gordon Tetlow Date: Wed, 6 Oct 2010 07:22:56 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/usr.bin/man man.sh X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Oct 2010 07:23:10 -0000 gordon 2010-10-06 07:22:56 UTC FreeBSD src repository Modified files: usr.bin/man man.sh Log: SVN rev 213470 on 2010-10-06 07:22:56Z by gordon If LANG/LC_CTYPE/LC_ALL is set and the localized man page contains a page also in the base set, the man utility when invoked with -a would display pages for each locale in the same tree: $ LANG=en_GB.ISO8859-15 man -wa man /usr/share/man/en.ISO8859-15/man1/man.1.gz /usr/share/man/man1/man.1.gz /usr/share/man/en.ISO8859-15/man7/man.7.gz /usr/share/man/man7/man.7.gz Use continue to break out of the loop for the current locale. This results in behavior more closely matching the old GNU man implementation: $ LANG=en_GB.ISO8859-15 man -wa man /usr/share/man/en.ISO8859-15/man1/man.1.gz /usr/share/man/en.ISO8859-15/man7/man.7.gz This will still search for a copy of the file in other manual path locations. If there was a /usr/local/man/man1/man.1.gz file, it would still be displayed. This is also consistent with the GNU man implementation. Submitted by: arundel Approved by: wes (mentor implicit) Revision Changes Path 1.3 +9 -3 src/usr.bin/man/man.sh