diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2007-09-26 07:39:49 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gnu.org> | 2008-01-09 16:12:29 +0100 |
| commit | 34b083cdc5bc29fe2e0feae6e5d31101662d437a (patch) | |
| tree | 5ca1b6d5fce402d1aff633c5a9013c37eaa75e3d /doc | |
| parent | 95792f701c5797ae07f5784f1b5cc989355be7ff (diff) | |
| download | sed-34b083cdc5bc29fe2e0feae6e5d31101662d437a.tar.gz | |
document q/Q in sed man page, improve html doc generation
2007-10-25 Paolo Bonzini <bonzini@gnu.org>
Mike Frysinger <vapier@gentoo.org>
* doc/sed.x (q, Q): Document argument.
* configure.ac: Remove texi2html checks.
* doc/Makefile.am: Remove rules for sed.html, always distribute it.
git-archimport-id: bonzini@gnu.org--2004b/sed--stable--4.1--patch-97
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 32 | ||||
| -rw-r--r-- | doc/sed.1 | 14 | ||||
| -rw-r--r-- | doc/sed.x | 12 |
3 files changed, 16 insertions, 42 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index b3e2d50..629188f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,11 +4,13 @@ sed_TEXINFOS = config.texi version.texi dist_man_MANS = sed.1 dist_noinst_DATA = sed.x sed-in.texi dist_noinst_SCRIPTS = groupify.sed -CLEANFILES = sed.html +dist_doc_DATA = sed.html TEXI2DVI = $(top_srcdir)/build-aux/texi2dvi --expand HELP2MAN = $(top_srcdir)/build-aux/help2man SED = $(top_builddir)/sed/sed +AM_MAKEINFOHTMLFLAGS = --no-split + # To produce better quality output, in the example sed # scripts we group comments with lines following them; # since mantaining the "@group...@end group" manually @@ -23,31 +25,3 @@ sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x dist-hook: touch $(distdir)/sed.1 - -# This rule is used if --enable-html is passed -if BUILD_HTML -doc_DATA = sed.html - -all: html - -html: sed.html - -.PHONY: html -endif - -# Having a dependancy on sed.info automatically makes -# sed.html dependant on sed.texi and all the included -# sources -if MAKEINFO_HTML -sed.html: sed.texi sed.info - builddir=`pwd` && cd $(srcdir) && \ - $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi -endif - -# These rules are used together with TEXI2HTML -if TEXI2HTML_HTML -sed.html: sed.texi sed.info - cp $(srcdir)/*.texi . && \ - $(TEXI2HTML) sed.texi && \ - rm *.texi -endif @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. -.TH SED "1" "July 2007" "sed version 4.1d" "User Commands" +.TH SED "1" "September 2007" "sed version 4.1d" "User Commands" .SH NAME sed \- stream editor for filtering and transforming text .SH SYNOPSIS @@ -117,15 +117,15 @@ Insert .IR text , which has each embedded newline preceded by a backslash. .TP -q +q [\fIexit-code\fR] Immediately quit the \*(sd script without processing -any more input, -except that if auto-print is not disabled -the current pattern space will be printed. +any more input, except that if auto-print is not disabled +the current pattern space will be printed. The exit code +argument is a GNU extension. .TP -Q +Q [\fIexit-code\fR] Immediately quit the \*(sd script without processing -any more input. +any more input. This is a GNU extension. .TP .RI r\ filename Append text read from @@ -67,15 +67,15 @@ Insert .IR text , which has each embedded newline preceded by a backslash. .TP -q +q [\fIexit-code\fR] Immediately quit the \*(sd script without processing -any more input, -except that if auto-print is not disabled -the current pattern space will be printed. +any more input, except that if auto-print is not disabled +the current pattern space will be printed. The exit code +argument is a GNU extension. .TP -Q +Q [\fIexit-code\fR] Immediately quit the \*(sd script without processing -any more input. +any more input. This is a GNU extension. .TP .RI r\ filename Append text read from |