1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
s/manpage/man page/g
diff -ruN -x config.guess -x config.sub man-1.6e-old/man2html/man2html.c man-1.6e/man2html/man2html.c
--- man-1.6e-old/man2html/man2html.c 2006-06-14 00:05:21.000000000 +0200
+++ man-1.6e/man2html/man2html.c 2007-01-31 01:28:57.000000000 +0100
@@ -124,7 +124,7 @@
*/
int i,j,nr;
char *f, *g, *h;
- char *idtest[6]; /* url, mailto, www, ftp, manpage, include file */
+ char *idtest[6]; /* url, mailto, www, ftp, man page, include file */
out_length+=strlen(c);
@@ -161,7 +161,7 @@
c=f+5;
}
break;
- case 4: /* manpage? */
+ case 4: /* man page? */
f=idtest[j];
/* find section - accept (1), (3F), (3Xt), (n), (l) */
g=strchr(f,')');
@@ -202,7 +202,7 @@
*f='(';
idtest[4]=f-1;
c=f;
- break; /* manpage */
+ break; /* man page */
case 3: /* ftp */
case 2: /* www */
g=f=idtest[j];
@@ -1848,9 +1848,9 @@
if (!t) t=fname;
fprintf(stderr, "ln -s %s.html %s.html\n", h, t);
s=strrchr(t, '.');if (!s) s=t;
- printf("<HTML><HEAD><TITLE> Manpage of %s</TITLE>\n"
+ printf("<HTML><HEAD><TITLE> Man page of %s</TITLE>\n"
"</HEAD><BODY>\n"
- "See the manpage for <A HREF=\"%s.html\">%s</A>.\n"
+ "See the man page for <A HREF=\"%s.html\">%s</A>.\n"
"</BODY></HTML>\n",
s, h, h);
} else
@@ -1923,7 +1923,7 @@
out_html(NEWLINE);
if (fillout) curpos++; else curpos=0;
break;
- case V('O','P'): /* groff manpages use this construction */
+ case V('O','P'): /* groff man pages use this construction */
/* .OP a b : [ <B>a</B> <I>b</I> ] */
mode=1;
c[0]='B'; c[1]='I';
@@ -2102,7 +2102,7 @@
*sl = 0;
if (words > 1) {
output_possible=1;
- out_html("<HTML><HEAD><TITLE>Manpage of ");
+ out_html("<HTML><HEAD><TITLE>Man page of ");
out_html(wordlist[0]);
out_html("</TITLE>\n</HEAD><BODY>\n<H1>");
out_html(wordlist[0]);
@@ -3222,14 +3222,14 @@
if (!filename)
filename = fname;
if (*filename == '/')
- error_page("Invalid Manpage",
+ error_page("Invalid Man Page",
"The requested file %s is not a valid (unformatted) "
- "man page.\nIf the file is a formatted manpage, "
+ "man page.\nIf the file is a formatted man page, "
"you could try to load the\n"
"<A HREF=\"file://localhost%s\">plain file</A>.\n",
filename, filename);
else
- error_page("Invalid Manpage",
+ error_page("Invalid Man Page",
"The requested file %s is not a valid (unformatted) "
"man page.", filename);
}
diff -ruN -x config.guess -x config.sub man-1.6e-old/man2html/README man-1.6e/man2html/README
--- man-1.6e-old/man2html/README 2006-04-24 07:03:31.000000000 +0200
+++ man-1.6e/man2html/README 2007-01-31 01:28:57.000000000 +0100
@@ -40,8 +40,8 @@
Structure of the collection of scripts:
man2html is the main script.
It uses man.aux when called without arguments.
- It uses manwhatis when asked for an index of manpages+descriptions.
- It uses mansec when asked for a compact index of manpages.
+ It uses manwhatis when asked for an index of man pages+descriptions.
+ It uses mansec when asked for a compact index of man pages.
It uses mansearch when asked for a glimpse search.
In its turn mansearch uses mansearch.aux when called
without arguments. It uses mansearchhelp (which uses
diff -ruN -x config.guess -x config.sub man-1.6e-old/man2html/TODO man-1.6e/man2html/TODO
--- man-1.6e-old/man2html/TODO 2005-08-21 01:26:06.000000000 +0200
+++ man-1.6e/man2html/TODO 2007-01-31 01:28:57.000000000 +0100
@@ -21,7 +21,7 @@
</a>
but this requires parsing of the surrounding html markup.
Easy, but not done yet.
-- Some manpages generate bad whatis information
+- Some man pages generate bad whatis information
[where the name in the whatis line is not the filename of the man page].
(E.g., tc589_cs.4, auto.master.5, pcmcia.5, proc.5 and autofs.8
generate whatis lines
@@ -32,7 +32,7 @@
/proc (5) - process information pseudo-filesystem
)
As a consequence, the corresponding manwhatis links are bad.
-- Some manpages have bad .so information.
+- Some man pages have bad .so information.
(E.g., TIFFScanlineSize.3t contains .so TIFFsize.3t
instead of .so man3/TIFFsize.3t .)
This also confuses whatis, and generates bad links.
|
