mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-26 15:37:03 +01:00
Some fixes as needed by dirmngr man pages
This commit is contained in:
parent
92550e3016
commit
2eb232778a
@ -602,7 +602,7 @@ to your shell initialization file (e.g. @file{~/.bashrc}).
|
||||
@c
|
||||
@c Assuan Protocol
|
||||
@c
|
||||
@mansect assuan
|
||||
@manpause
|
||||
@node Agent Protocol
|
||||
@section Agent's Assuan Protocol
|
||||
|
||||
@ -1051,3 +1051,13 @@ Set the startup TTY and X-DISPLAY variables to the values of this
|
||||
session. This command is useful to direct future pinentry invocations
|
||||
to another screen. It is only required because there is no way in the
|
||||
ssh-agent protocol to convey this information.
|
||||
|
||||
|
||||
@mansect see also
|
||||
@ifset isman
|
||||
@command{gpg2}(1),
|
||||
@command{gpgsm}(1),
|
||||
@command{gpg-connect-agent}(1),
|
||||
@command{scdaemon}(1)
|
||||
@end ifset
|
||||
@include see-also-note.texi
|
||||
|
@ -2572,3 +2572,10 @@ warning message about insecure memory your operating system supports
|
||||
locking without being root. The program drops root privileges as soon
|
||||
as locked memory is allocated.
|
||||
|
||||
@mansect see also
|
||||
@ifset isman
|
||||
@command{gpgv}(1),
|
||||
@command{gpgsm}(1),
|
||||
@command{gpg-agent}(1)
|
||||
@end ifset
|
||||
@include see-also-note.texi
|
||||
|
@ -773,7 +773,7 @@ this is a missing certificate.
|
||||
@c *************** ASSSUAN *****************
|
||||
@c *************** *****************
|
||||
@c *******************************************
|
||||
@mansect assuan
|
||||
@manpause
|
||||
@node GPGSM Protocol
|
||||
@section The Protocol the Server Mode Uses.
|
||||
|
||||
@ -1071,3 +1071,10 @@ this requires that the usual escape quoting rules are done.
|
||||
The certificates must be specified unambiguously otherwise an error is
|
||||
returned.
|
||||
|
||||
|
||||
@mansect see also
|
||||
@ifset isman
|
||||
@command{gpg2}(1),
|
||||
@command{gpg-agent}(1)
|
||||
@end ifset
|
||||
@include see-also-note.texi
|
||||
|
22
doc/yat2m.c
22
doc/yat2m.c
@ -41,7 +41,7 @@
|
||||
left space. Processing starts after a "manpage" macro has been
|
||||
seen. "mansect" identifies the section and yat2m make sure to
|
||||
emit the sections in the proper order. Note that @mansect skips
|
||||
the next input line if that line begins with @subsection or
|
||||
the next input line if that line begins with @section, @subsection or
|
||||
@chapheading.
|
||||
|
||||
To insert verbatim troff markup, the follwing texinfo code may be
|
||||
@ -147,13 +147,14 @@ static struct
|
||||
} thepage;
|
||||
|
||||
|
||||
/* The list of standard section names. */
|
||||
/* The list of standard section names. COMMANDS and ASSUAN are GnuPG
|
||||
specific. */
|
||||
static const char * const standard_sections[] =
|
||||
{ "NAME", "SYNOPSIS", "DESCRIPTION",
|
||||
"RETURN VALUE", "EXIT STATUS", "ERROR HANDLING", "ERRORS",
|
||||
"OPTIONS", "USAGE", "EXAMPLES", "FILES",
|
||||
"COMMANDS", "OPTIONS", "USAGE", "EXAMPLES", "FILES",
|
||||
"ENVIRONMENT", "DIAGNOSTICS", "SECURITY", "CONFORMING TO",
|
||||
"NOTES", "BUGS", "AUTHOR", "SEE ALSO", NULL };
|
||||
"ASSUAN", "NOTES", "BUGS", "AUTHOR", "SEE ALSO", NULL };
|
||||
|
||||
|
||||
/*-- Local prototypes. --*/
|
||||
@ -432,11 +433,13 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
|
||||
} cmdtbl[] = {
|
||||
{ "command", 0, "\\fB", "\\fR" },
|
||||
{ "code", 0, "\\fB", "\\fR" },
|
||||
{ "sc", 0, "\\fB", "\\fR" },
|
||||
{ "var", 0, "\\fI", "\\fR" },
|
||||
{ "samp", 0, "\n'", "'\n" },
|
||||
{ "file", 0, "`\\fI","\\fR'" },
|
||||
{ "env", 0, "`\\fI","\\fR'" },
|
||||
{ "acronym", 0 },
|
||||
{ "dfn", 0 },
|
||||
{ "option", 0, "\\fB", "\\fR" },
|
||||
{ "example", 1, ".RS 2\n.nf\n" },
|
||||
{ "smallexample", 1, ".RS 2\n.nf\n" },
|
||||
@ -456,6 +459,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
|
||||
{ "node", 1 },
|
||||
{ "noindent", 0 },
|
||||
{ "section", 1 },
|
||||
{ "chapter", 1 },
|
||||
{ "subsection", 6, "\n.SS " },
|
||||
{ "chapheading", 0},
|
||||
{ "item", 2, ".TP\n.B " },
|
||||
@ -804,12 +808,11 @@ finish_page (void)
|
||||
/* Parse one Texinfo file and create manpages according to the
|
||||
embedded instructions. */
|
||||
static void
|
||||
parse_file (const char *fname, FILE *fp, char **section_name)
|
||||
parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
|
||||
{
|
||||
char *line;
|
||||
int lnr = 0;
|
||||
int in_verbatim = 0;
|
||||
int in_pause = 0;
|
||||
int skip_to_end = 0; /* Used to skip over menu entries. */
|
||||
int skip_sect_line = 0; /* Skip after @mansect. */
|
||||
|
||||
@ -832,7 +835,8 @@ parse_file (const char *fname, FILE *fp, char **section_name)
|
||||
if (skip_sect_line)
|
||||
{
|
||||
skip_sect_line = 0;
|
||||
if (!strncmp (line, "@subsection", 11)
|
||||
if (!strncmp (line, "@section", 8)
|
||||
|| !strncmp (line, "@subsection", 11)
|
||||
|| !strncmp (line, "@chapheading", 12))
|
||||
continue;
|
||||
}
|
||||
@ -943,7 +947,7 @@ parse_file (const char *fname, FILE *fp, char **section_name)
|
||||
incname, strerror (errno));
|
||||
else
|
||||
{
|
||||
parse_file (incname, incfp, section_name);
|
||||
parse_file (incname, incfp, section_name, in_pause);
|
||||
fclose (incfp);
|
||||
}
|
||||
free (incname);
|
||||
@ -971,7 +975,7 @@ top_parse_file (const char *fname, FILE *fp)
|
||||
{
|
||||
char *section_name = NULL; /* Name of the current section or NULL
|
||||
if not in a section. */
|
||||
parse_file (fname, fp, §ion_name);
|
||||
parse_file (fname, fp, §ion_name, 0);
|
||||
free (section_name);
|
||||
finish_page ();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user