--- a/doc/conf.texi.in	Thu Mar 09 15:12:21 2006 +0000
+++ b/doc/conf.texi.in	Thu Mar 09 17:28:13 2006 +0000
@@ -2,6 +2,7 @@
 @c This is part of the Octave manual.
 @c For copying conditions, see the file gpl.texi.
 
+@set OCTAVE_MANUAL
 @set VERSION @OCTAVE_VERSION@
 @set OCTAVEHOME @OCTAVE_HOME@
 @set TARGETHOSTTYPE @OCTAVE_HOSTTYPE@

--- a/doc/liboctave/Makefile.in	Thu Mar 09 15:12:21 2006 +0000
+++ b/doc/liboctave/Makefile.in	Thu Mar 09 17:28:13 2006 +0000
@@ -46,19 +46,19 @@
 .PHONY: all
 
 liboctave.info: $(TEXINFO)
-	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
+	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $<
 
 liboctave.dvi: $(TEXINFO)
-	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
+	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
 
 liboctave.ps: liboctave.dvi
 	-dvips -o $@ $<
 
 liboctave.pdf: $(TEXINFO)
-	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $<
+	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $<
 
 HTML/index.html: $(TEXINFO)
-	-$(MAKEINFO) --html --ifinfo --output=HTML -I $(srcdir)/.. $<
+	-$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir)/.. $<
 
 check:
 .PHONY: check

--- a/src/file-io.cc	Thu Mar 09 15:12:21 2006 +0000
+++ b/src/file-io.cc	Thu Mar 09 17:28:13 2006 +0000
@@ -816,9 +816,13 @@
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} printf (@var{template}, @dots{})\n\
 Print optional arguments under the control of the template string\n\
-@var{template} to the stream @code{stdout}.\n\
+@var{template} to the stream @code{stdout} and return the number of\n\
+characters printed.\n\
+@ifclear OCTAVE_MANUAL\n\
 \n\
-Return the number of characters printed.\n\
+See the Formatted Output section of the GNU Octave manual for a\n\
+complete description of the syntax of the template string.\n\
+@end ifclear\n\
 @seealso{fprintf, sprintf, scanf}\n\
 @end deftypefn")
 {
@@ -1003,6 +1007,11 @@
 single scalar return value.  This form is more `C-like', and also\n\
 compatible with previous versions of Octave.  The number of successful\n\
 conversions is returned in @var{count}\n\
+@ifclear OCTAVE_MANUAL\n\
+\n\
+See the Formatted Input section of the GNU Octave manual for a\n\
+complete description of the syntax of the template string.\n\
+@end ifclear\n\
 @seealso{scanf, sscanf, fread, fprintf}\n\
 @end deftypefn")
 {