From ba6a9ec3b91c67894ba48e491edb409d764a2279 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 19 Sep 2003 18:06:31 +0000 Subject: 2003-09-19 Joel Sherrill * HELP.html, index.html.in, rtems_footer.html.in, rtems_header.html.in, rtems_support.html.in, ada_user/ada_user.texi: Merge from branch. * acinclude.m4, images/rtems_logo.jpg: New files. * SUPPORT, tools/texi2www/archive/texi2www-960103.tgz: Removed. --- doc/ChangeLog | 7 +++++++ doc/HELP.html | 13 ++++++------- doc/SUPPORT | 22 ---------------------- doc/acinclude.m4 | 18 ++++++++++++++++++ doc/ada_user/ada_user.texi | 1 + doc/images/rtems_logo.jpg | Bin 0 -> 14586 bytes doc/index.html.in | 6 +++--- doc/rtems_footer.html.in | 2 +- doc/rtems_header.html.in | 4 ++-- doc/rtems_support.html.in | 8 ++++---- doc/tools/texi2www/archive/texi2www-960103.tgz | Bin 131143 -> 0 bytes 11 files changed, 42 insertions(+), 39 deletions(-) delete mode 100644 doc/SUPPORT create mode 100644 doc/acinclude.m4 create mode 100644 doc/images/rtems_logo.jpg delete mode 100644 doc/tools/texi2www/archive/texi2www-960103.tgz diff --git a/doc/ChangeLog b/doc/ChangeLog index d75a7d8253..ac747a31fe 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +2003-09-19 Joel Sherrill + + * HELP.html, index.html.in, rtems_footer.html.in, rtems_header.html.in, + rtems_support.html.in, ada_user/ada_user.texi: Merge from branch. + * acinclude.m4, images/rtems_logo.jpg: New files. + * SUPPORT, tools/texi2www/archive/texi2www-960103.tgz: Removed. + 2003-08-11 Ralf Corsepius * configure.ac: Use rtems-bugs@rtems.com as bug report email address. diff --git a/doc/HELP.html b/doc/HELP.html index 0d08908051..21b193debb 100644 --- a/doc/HELP.html +++ b/doc/HELP.html @@ -1,22 +1,21 @@ RTEMS 4.0.0 On-Line Library - -

+ +

RTEMS On-Line Library

The following supplement manuals do not currently exist: -

RTEMS AMD 29K Applications Supplement

RTEMS MIPS Applications Supplement

RTEMS Hitachi SH Applications Supplement

RTEMS UNIX Port Applications Supplement

-If you have knowledge of the processors used in the above ports and -want to contribute to RTEMS, please contact -rtems@OARcorp.com +

If you have knowledge of the processors used in the above ports and +want to contribute to RTEMS, please contact a member of the +RTEMS Steering Committee.

-Copyright © 1988-2002 OAR Corporation +Copyright © 1988-2003 OAR Corporation diff --git a/doc/SUPPORT b/doc/SUPPORT deleted file mode 100644 index 083c1cb5d0..0000000000 --- a/doc/SUPPORT +++ /dev/null @@ -1,22 +0,0 @@ -# -# $Id$ -# - -On-Line Applications Research Corporation (OAR) offers support, -customization, and training for RTEMS. Custom RTEMS development services -includes porting RTEMS to new processors and the development of custom board -support packages and device drivers. In addition, OAR is available -to assist in the development of your real-time embedded application. - -For more information, email Mark Johannes at mark@OARcorp.com -or contact OAR at: - -On-Line Applications Research Corporation -4910-L Corporate Drive -Huntsville AL 35805 -Voice: (205) 722-9985 -Fax: (205 722-0985 - -RTEMS maintenance and development is funded solely by RTEMS users. -The future of RTEMS depends on its user base. - diff --git a/doc/acinclude.m4 b/doc/acinclude.m4 new file mode 100644 index 0000000000..219d8042ab --- /dev/null +++ b/doc/acinclude.m4 @@ -0,0 +1,18 @@ +## _RTEMS_UPDATE_CONDITIONAL(FINAL,TMP) +AC_DEFUN([_RTEMS_UPDATE_CONDITIONAL],[ + AS_IF([test -f $1],[ + AS_IF([cmp -s $1 $2 2>/dev/null], + [ + AC_MSG_NOTICE([$1 is unchanged]) + rm -f $$2 + ],[ + AC_MSG_NOTICE([creating $1]) + rm -f $1 + mv $2 $1 + ]) + ],[ + AC_MSG_NOTICE([creating $1]) + rm -f $1 + mv $2 $1 + ]) +]) diff --git a/doc/ada_user/ada_user.texi b/doc/ada_user/ada_user.texi index eb85f28b32..6e72c57e7a 100644 --- a/doc/ada_user/ada_user.texi +++ b/doc/ada_user/ada_user.texi @@ -27,6 +27,7 @@ @include version.texi @include common/setup.texi +@include common/rtems.texi @ifset use-ascii @dircategory RTEMS On-Line Manual diff --git a/doc/images/rtems_logo.jpg b/doc/images/rtems_logo.jpg new file mode 100644 index 0000000000..485b80bc8a Binary files /dev/null and b/doc/images/rtems_logo.jpg differ diff --git a/doc/index.html.in b/doc/index.html.in index c302490f57..29716d7fe1 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -1,8 +1,8 @@ RTEMS @VERSION@ On-Line Library - -

+ +

RTEMS @VERSION@ On-Line Library

@@ -311,5 +311,5 @@

-Copyright © 1988-2002 OAR Corporation +Copyright © 1988-2003 OAR Corporation diff --git a/doc/rtems_footer.html.in b/doc/rtems_footer.html.in index 30a69dd0f2..37ed56c17b 100644 --- a/doc/rtems_footer.html.in +++ b/doc/rtems_footer.html.in @@ -1 +1 @@ -

Copyright © 1988-2003 OAR Corporation diff --git a/doc/rtems_header.html.in b/doc/rtems_header.html.in index 2ad7d1cb69..97c89d52b9 100644 --- a/doc/rtems_header.html.in +++ b/doc/rtems_header.html.in @@ -1,5 +1,5 @@ - - + +

RTEMS @VERSION@ On-Line Library

diff --git a/doc/rtems_support.html.in b/doc/rtems_support.html.in index b86116099b..6144169106 100644 --- a/doc/rtems_support.html.in +++ b/doc/rtems_support.html.in @@ -1,12 +1,12 @@ RTEMS @VERSION@ On-Line Library - -

+ +

RTEMS RTEMS_VERSION On-Line Library

- +RTEMS LogoMENU>

RTEMS FAQ

@@ -55,5 +55,5 @@

-Copyright © 1988-2002 OAR Corporation +Copyright © 1988-2003 OAR Corporation diff --git a/doc/tools/texi2www/archive/texi2www-960103.tgz b/doc/tools/texi2www/archive/texi2www-960103.tgz deleted file mode 100644 index b0851552c2..0000000000 Binary files a/doc/tools/texi2www/archive/texi2www-960103.tgz and /dev/null differ -- cgit v1.2.3