summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:05:10 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:05:10 +0000
commit98bc9752ce231935dac31259c0ce825ace54fd36 (patch)
tree111c73610891b1c3aa6fa2eee638e0c0d8852732 /doc
parentfedfa4af7b7a0fc01e8a179b5ac6ce5189d00f97 (diff)
downloadrtems-98bc9752ce231935dac31259c0ce825ace54fd36.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* cpright.texi, setup.texi: Merge from branch. * rtems.texi.in: New file.
Diffstat (limited to 'doc')
-rw-r--r--doc/common/ChangeLog5
-rw-r--r--doc/common/cpright.texi17
-rw-r--r--doc/common/rtems.texi.in16
-rw-r--r--doc/common/setup.texi2
4 files changed, 26 insertions, 14 deletions
diff --git a/doc/common/ChangeLog b/doc/common/ChangeLog
index 11573d57b6..2d76ccad34 100644
--- a/doc/common/ChangeLog
+++ b/doc/common/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * cpright.texi, setup.texi: Merge from branch.
+ * rtems.texi.in: New file.
+
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove AUTOMAKE_OPTIONS.
diff --git a/doc/common/cpright.texi b/doc/common/cpright.texi
index 6fecac7503..8a93b9eefe 100644
--- a/doc/common/cpright.texi
+++ b/doc/common/cpright.texi
@@ -17,7 +17,7 @@
@end tex
@vskip 0pt plus 1filll
-COPYRIGHT @copyright{} 1988 - 2002.@*
+COPYRIGHT @copyright{} 1988 - 2003.@*
On-Line Applications Research Corporation (OAR).@*
The authors have used their best efforts in preparing
@@ -31,17 +31,10 @@ assumed. The authors reserve the right to revise this material
and to make changes from time to time in the content hereof
without obligation to notify anyone of such revision or changes.
+The RTEMS Project is hosted at @uref{http://www.rtems.com}.
Any inquiries concerning RTEMS, its related support
components, its documentation, or any custom services
-for RTEMS should be directed to:
-
-@example
-On-Line Applications Research Corporation
-4910-L Corporate Drive
-Huntsville, AL 35805
-VOICE: (256) 722-9985
-FAX: (256) 722-0985
-EMAIL: rtems@@OARcorp.com
-URL: http://www.oarcorp.com
-@end example
+for RTEMS should be directed to the contacts listed on
+that site. A current list of RTEMS Support Providers
+is at @uref{http://www.rtems.com/support.html}.
diff --git a/doc/common/rtems.texi.in b/doc/common/rtems.texi.in
new file mode 100644
index 0000000000..6c50bb4e7e
--- /dev/null
+++ b/doc/common/rtems.texi.in
@@ -0,0 +1,16 @@
+@c
+@c $Id$
+@c
+
+@set RTEMSHTTPSITE www.rtems.com
+@set RTEMSUSERS rtems-users@@rtems.com
+@set RTEMSUSERSSUBSCRIBE rtems-users-subscribe@@rtems.com
+@set RTEMSSNAPSHOTS rtems-snapshots@@rtems.com
+@set RTEMSSNAPSHOTSSUBSCRIBE rtems-snapshots-subscribe@@rtems.com
+@set RTEMSBUGS rtems-bugs@@rtems.com
+@set RTEMSFTPURL ftp://www.rtems.com
+@set RTEMSHTTPURL http://www.rtems.com
+@set RTEMSGNATS @value{RTEMSHTTPURL}/cgi-bin/gnatsweb.pl
+@set RTEMSPREFIX @RTEMSPREFIX@
+@set RTEMSAPI @RTEMSAPI@
+
diff --git a/doc/common/setup.texi b/doc/common/setup.texi
index abf85effaa..b41cd63cb9 100644
--- a/doc/common/setup.texi
+++ b/doc/common/setup.texi
@@ -61,5 +61,3 @@
\global\parskip 6pt plus 1pt
@end ifclear
@end tex
-
-