From f705def7aeac7376af2b24ffd175e6dadb3454ac Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sat, 30 Aug 2003 05:36:50 +0000
Subject: [PATCH] 2003-08-30	Ralf Corsepius <corsepius@faw.uni-ulm.de>

	* FAQ.texi: include common/rtems.texi.
	* Makefile.am: Reflect changes to $(top_srcdir)/project.am.
	* basic.t: Use RTEMSHTTPURL instead of http://www.rtems.com.
	* build45.t: Use RTEMSPREFIX instead of /opt/rtems.
---
 doc/FAQ/ChangeLog   | 7 +++++++
 doc/FAQ/FAQ.texi    | 1 +
 doc/FAQ/Makefile.am | 3 +--
 doc/FAQ/basic.t     | 4 ++--
 doc/FAQ/build45.t   | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/FAQ/ChangeLog b/doc/FAQ/ChangeLog
index 2fa59099bb..8772cababc 100644
--- a/doc/FAQ/ChangeLog
+++ b/doc/FAQ/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-30	Ralf Corsepius <corsepius@faw.uni-ulm.de>
+
+	* FAQ.texi: include common/rtems.texi.
+	* Makefile.am: Reflect changes to $(top_srcdir)/project.am.
+	* basic.t: Use RTEMSHTTPURL instead of http://www.rtems.com.
+	* build45.t: Use RTEMSPREFIX instead of /opt/rtems.
+
 2003-08-28	Ralf Corsepius <corsepius@faw.uni-ulm.de>
 
 	* basic.t, build45.t, tools.t: Reflect new VARS in
diff --git a/doc/FAQ/FAQ.texi b/doc/FAQ/FAQ.texi
index 1cb027eaa1..6e890797be 100644
--- a/doc/FAQ/FAQ.texi
+++ b/doc/FAQ/FAQ.texi
@@ -21,6 +21,7 @@
 
 @include version.texi
 @include common/setup.texi
+@include common/rtems.texi
 
 @ifset use-ascii
 @dircategory RTEMS On-Line Manual
diff --git a/doc/FAQ/Makefile.am b/doc/FAQ/Makefile.am
index a2473d5b9c..7ca13bad06 100644
--- a/doc/FAQ/Makefile.am
+++ b/doc/FAQ/Makefile.am
@@ -17,8 +17,7 @@ GENERATED_FILES = basic.texi tools.texi concepts.texi build45.texi bsp.texi \
     debug.texi freesw.texi embeddedinfo.texi hwdebugaids.texi projects.texi \
     endoftime.texi
 
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
-    $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
 
 FILES =
 
diff --git a/doc/FAQ/basic.t b/doc/FAQ/basic.t
index 7a09e2557f..70ab8af089 100644
--- a/doc/FAQ/basic.t
+++ b/doc/FAQ/basic.t
@@ -150,7 +150,7 @@ Yes, but not all are based on standards and the open source philosophy.
 
 @section How can I get RTEMS?
 
-RTEMS is distributed from @uref(http://www.rtems.com,http://www.rtems.com).
+RTEMS is distributed from @uref{@value{RTEMSHTTPURL},@value{RTEMSHTTPURL}}.
 This is a server dedicated to the RTEMS Project which was donated by and
 hosted by @uref{http://www.OARcorp.com,OAR Corporation} to provide
 a focal point for all RTEMS activities.  Point your
@@ -164,7 +164,7 @@ But if you are already reading this, you probably already found it. :)
 
 RTEMS development and support services are available from a number
 of firms.  See
-@uref(http://www.rtems.com/support.html,http://www.rtems.com/support.html)
+@uref{@value{RTEMSHTTPURL}/support.html,@value{RTEMSHTTPURL}/support.html}
 for the current list of RTEMS service providers.
 
 Remember that RTEMS maintenance is funded by users.  If you are
diff --git a/doc/FAQ/build45.t b/doc/FAQ/build45.t
index f41b1dfb70..a88dc124dc 100644
--- a/doc/FAQ/build45.t
+++ b/doc/FAQ/build45.t
@@ -155,7 +155,7 @@ Host tools are supposed not to be prefixed.
 e.g.: cc, ld, gcc, autoconf, automake, aclocal etc.
 
 If using the pre-built tool binaries provided by the RTEMS project,
-simply prepend @code{/opt/rtems/bin} to @code{$PATH}.
+simply prepend @code{@value{RTEMSPREFIX}} to @code{$PATH}.
 
 @subsection Can I build RTEMS Canadian Cross?