From 01f0bdc16e4f7d928d0b5b4325777d5ad6596884 Mon Sep 17 00:00:00 2001 From: Akihiro MOTOKI Date: Wed, 16 Mar 2011 02:38:35 +0900 Subject: [PATCH] Update original to man-1.6g. It is download from http://www.people.fas.harvard.edu/~lucifred/man/. --- manual/man/ChangeLog | 5 ++ manual/man/original/man.lsm | 46 +++++++------- manual/man/original/man1/apropos.1 | 11 ++-- manual/man/original/man1/man.1 | 116 +++++++++++++++++++++++++++------- manual/man/original/man1/man2html.1 | 9 +++ manual/man/original/man1/manlint.1 | 4 +- manual/man/original/man1/whatis.1 | 13 ++-- manual/man/original/man5/man.conf.5 | 14 ++-- manual/man/original/man8/makewhatis.8 | 15 +++-- manual/man/translation_list | 16 ++--- 10 files changed, 171 insertions(+), 78 deletions(-) diff --git a/manual/man/ChangeLog b/manual/man/ChangeLog index 721896d3..b98745f5 100644 --- a/manual/man/ChangeLog +++ b/manual/man/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 16 02:37:57 2011 Akihiro MOTOKI + + * original/*: original ¤ò man-1.6g ¤Ë¹¹¿·¡£ + * translation_list: ¾åµ­È¿±Ç¡£ + Sat Feb 21 15:16:15 2004 TAKEI Nobumitsu * release/man1/man.1: ¤Ú(¤«¤Ê)¢ª¥Ú(¥«¥Ê)¤Ë. ([JM:10807]) diff --git a/manual/man/original/man.lsm b/manual/man/original/man.lsm index 47a397e3..2baa1232 100644 --- a/manual/man/original/man.lsm +++ b/manual/man/original/man.lsm @@ -1,24 +1,26 @@ -Begin3 -Title: man, man2html, hman -Version: 1.5j -Entered-date: 2001-11-20 [Dirk's verjaardag] -Description: * man is a man pager. It has support for compressed pages - (both man pages and cat pages), and for locale ($LANG) - and for message catalogs ($LC_MESSAGES). It will format - files given explicitly (man ./foo.man.gz). - It conforms to FSSTND or FHS, and handles stray cats. - * man2html is a utility that converts man pages to html - * hman is a man browser that uses your favourite browser. - For use with lynx, no http daemon is required. -Keywords: man manpath apropos whatis makewhatis man.conf man2html man2dvi - hman manual pager browser keyword search -Authors: John Eaton, Richard Verhoeven, Michael Hamilton, - Andries Brouwer -Maintained-by: aeb@cwi.nl (Andries E. Brouwer) -Primary-site: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/ - 192k man-1.5j.tar.gz - 1092 man-1.5j.lsm +Begin4 +Title: man +Version: 1.6g +Entered-date: 2010-12-31 +Description: * man is a man pager. It has support for compressed + pages (both man pages and cat pages), and for locale + ($LANG) and for message catalogs ($LC_MESSAGES). It + will format files given explicitly (man ./foo.man.gz). + It conforms to FSSTND or FHS, and handles stray cats. + * man2html is a utility that converts man pages to html + * hman is a man browser that uses your favorite browser. + For use with lynx, no http daemon is required. + Keywords: man manpath apropos whatis makewhatis + man.conf man2html man2dvi hman manual pager browser + keyword search +Keywords: man, man2html, hman, whatis, apropos, man2dvi +Author: John Eaton, Richard Verhoeven, Michael Hamilton, + Andries Brouwer, Federico lucifredi (flucifredi@acm.org) +Maintained-by: Federico Lucifredi (flucifredi@acm.org) +Primary-site: http://primates.ximian.com/~flucifredi/man/ + 251k man-1.6g.tar.gz + 1378 man-1.6g.lsm +Alternate-site: http://www.people.fas.harvard.edu/~lucifred/man/ Alternate-site: ftp://metalab.unc.edu/pub/Linux/apps/doctools/man/ -Alternate-site: ftp://ftp.XX.kernel.org/pub/linux/utils/man/ -Copying-policy: Copyright by authors. Distributable under GPL. +Copying-policy: Copyright by authors. Distributable under GPL. End diff --git a/manual/man/original/man1/apropos.1 b/manual/man/original/man1/apropos.1 index 7825a312..9ad50ce3 100644 --- a/manual/man/original/man1/apropos.1 +++ b/manual/man/original/man1/apropos.1 @@ -1,7 +1,3 @@ -.\" -.\" Generated automatically from apropos.1.in by the -.\" configure script. -.\" .\" Man page for apropos .\" .\" Copyright (c) 1990, 1991, John W. Eaton. @@ -16,7 +12,7 @@ .\" The University of Texas at Austin .\" Austin, Texas 78712 .\" -.TH apropos 1 "Jan 15, 1991" +.TH apropos 1 "September 19, 2005" .LO 1 .SH NAME apropos \- search the whatis database for strings @@ -27,5 +23,10 @@ keyword ... apropos searches a set of database files containing short descriptions of system commands for keywords and displays the result on the standard output. +.SH AUTHOR +John W. Eaton was the original author of +.BR "man" . +Zeyd M. Ben-Halim released man 1.2, and Andries Brouwer followed up with versions 1.3 thru 1.5p. +Federico Lucifredi is the current maintainer. .SH "SEE ALSO" whatis(1), man(1). diff --git a/manual/man/original/man1/man.1 b/manual/man/original/man1/man.1 index 8a82394f..eff25486 100644 --- a/manual/man/original/man1/man.1 +++ b/manual/man/original/man1/man.1 @@ -1,7 +1,3 @@ -.\" -.\" Generated automatically from man.1.in by the -.\" configure script. -.\" .\" Man page for man (and the former manpath) .\" .\" Copyright (c) 1990, 1991, John W. Eaton. @@ -17,13 +13,12 @@ .\" Austin, Texas 78712 .\" .\" Many changes - aeb +.\" More changes - flc .\" -.TH man 1 "September 2, 1995" +.TH man 1 "September 19, 2005" .LO 1 .SH NAME man \- format and display the on-line manual pages -.br -manpath \- determine user's search path for man pages .SH SYNOPSIS .B man .RB [ \-acdfFhkKtwW ] @@ -38,6 +33,10 @@ manpath \- determine user's search path for man pages .IR pathlist ] .RB [ \-P .IR pager ] +.RB [ \-B +.IR browser ] +.RB [ \-H +.IR htmlpager ] .RB [ \-S .IR section_list ] .RI [ section ] @@ -67,11 +66,40 @@ See below for a description of where .B man looks for the manual page files. +.SH MANUAL SECTIONS +The standard sections of the manual include: +.TP +.B 1 +User Commands +.TP +.B 2 +System Calls +.TP +.B 3 +C Library Functions +.TP +.B 4 +Devices and Special Files +.TP +.B 5 +File Formats and Conventions +.TP +.B 6 +Games et. Al. +.TP +.B 7 +Miscellanea +.TP +.B 8 +System Administration tools and Deamons +.TP +Distributions customize the manual section to their specifics, which often include additional sections. + .SH OPTIONS .TP .B \-\^C " config_file" Specify the configuration file to use; the default is -.BR /usr/share/misc/man.conf . +.BR @man_config_file@ . (See .BR man.conf (5).) .TP @@ -92,7 +120,25 @@ environment variable, which in turn overrides the variable. By default, .B man uses -.BR "/usr/bin/less -is" . +.BR "@pager@" . +.TP +.B \-\^B +Specify which browser to use on HTML files. +This option overrides the +.B BROWSER +environment variable. By default, +.B man +uses +.BR @browser@ , +.TP +.B \-\^H +Specify a command that renders HTML files as text. +This option overrides the +.B HTMLPAGER +environment variable. By default, +.B man +uses +.BR @htmlpager@ , .TP .B \-\^S " section_list" List is a colon separated list of manual sections to search. @@ -131,7 +177,7 @@ Equivalent to Format only - do not display. .TP .B \-\^h -Print a one-line help message and exit. +Print a help message and exit. .TP .B \-\^k Equivalent to @@ -161,11 +207,17 @@ environment variable. .TP .B \-\^t Use -.B /usr/bin/groff -Tps -mandoc +.B @troff@ to format the manual page, passing the output to .B stdout. -The output from -.B /usr/bin/groff -Tps -mandoc +The default output format of +.B @troff@ +is Postscript, refer to the manual page of +.B @troff@ +for ways to pick an alternate format. +.PP +Depending on the selected format and the availability of printing +devices, the output may need to be passed through some filter or another before being printed. .TP @@ -191,7 +243,7 @@ formatting time the next time these pages are needed. Traditionally, formatted versions of pages in DIR/manX are saved in DIR/catX, but other mappings from man dir to cat dir can be specified in -.BR /usr/share/misc/man.conf . +.BR @man_config_file@ . No cat pages are saved when the required cat directory does not exist. No cat pages are saved when they are formatted for a line length different from 80. @@ -212,12 +264,19 @@ The option .B \-c forces reformatting a page, even if a recent cat page exists. +.SH "HTML PAGES" +Man will find HTML pages if they live in directories named as +'html' followed by a section extension. The last file extension is +expected to be ".html", thus a valid name for an HTML version of the +.BR ls (1) +man page would be +.IR /usr/share/man/htmlman1/ls.1.html . .SH "SEARCH PATH FOR MANUAL PAGES" .B man uses a sophisticated method of finding manual page files, based on the invocation options and environment variables, the -.B /usr/share/misc/man.conf +.B @man_config_file@ configuration file, and some built in conventions and heuristics. .PP First of all, when the @@ -261,7 +320,7 @@ or .B man develops its own path list based on the contents of the configuration file -.BR /usr/share/misc/man.conf . +.BR @man_config_file@ . The .B MANPATH statements in the configuration file identify particular directories to @@ -303,7 +362,7 @@ in the parent directory of the command directory. You can disable the automatic "nearby" searches by including a .B NOAUTOPATH statement in -.BR /usr/share/misc/man.conf . +.BR @man_config_file@ . .PP In each directory in the search path as described above, .B man @@ -388,9 +447,17 @@ is set, its value is used as the name of the program to use to display the man page. If not, then .B PAGER is used. If that has no value either, -.B /usr/bin/less -is +.B @pager@ is used. .TP +.B BROWSER +The name of a browser to use for displaying HTML manual pages. If +it is not set, @browser@ is used. +.TP +.B HTMLPAGER +The command to use for rendering HTML manual pages as text. If +it is not set, @htmlpager@ is used. +.TP .B LANG If .B LANG @@ -426,8 +493,6 @@ is used to get the default alternate system name (for use with the .B \-m option). -.SH "SEE ALSO" -apropos(1), whatis(1), less(1), groff(1), man.conf(5). .SH BUGS The .B \-t @@ -438,7 +503,7 @@ put `LESSCHARSET=latin1' in your environment. .SH TIPS If you add the line - (global-set-key [(f1)] (lambda () (interactive) (manual-entry (current-word)))) + (global-set-key [(f1)] (lambda () (interactive) (manual-entry (current-word)))) to your .IR .emacs @@ -449,4 +514,11 @@ To get a plain text version of a man page, without backspaces and underscores, try # man foo | col -b > foo.mantxt - +.SH AUTHOR +John W. Eaton was the original author of +.BR "man" . +Zeyd M. Ben-Halim released man 1.2, and Andries Brouwer followed up with +versions 1.3 thru 1.5p. +Federico Lucifredi is the current maintainer. +.SH "SEE ALSO" +apropos(1), whatis(1), less(1), groff(1), man.conf(5). diff --git a/manual/man/original/man1/man2html.1 b/manual/man/original/man1/man2html.1 index 6afb1d8a..c1c25b35 100644 --- a/manual/man/original/man1/man2html.1 +++ b/manual/man/original/man1/man2html.1 @@ -102,6 +102,9 @@ Set separator to '/'. .TP .B \-\^q Set separator to '?'. This is the default. +.TP +.B \-\^r +Use relative html paths, instead of cgi-bin paths. .LP On a machine without running .BR httpd , @@ -137,6 +140,12 @@ There are many heuristics. The output will not always be perfect. The lynxcgi method will not work if lynx was compiled without selecting support for it. There may be problems with security. +.SH AUTHOR +Richard Verhoeven was the original author of +.BR "man2html" . +Michael Hamilton and Andries Brouwer subsequently improved on it. +Federico Lucifredi is the current maintainer. + .SH "SEE ALSO" .BR lynx (1), .BR man (1) diff --git a/manual/man/original/man1/manlint.1 b/manual/man/original/man1/manlint.1 index fe522fb4..ab760097 100644 --- a/manual/man/original/man1/manlint.1 +++ b/manual/man/original/man1/manlint.1 @@ -55,7 +55,9 @@ and it can't handle mdoc format. Still, it's clear what it should do, and even in its current form it can find lots of problems in existing man files. .SH AUTHOR -David A. Wheeler (dwheeler@ida.org) +David A. Wheeler (dwheeler@ida.org) was the original author of +.BR "manlint" . +Federico Lucifredi is the current maintainer. .SH "SEE ALSO" .BR man (7), .BR mdoc (7). diff --git a/manual/man/original/man1/whatis.1 b/manual/man/original/man1/whatis.1 index a407a487..7793394e 100644 --- a/manual/man/original/man1/whatis.1 +++ b/manual/man/original/man1/whatis.1 @@ -1,7 +1,3 @@ -.\" -.\" Generated automatically from whatis.1.in by the -.\" configure script. -.\" .\" Man page for whatis .\" .\" Copyright (c) 1990, 1991, John W. Eaton. @@ -16,7 +12,7 @@ .\" The University of Texas at Austin .\" Austin, Texas 78712 .\" -.TH whatis 1 "Jan 5, 1991" +.TH whatis 1 "September 19, 2005" .LO 1 .SH NAME whatis \- search the whatis database for complete words. @@ -28,6 +24,11 @@ whatis searches a set of database files containing short descriptions of system commands for keywords and displays the result on the standard output. Only complete word matches are displayed. -The whatis database is created using the command /usr/sbin/makewhatis. +The whatis database is created using the command @makewhatis@. +.SH AUTHOR +John W. Eaton was the original author of +.BR "man" . +Zeyd M. Ben-Halim released man 1.2, and Andries Brouwer followed up with versions 1.3 thru 1.5p. +Federico Lucifredi is the current maintainer. .SH "SEE ALSO" apropos(1), man(1). diff --git a/manual/man/original/man5/man.conf.5 b/manual/man/original/man5/man.conf.5 index 22ce66f3..811e6bdd 100644 --- a/manual/man/original/man5/man.conf.5 +++ b/manual/man/original/man5/man.conf.5 @@ -1,9 +1,5 @@ -.\" -.\" Generated automatically from man.conf.5.in by the -.\" configure script. -.\" .\" @(#)man.conf -.TH MAN.CONF 5 "30 Mar 1994" +.TH MAN.CONF 5 "September 19, 2005" .SH NAME man.conf \- configuration data for man .SH DESCRIPTION @@ -39,8 +35,12 @@ NROFF /usr/bin/groff -mandoc -Tlatin1 -P-u -P-b .LP in order to suppress underlining and overstriking. .SH FILES -.I "/usr/share/misc/man.conf" +.I "@man_config_file@" +.SH AUTHOR +John W. Eaton was the original author of +.BR "man" . +Zeyd M. Ben-Halim released man 1.2, and Andries Brouwer followed up with versions 1.3 thru 1.5p. +Federico Lucifredi is the current maintainer. .SH "SEE ALSO" col(1), (g)eqn(1), (g)pic(1), groff(1), grotty(1), (g)refer(1), (g)tbl(1), less(1), man (1) and compress(1), gzip(1). - diff --git a/manual/man/original/man8/makewhatis.8 b/manual/man/original/man8/makewhatis.8 index 514f7c45..21082846 100644 --- a/manual/man/original/man8/makewhatis.8 +++ b/manual/man/original/man8/makewhatis.8 @@ -1,7 +1,3 @@ -.\" -.\" Generated automatically from makewhatis.8.in by the -.\" configure script. -.\" .\" Copyright (c) 1999 Ottavio G. Rizzo .\" .\" This is free documentation; you can redistribute it and/or @@ -24,7 +20,7 @@ .\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, .\" USA. .\" -.TH MAKEWHATIS 8 "22 January 1999" +.TH MAKEWHATIS 8 "September 19, 2005" .SH NAME makewhatis \- Create the whatis database .SH SYNOPSIS @@ -66,8 +62,8 @@ Looks in the .I sections of .IR manpath " or " catpath . -If the option is absent, its value is assumed to be -.I \'1 2 3 4 5 6 7 8 9 n l\' +If the option is absent, the MANSECT env var will be used. If it too +is absent, the MANSECT setting in man.conf will be used. .TP .BI -c " catpath" The preformatted manual pages located in @@ -93,6 +89,11 @@ macros, such as the Tcl/Tk pages. .PP .B makewhatis does not work on preformatted translations. +.SH AUTHOR +John W. Eaton was the original author of +.BR "man" . +Zeyd M. Ben-Halim released man 1.2, and Andries Brouwer followed up with versions 1.3 thru 1.5p. +Federico Lucifredi is the current maintainer. .SH SEE ALSO .BR apropos (1), .BR man (1), diff --git a/manual/man/translation_list b/manual/man/translation_list index 05b117fe..9f7fee53 100644 --- a/manual/man/translation_list +++ b/manual/man/translation_list @@ -1,8 +1,8 @@ -○:man:1.5j:1991/01/15:apropos:1:1998/01/29::hanataka@abyss.rim.or.jp:HANATAKA Shinya: -○:man:1.5j:1998/01/19:hman:1:1999/12/06::nakano@apm.seikei.ac.jp:NAKANO Takeo: -○:man:1.5j:1995/09/02:man:1:2002/01/15::ysato@h4.dion.ne.jp:Yuichi SATO: -○:man:1.5j:1998/01/01:man2html:1:1998/03/05::nakano@apm.seikei.ac.jp:NAKANO Takeo: -○:man:1.5j:0000/00/00:manlint:1:2002/01/15::ysato@h4.dion.ne.jp:Yuichi SATO: -○:man:1.5j:1991/01/05:whatis:1:1999/12/06::nakano@apm.seikei.ac.jp:NAKANO Takeo: -○:man:1.5j:1994/03/30:man.conf:5:1998/01/29::hanataka@abyss.rim.or.jp:HANATAKA Shinya: -○:man:1.5j:1999/01/22:makewhatis:8:1999/12/06::nakano@apm.seikei.ac.jp:NAKANO Takeo: +☆:man:1.5j=>1.6g:2005/09/19:apropos:1:1998/01/29::hanataka@abyss.rim.or.jp:HANATAKA Shinya: +○:man:1.6g:1998/01/19:hman:1:1999/12/06::nakano@apm.seikei.ac.jp:NAKANO Takeo: +☆:man:1.5j=>1.6g:2005/09/19:man:1:2002/01/15::ysato@h4.dion.ne.jp:Yuichi SATO: +☆:man:1.5j=>1.6g:1998/01/01:man2html:1:1998/03/05::nakano@apm.seikei.ac.jp:NAKANO Takeo: +☆:man:1.5j=>1.6g:1999/07/14:manlint:1:2002/01/15::ysato@h4.dion.ne.jp:Yuichi SATO: +☆:man:1.5j=>1.6g:2005/09/19:whatis:1:1999/12/06::nakano@apm.seikei.ac.jp:NAKANO Takeo: +☆:man:1.5j=>1.6g:2005/09/19:man.conf:5:1998/01/29::hanataka@abyss.rim.or.jp:HANATAKA Shinya: +☆:man:1.5j=>1.6g:2005/09/19:makewhatis:8:1999/12/06::nakano@apm.seikei.ac.jp:NAKANO Takeo: -- 2.11.0