From abdeac2a140b9a6a13602734e6da1041765fe710 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 6 Dec 2011 15:12:48 +0000 Subject: 2011-12-06 Joel Sherrill PR 1793/doc * .cvsignore, Makefile.am, README, configure.ac, index.html.in, main.am, project.am, ada_user/.cvsignore, ada_user/ada_user.texi, ada_user/example.texi, bsp_howto/.cvsignore, bsp_howto/bsp_howto.texi, cpu_supplement/.cvsignore, cpu_supplement/cpu_supplement.texi, cpu_supplement/preface.texi, develenv/.cvsignore, develenv/develenv.texi, develenv/intro.texi, filesystem/.cvsignore, filesystem/filesystem.texi, filesystem/preface.texi, networking/.cvsignore, networking/networking.texi, networking/preface.texi, porting/.cvsignore, porting/porting.texi, porting/preface.texi, posix1003.1/.cvsignore, posix1003.1/posix1003_1.texi, posix_users/.cvsignore, posix_users/posix_users.texi, posix_users/preface.texi, shell/.cvsignore, shell/preface.texi, shell/shell.texi, started/.cvsignore, started/started.texi, user/.cvsignore, user/c_user.texi, user/dirstat.texi, user/example.texi, user/glossary.texi, user/preface.texi: Convert from texi2www to texi2html. * texi2html_init.in: New file. * rtems_footer.html.in, rtems_header.html.in: Removed. --- doc/.cvsignore | 4 +--- doc/ChangeLog | 23 +++++++++++++++++++++++ doc/Makefile.am | 2 +- doc/README | 16 ++++++---------- doc/ada_user/.cvsignore | 2 -- doc/ada_user/ada_user.texi | 13 ++----------- doc/ada_user/example.texi | 4 +--- doc/bsp_howto/.cvsignore | 3 +-- doc/bsp_howto/bsp_howto.texi | 13 ++----------- doc/configure.ac | 5 +++-- doc/cpu_supplement/.cvsignore | 2 -- doc/cpu_supplement/cpu_supplement.texi | 13 ++----------- doc/cpu_supplement/preface.texi | 4 +--- doc/develenv/.cvsignore | 2 -- doc/develenv/develenv.texi | 13 ++----------- doc/develenv/intro.texi | 4 +--- doc/filesystem/.cvsignore | 2 -- doc/filesystem/filesystem.texi | 13 ++----------- doc/filesystem/preface.texi | 4 +--- doc/index.html.in | 30 +++++++++++++++--------------- doc/main.am | 10 ++++------ doc/networking/.cvsignore | 2 -- doc/networking/networking.texi | 13 ++----------- doc/networking/preface.texi | 4 +--- doc/porting/.cvsignore | 2 -- doc/porting/porting.texi | 13 ++----------- doc/porting/preface.texi | 4 +--- doc/posix1003.1/.cvsignore | 2 -- doc/posix1003.1/posix1003_1.texi | 11 ++--------- doc/posix_users/.cvsignore | 2 -- doc/posix_users/posix_users.texi | 13 ++----------- doc/posix_users/preface.texi | 4 +--- doc/project.am | 23 +++++++---------------- doc/rtems_footer.html.in | 1 - doc/rtems_header.html.in | 5 ----- doc/shell/.cvsignore | 2 -- doc/shell/preface.texi | 6 ++---- doc/shell/shell.texi | 13 ++----------- doc/started/.cvsignore | 2 -- doc/started/started.texi | 10 ++-------- doc/texi2html_init.in | 19 +++++++++++++++++++ doc/user/.cvsignore | 2 -- doc/user/c_user.texi | 17 ++++------------- doc/user/dirstat.texi | 4 +--- doc/user/example.texi | 4 +--- doc/user/glossary.texi | 4 +--- doc/user/preface.texi | 4 +--- 47 files changed, 119 insertions(+), 249 deletions(-) delete mode 100644 doc/rtems_footer.html.in delete mode 100644 doc/rtems_header.html.in create mode 100644 doc/texi2html_init.in diff --git a/doc/.cvsignore b/doc/.cvsignore index 46bb161a00..a710775eef 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -10,7 +10,5 @@ Makefile.in mdate-sh missing mkinstalldirs -rtems_footer.html -rtems_header.html -rtems_support.html +texi2html_init texinfo.tex diff --git a/doc/ChangeLog b/doc/ChangeLog index 2f3aa84fbf..cf787d30c8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,26 @@ +2011-12-06 Joel Sherrill + + PR 1793/doc + * .cvsignore, Makefile.am, README, configure.ac, index.html.in, + main.am, project.am, ada_user/.cvsignore, ada_user/ada_user.texi, + ada_user/example.texi, bsp_howto/.cvsignore, + bsp_howto/bsp_howto.texi, cpu_supplement/.cvsignore, + cpu_supplement/cpu_supplement.texi, cpu_supplement/preface.texi, + develenv/.cvsignore, develenv/develenv.texi, develenv/intro.texi, + filesystem/.cvsignore, filesystem/filesystem.texi, + filesystem/preface.texi, networking/.cvsignore, + networking/networking.texi, networking/preface.texi, + porting/.cvsignore, porting/porting.texi, porting/preface.texi, + posix1003.1/.cvsignore, posix1003.1/posix1003_1.texi, + posix_users/.cvsignore, posix_users/posix_users.texi, + posix_users/preface.texi, shell/.cvsignore, shell/preface.texi, + shell/shell.texi, started/.cvsignore, started/started.texi, + user/.cvsignore, user/c_user.texi, user/dirstat.texi, + user/example.texi, user/glossary.texi, user/preface.texi: Convert + from texi2www to texi2html. + * texi2html_init.in: New file. + * rtems_footer.html.in, rtems_header.html.in: Removed. + 2011-12-05 Joel Sherrill * ada_user/version.texi, bsp_howto/version.texi, diff --git a/doc/Makefile.am b/doc/Makefile.am index 0b09a7cd96..65155ce4c3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -15,7 +15,7 @@ if USE_HTML html_DATA = index.html HELP.html endif -EXTRA_DIST = HELP.html rtems_header.html.in rtems_footer.html.in +EXTRA_DIST = HELP.html EXTRA_DIST += common/cpright.texi common/setup.texi \ common/treedef.tex common/rtems.texi.in diff --git a/doc/README b/doc/README index 8cd557e9ce..02fff1fe71 100644 --- a/doc/README +++ b/doc/README @@ -7,8 +7,12 @@ Tools Required The following tools are used in the production of this documentation: TeX -texinfo 4.0 -texi2www-960103 (included in tree) +texi2html 1.82 +texinfo-tex 4.13a + +texi2html will be deprecated in the upcomine texinfo release. At that point, +we will need to provide support for texi2any.pl as an alternative means to +produce html output. This was used by the authors to generate the directory tree figure in the texinfo printed version: @@ -29,9 +33,6 @@ Making the Documentation cd rtems-XXX/doc ../bootstrap ./configure --enable-maintainer-mode -cd tools ; make -cd .. -make info make all make install @@ -49,8 +50,3 @@ This generates a rtems-.tar.gz in the toplevel directory. Making a Preformatted Distribution ================================== Install and tar it up. :) - -Common Problems -=============== - -TeX pool_size too small. diff --git a/doc/ada_user/.cvsignore b/doc/ada_user/.cvsignore index e88e97a929..1cd7ad97d8 100644 --- a/doc/ada_user/.cvsignore +++ b/doc/ada_user/.cvsignore @@ -26,8 +26,6 @@ Makefile.in mdate-sh ObjectId-16Bits.pdf ObjectId-32Bits.pdf -rtems_footer.html -rtems_header.html rtemspie.pdf semaphore_attributes.pdf states.pdf diff --git a/doc/ada_user/ada_user.texi b/doc/ada_user/ada_user.texi index 0e73505caa..279f219922 100644 --- a/doc/ada_user/ada_user.texi +++ b/doc/ada_user/ada_user.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2008. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -115,11 +115,8 @@ @include user/dirstat.texi @include example.texi @include user/glossary.texi -@ifinfo @node Top, List of Figures, (dir), (dir) -@top ada_user - -This is the online version of the RTEMS Ada User's Guide. +@top RTEMS Applications Ada User's Guide @menu * List of Figures:: @@ -159,12 +156,6 @@ This is the online version of the RTEMS Ada User's Guide. * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, Glossary, Top @unnumbered Command and Variable Index diff --git a/doc/ada_user/example.texi b/doc/ada_user/example.texi index 39f807f238..4a06684c5d 100644 --- a/doc/ada_user/example.texi +++ b/doc/ada_user/example.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Example Application, Glossary, Directive Status Codes, Top -@end ifinfo @chapter Example Application @example diff --git a/doc/bsp_howto/.cvsignore b/doc/bsp_howto/.cvsignore index 2f14229c82..fb8ef2e6cb 100644 --- a/doc/bsp_howto/.cvsignore +++ b/doc/bsp_howto/.cvsignore @@ -8,6 +8,7 @@ bsp_howto.aux bsp_howto.cp bsp_howto.dvi bsp_howto.fn +bsp_howto.fns bsp_howto*.html bsp_howto.info bsp_howto.ky @@ -35,8 +36,6 @@ network.t network.texi nvmem.texi rtc.texi -rtems_footer.html -rtems_header.html shmsupp.texi support.texi target.texi diff --git a/doc/bsp_howto/bsp_howto.texi b/doc/bsp_howto/bsp_howto.texi index ba82203984..4939da6111 100644 --- a/doc/bsp_howto/bsp_howto.texi +++ b/doc/bsp_howto/bsp_howto.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2009. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -78,11 +78,8 @@ @include analog.texi @include discrete.texi -@ifinfo @node Top, Introduction, (dir), (dir) -@top bsp_howto - -This is the online version of the RTEMS BSP and Device Driver Development Guide. +@top RTEMS BSP and Device Driver Development Guide @menu * Introduction:: @@ -108,12 +105,6 @@ This is the online version of the RTEMS BSP and Device Driver Development Guide. * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, , Top @unnumbered Command and Variable Index diff --git a/doc/configure.ac b/doc/configure.ac index c73f7ee453..2d7b1e0534 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -75,8 +75,8 @@ AC_PROG_LN_S AC_CHECK_PROGS(PERL,perl) -TEXI2WWW='$(PERL) $(top_srcdir)/tools/texi2www/texi2www' -AC_SUBST(TEXI2WWW) +AC_CHECK_PROGS(TEXI2HTML,texi2html) +AC_SUBST(TEXI2HTML) AC_CHECK_PROGS(GS,gs) AM_CONDITIONAL(GS,test x"$GS" != x"") @@ -168,5 +168,6 @@ relnotes/Makefile new_chapters/Makefile cpu_supplement/Makefile shell/Makefile +texi2html_init ]) AC_OUTPUT diff --git a/doc/cpu_supplement/.cvsignore b/doc/cpu_supplement/.cvsignore index 013c96ef0a..3de37352e4 100644 --- a/doc/cpu_supplement/.cvsignore +++ b/doc/cpu_supplement/.cvsignore @@ -32,8 +32,6 @@ Makefile.in mdate-sh mips.texi powerpc.texi -rtems_footer.html -rtems_header.html rtemspie.pdf sh.texi sparc.texi diff --git a/doc/cpu_supplement/cpu_supplement.texi b/doc/cpu_supplement/cpu_supplement.texi index df5924c17b..62609ca351 100644 --- a/doc/cpu_supplement/cpu_supplement.texi +++ b/doc/cpu_supplement/cpu_supplement.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2009. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -71,11 +71,8 @@ @include sh.texi @include sparc.texi @include sparc64.texi -@ifinfo @node Top, Preface, (dir), (dir) -@top cpu_supplement - -This is the online version of the RTEMS CPU Architecture Supplement. +@top RTEMS CPU Architecture Supplement @menu * Preface:: @@ -95,12 +92,6 @@ This is the online version of the RTEMS CPU Architecture Supplement. * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, , Top @unnumbered Command and Variable Index diff --git a/doc/cpu_supplement/preface.texi b/doc/cpu_supplement/preface.texi index 7d3fc5e736..8163df525e 100644 --- a/doc/cpu_supplement/preface.texi +++ b/doc/cpu_supplement/preface.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2006. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Preface, Port Specific Information, Top, Top -@end ifinfo @unnumbered Preface The Real Time Executive for Multiprocessor Systems diff --git a/doc/develenv/.cvsignore b/doc/develenv/.cvsignore index 726d322b23..d3a40708fb 100644 --- a/doc/develenv/.cvsignore +++ b/doc/develenv/.cvsignore @@ -18,7 +18,5 @@ index.html Makefile Makefile.in mdate-sh -rtems_footer.html -rtems_header.html sample.texi utils.texi diff --git a/doc/develenv/develenv.texi b/doc/develenv/develenv.texi index 2e43fa9fa3..c153ad7fb5 100644 --- a/doc/develenv/develenv.texi +++ b/doc/develenv/develenv.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1989-2007. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -77,11 +77,8 @@ @include sample.texi @include utils.texi -@ifinfo @node Top, Introduction, (dir), (dir) -@top develenv - -This is the online version of the RTEMS Development Environment Guide. +@top RTEMS Development Environment Guide @menu * Introduction:: @@ -92,12 +89,6 @@ This is the online version of the RTEMS Development Environment Guide. * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, RTEMS Specific Utilities unhex - Convert Hexadecimal File into Binary Equivalent, Top @unnumbered Command and Variable Index diff --git a/doc/develenv/intro.texi b/doc/develenv/intro.texi index de6554ce6e..04bbd128f8 100644 --- a/doc/develenv/intro.texi +++ b/doc/develenv/intro.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1989-2007. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Introduction, Directory Structure, Top, Top -@end ifinfo @chapter Introduction This document describes the RTEMS development diff --git a/doc/filesystem/.cvsignore b/doc/filesystem/.cvsignore index 9d07905b65..2e749b09ee 100644 --- a/doc/filesystem/.cvsignore +++ b/doc/filesystem/.cvsignore @@ -25,7 +25,5 @@ mdate-sh miniimfs.texi mounting.texi patheval.texi -rtems_footer.html -rtems_header.html syscalls.texi tftp.texi diff --git a/doc/filesystem/filesystem.texi b/doc/filesystem/filesystem.texi index e593b5ef5f..178d1f7b02 100644 --- a/doc/filesystem/filesystem.texi +++ b/doc/filesystem/filesystem.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -67,11 +67,8 @@ @include imfs.texi @include miniimfs.texi @include tftp.texi -@ifinfo @node Top, Preface, (dir), (dir) -@top filesystem - -This is the online version of the RTEMS Filesystem Design Guide. +@top RTEMS Filesystem Design Guide @menu * Preface:: @@ -87,12 +84,6 @@ This is the online version of the RTEMS Filesystem Design Guide. * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, , Top @unnumbered Command and Variable Index diff --git a/doc/filesystem/preface.texi b/doc/filesystem/preface.texi index 726a5b13fc..6f1ac8361c 100644 --- a/doc/filesystem/preface.texi +++ b/doc/filesystem/preface.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Preface, , Top, Top -@end ifinfo @unnumbered Preface This document describes the implementation of the RTEMS filesystem diff --git a/doc/index.html.in b/doc/index.html.in index c31f1d2e99..0eb9c71943 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -16,7 +16,7 @@ - + Getting Started with RTEMS @@ -26,7 +26,7 @@ - + RTEMS Applications C User's Guide @@ -36,7 +36,7 @@ - + RTEMS POSIX API User's Guide @@ -46,8 +46,8 @@ - - RTEMS Network Supplement + + RTEMS TCP/IP Networking Supplement
  • @@ -56,8 +56,8 @@ - - RTEMS Shell + + RTEMS Shell User's Guide
  • Ada Manuals
    • @@ -68,7 +68,7 @@ - + RTEMS Applications Ada User's Guide @@ -81,7 +81,7 @@ - + RTEMS BSP and Device Driver Development Guide @@ -91,8 +91,8 @@ - - RTEMS CPU Supplement + + RTEMS CPU Architecture Supplement
  • @@ -101,7 +101,7 @@ - + RTEMS Development Environment Guide
    • @@ -111,7 +111,7 @@ - + RTEMS Porting Guide @@ -121,7 +121,7 @@ - + RTEMS POSIX 1003.1 Compliance Guide @@ -131,7 +131,7 @@ - + RTEMS Filesystem Design Guide diff --git a/doc/main.am b/doc/main.am index bbd0bd3103..3df1dd66ed 100644 --- a/doc/main.am +++ b/doc/main.am @@ -2,9 +2,7 @@ if USE_HTML html_projectdir = $(htmldir)/$(PROJECT) endif -TEXI2WWW_ARGS=\ --I $(srcdir) -I $(top_srcdir) -I $(top_builddir) \ --dirfile ../index.html \ --header rtems_header.html \ --footer rtems_footer.html \ --icons ../images +TEXI2HTML_ARGS=\ +-D use-html --split node \ +--init-file=$(top_builddir)/texi2html_init \ +-I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . diff --git a/doc/networking/.cvsignore b/doc/networking/.cvsignore index 39930ef442..bf9e9617bb 100644 --- a/doc/networking/.cvsignore +++ b/doc/networking/.cvsignore @@ -24,7 +24,5 @@ networking.vr networktasks.texi PCIreg.pdf recvbd.pdf -rtems_footer.html -rtems_header.html servers.texi testing.texi diff --git a/doc/networking/networking.texi b/doc/networking/networking.texi index ef1fea3825..7543f56644 100644 --- a/doc/networking/networking.texi +++ b/doc/networking/networking.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -65,11 +65,8 @@ @include testing.texi @include servers.texi @include decdriver.texi -@ifinfo @node Top, Preface, (dir), (dir) -@top networking - -This is the online version of the RTEMS Network Supplement. +@top RTEMS TCP/IP Networking Supplement @menu * Preface:: @@ -83,12 +80,6 @@ This is the online version of the RTEMS Network Supplement. * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, List of Ethernet cards using the DEC chip, Top @unnumbered Command and Variable Index diff --git a/doc/networking/preface.texi b/doc/networking/preface.texi index bd10af6671..e94248f4ab 100644 --- a/doc/networking/preface.texi +++ b/doc/networking/preface.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Preface, Network Task Structure and Data Flow, Top, Top -@end ifinfo @unnumbered Preface This document describes the RTEMS specific parts of the FreeBSD TCP/IP diff --git a/doc/porting/.cvsignore b/doc/porting/.cvsignore index 6d16a53955..dcc8aa4424 100644 --- a/doc/porting/.cvsignore +++ b/doc/porting/.cvsignore @@ -27,7 +27,5 @@ porting.toc porting.tp porting.vr prioritybitmap.texi -rtems_footer.html -rtems_header.html sourcecode.texi taskcontext.texi diff --git a/doc/porting/porting.texi b/doc/porting/porting.texi index 5eed55d3fb..0bb3c44dd4 100644 --- a/doc/porting/porting.texi +++ b/doc/porting/porting.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -94,11 +94,8 @@ @include prioritybitmap.texi @include codetuning.texi @include miscellaneous.texi -@ifinfo @node Top, Preface, (dir), (dir) -@top porting - -This is the online version of the RTEMS Porting Guide. +@top RTEMS Porting Guide @menu * Preface:: @@ -116,12 +113,6 @@ This is the online version of the RTEMS Porting Guide. * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, Miscellaneous Endian Swap Unsigned Integers, Top @unnumbered Command and Variable Index diff --git a/doc/porting/preface.texi b/doc/porting/preface.texi index 19304f0f11..92a58e136e 100644 --- a/doc/porting/preface.texi +++ b/doc/porting/preface.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Preface, Development Tools, Top, Top -@end ifinfo @unnumbered Preface The purpose of this manual is to provide a roadmap to those people porting diff --git a/doc/posix1003.1/.cvsignore b/doc/posix1003.1/.cvsignore index 22f987c0ed..b48cc2fcad 100644 --- a/doc/posix1003.1/.cvsignore +++ b/doc/posix1003.1/.cvsignore @@ -39,5 +39,3 @@ posix1003_1.ps posix1003_1.toc posix1003_1.tp posix1003_1.vr -rtems_footer.html -rtems_header.html diff --git a/doc/posix1003.1/posix1003_1.texi b/doc/posix1003.1/posix1003_1.texi index 559d3977fa..ab5dc7fa9a 100644 --- a/doc/posix1003.1/posix1003_1.texi +++ b/doc/posix1003.1/posix1003_1.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -81,9 +81,7 @@ @ifnottex @node Top, Preface, (dir), (dir) -@top posix1003_1 - -This is the online version of the RTEMS POSIX 1003.1 Compliance Guide. +@top RTEMS POSIX 1003.1 Compliance Guide @menu * Preface:: @@ -109,12 +107,7 @@ This is the online version of the RTEMS POSIX 1003.1 Compliance Guide. * Command and Variable Index:: * Concept Index:: @end menu - @end ifnottex -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c @node Command and Variable Index, Concept Index, Overall Summary, Top @unnumbered Command and Variable Index diff --git a/doc/posix_users/.cvsignore b/doc/posix_users/.cvsignore index 8218336a42..a509c1a860 100644 --- a/doc/posix_users/.cvsignore +++ b/doc/posix_users/.cvsignore @@ -38,8 +38,6 @@ posix_users.tp posix_users.vr procenv.texi process.texi -rtems_footer.html -rtems_header.html sched.texi semaphores.texi signal.texi diff --git a/doc/posix_users/posix_users.texi b/doc/posix_users/posix_users.texi index 442b12e6ec..15575f81f0 100644 --- a/doc/posix_users/posix_users.texi +++ b/doc/posix_users/posix_users.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -104,11 +104,8 @@ @include libc.texi @include libm.texi @include status.texi -@ifinfo @node Top, Preface, (dir), (dir) -@top posix_users - -This is the online version of the RTEMS POSIX API User's Guide +@top RTEMS POSIX API User's Guide @menu * Preface:: @@ -138,12 +135,6 @@ This is the online version of the RTEMS POSIX API User's Guide * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, , Top @unnumbered Command and Variable Index diff --git a/doc/posix_users/preface.texi b/doc/posix_users/preface.texi index 4c20fd2a2a..10ccf91bdf 100644 --- a/doc/posix_users/preface.texi +++ b/doc/posix_users/preface.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Preface, , Top, Top -@end ifinfo @unnumbered Preface This is the User's Guide for the POSIX API support diff --git a/doc/project.am b/doc/project.am index 0ec41a28f5..0c9d50c8c2 100644 --- a/doc/project.am +++ b/doc/project.am @@ -42,25 +42,16 @@ MOSTLYCLEANFILES += $(PDF_IMAGES) ## HTML SUFFIXES += .html -rtems_header.html: $(top_srcdir)/rtems_header.html.in version.texi - @sed -e s%\.\./images/%$(top_builddir)/images/%g \ - -e s%\@VERSION\@%@VERSION@%g \ - < $< > $@ -rtems_footer.html: $(top_srcdir)/rtems_footer.html.in version.texi - @sed -e s%\.\./images/%$(top_builddir)/%g \ - -e s%\@VERSION\@%@VERSION@%g \ - < $< > $@ - -index.html $(PROJECT)*.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS) \ - rtems_header.html rtems_footer.html - $(TEXI2WWW) $(TEXI2WWW_ARGS) -base $(PROJECT) $< - -MOSTLYCLEANFILES += index.html $(PROJECT)*.html rtems_header.html \ - rtems_footer.html +$(PROJECT)*.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS) + rm -rf $(PROJECT).html + $(TEXI2HTML) $(TEXI2HTML_ARGS) --menu $< $< + -rm -rf $(PROJECT) + +MOSTLYCLEANFILES += index.html $(PROJECT)*.html ## Common installation points if USE_HTML -html_project_DATA = index.html $(PROJECT)*.html +html_project_DATA = $(PROJECT)*.html endif if USE_DVI diff --git a/doc/rtems_footer.html.in b/doc/rtems_footer.html.in deleted file mode 100644 index 266417b397..0000000000 --- a/doc/rtems_footer.html.in +++ /dev/null @@ -1 +0,0 @@ -

    Copyright © 1988-2011 OAR Corporation diff --git a/doc/rtems_header.html.in b/doc/rtems_header.html.in deleted file mode 100644 index e3230eac83..0000000000 --- a/doc/rtems_header.html.in +++ /dev/null @@ -1,5 +0,0 @@ - - - RTEMS Logo -

    RTEMS @VERSION@ On-Line Library

    -
    diff --git a/doc/shell/.cvsignore b/doc/shell/.cvsignore index e827703c89..d6bd76b89e 100644 --- a/doc/shell/.cvsignore +++ b/doc/shell/.cvsignore @@ -30,5 +30,3 @@ shell.vr Makefile Makefile.in mdate-sh -rtems_footer.html -rtems_header.html diff --git a/doc/shell/preface.texi b/doc/shell/preface.texi index 85587753c5..d4d10b5624 100644 --- a/doc/shell/preface.texi +++ b/doc/shell/preface.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2008. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Preface, Configuration and Initialization, Top, Top -@end ifinfo @unnumbered Preface Real-time embedded systems vary widely based upon their @@ -27,7 +25,7 @@ example which hints at some of the capabilities available: @smallexample Welcome to rtems-4.10.99.0(SPARC/w/FPU/sis) -COPYRIGHT (c) 1989-2008. +COPYRIGHT (c) 1989-2011. On-Line Applications Research Corporation (OAR). Login into RTEMS diff --git a/doc/shell/shell.texi b/doc/shell/shell.texi index 085283c7e8..30800bc5e0 100644 --- a/doc/shell/shell.texi +++ b/doc/shell/shell.texi @@ -7,7 +7,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2008. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -72,11 +72,8 @@ @include memory.texi @include rtems.texi @include network.texi -@ifinfo @node Top, Preface, (dir), (dir) -@top shell - -This is the online version of the RTEMS Shell User's Guide. +@top RTEMS Shell User's Guide @menu * Preface:: @@ -91,12 +88,6 @@ This is the online version of the RTEMS Shell User's Guide. * Command Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Function and Variable Index, Concept Index, Network Commands route - show or manipulate the ip routing table, Top @unnumbered Function and Variable Index @printindex fn diff --git a/doc/started/.cvsignore b/doc/started/.cvsignore index 9a3b301daa..833dc61967 100644 --- a/doc/started/.cvsignore +++ b/doc/started/.cvsignore @@ -10,8 +10,6 @@ mdate-sh nextstep.texi nt.texi require.texi -rtems_footer.html -rtems_header.html sample.texi started started-? diff --git a/doc/started/started.texi b/doc/started/started.texi index 747649a32c..62336ae72f 100644 --- a/doc/started/started.texi +++ b/doc/started/started.texi @@ -8,7 +8,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2010. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -67,9 +67,8 @@ @include nextstep.texi @include nt.texi -@ifinfo @node Top, Introduction, (dir), (dir) -@top started +@top Getting Started With RTEMS This is the online version of the Getting Started with RTEMS. @@ -86,11 +85,6 @@ This is the online version of the Getting Started with RTEMS. @c * Command and Variable Index:: @c * Concept Index:: -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c @c @node Command and Variable Index, Concept Index, Installing GCC AND NEWLIB, Top @c @unnumbered Command and Variable Index diff --git a/doc/texi2html_init.in b/doc/texi2html_init.in new file mode 100644 index 0000000000..01b5453ba8 --- /dev/null +++ b/doc/texi2html_init.in @@ -0,0 +1,19 @@ +my $button_text = 'Library'; +push @SECTION_BUTTONS, \$button_text; +push @CHAPTER_BUTTONS, \$button_text; +push @MISC_BUTTONS, \$button_text; +push @TOP_BUTTONS, \$button_text; + +$AFTER_BODY_OPEN = +' +RTEMS +Logo +

    RTEMS @VERSION@ On-Line Library

    +'; + +$PRE_BODY_CLOSE = +'Copyright © 1988-2011 +OAR Corporation +'; + +1; diff --git a/doc/user/.cvsignore b/doc/user/.cvsignore index 38430b89d6..0c55e682ac 100644 --- a/doc/user/.cvsignore +++ b/doc/user/.cvsignore @@ -45,8 +45,6 @@ ObjectId-32Bits.pdf overview.texi part.texi region.texi -rtems_footer.html -rtems_header.html rtemspie.pdf rtmon.texi schedule.texi diff --git a/doc/user/c_user.texi b/doc/user/c_user.texi index 87d5ea6017..b1bc087406 100644 --- a/doc/user/c_user.texi +++ b/doc/user/c_user.texi @@ -7,7 +7,7 @@ @c %**end of header @c -@c COPYRIGHT (c) 1988-2011. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @@ -31,14 +31,14 @@ @ifset use-ascii @dircategory RTEMS On-Line Manual @direntry -* RTEMS C User: (c_user). The C User's Guide. +* RTEMS C User: (C Users Guide). The C User's Guide. @end direntry @end ifset @c @syncodeindex fn cp @c variable substitution info: @c -@set is-C +@set is-C 1 @clear is-Ada @set LANGUAGE C @set STRUCTURE structure @@ -114,11 +114,8 @@ @include dirstat.texi @include example.texi @include glossary.texi -@ifinfo @node Top, List of Figures, (dir), (dir) -@top c_user - -This is the online version of the RTEMS C User's Guide. +@top RTEMS Applications C User's Guide @menu * List of Figures:: @@ -158,12 +155,6 @@ This is the online version of the RTEMS C User's Guide. * Concept Index:: @end menu -@end ifinfo -@c -@c -@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here -@c - @node Command and Variable Index, Concept Index, Glossary, Top @unnumbered Command and Variable Index diff --git a/doc/user/dirstat.texi b/doc/user/dirstat.texi index 727bc8d355..25c4ece1f2 100644 --- a/doc/user/dirstat.texi +++ b/doc/user/dirstat.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2006. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Directive Status Codes, Example Application, Chains Prepend a Node, Top -@end ifinfo @chapter Directive Status Codes @table @b @item @code{@value{RPREFIX}SUCCESSFUL} - successful completion diff --git a/doc/user/example.texi b/doc/user/example.texi index 40870e2390..4d18eff33e 100644 --- a/doc/user/example.texi +++ b/doc/user/example.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Example Application, Glossary, Directive Status Codes, Top -@end ifinfo @chapter Example Application @example diff --git a/doc/user/glossary.texi b/doc/user/glossary.texi index f9e8d6f7ea..3e58312c5b 100644 --- a/doc/user/glossary.texi +++ b/doc/user/glossary.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Glossary, Command and Variable Index, Example Application, Top -@end ifinfo @chapter Glossary @table @b diff --git a/doc/user/preface.texi b/doc/user/preface.texi index 631ba80884..c58880dc95 100644 --- a/doc/user/preface.texi +++ b/doc/user/preface.texi @@ -1,14 +1,12 @@ @c -@c COPYRIGHT (c) 1988-2002. +@c COPYRIGHT (c) 1989-2011. @c On-Line Applications Research Corporation (OAR). @c All rights reserved. @c @c $Id$ @c -@ifinfo @node Preface, Overview, List of Figures, Top -@end ifinfo @unnumbered Preface In recent years, the cost required to develop a -- cgit v1.2.3