2003-09-19 Joel Sherrill <joel@OARcorp.com>

	* FAQ.texi, basic.t, build45.t, entry, tools.t: Merge from branch.

6 files changed, 60 insertions, 23 deletions

diff --git a/doc/FAQ/ChangeLog b/doc/FAQ/ChangeLog
index d0289c81eb..579143f286 100644
--- a/doc/FAQ/ChangeLog
+++ b/doc/FAQ/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19	Joel Sherrill <joel@OARcorp.com>
+
+	* FAQ.texi, basic.t, build45.t, entry, tools.t: Merge from branch.
+
 2003-05-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* build45.t: Fix typo (config.long).
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/basic.t b/doc/FAQ/basic.t
index e946889926..2e6ee5b8fa 100644
--- a/doc/FAQ/basic.t
+++ b/doc/FAQ/basic.t
@@ -138,43 +138,55 @@ source code was available and royalties were paid.
 
 In other words, RTEMS was open source before open source was cool.
 
+Since the initial release to the world, the RTEMS Community has 
+grown enormously and contributed significantly to RTEMS.  Important
+additions such as the TCP/IP stack, FAT filesystem, multiple ports,
+device drivers, and most BSPs have come from users like yourself.
+
 @section Are there no similar commercial products?
 
 Yes, but not all are based on standards and the open source philosophy.
 
 @section How can I get RTEMS?
 
-RTEMS is distributed by OAR Corporation via the Internet.  Point your
+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
 favorite browser at the following URL and following the link:
 
-@c this version should work
-@c @set OAR-URL http://www.OARcorp.com
-@c @uref{@value{OAR-URL},@value{OAR-URL}}
-@uref{http://www.OARcorp.com,http://www.OARcorp.com}
+@uref{@value{RTEMSHTTPURL},@value{RTEMSHTTPURL}}
+
+But if you are already reading this, you probably already found it. :)
 
 @section What about support?
 
-OAR Corporation provides numerous services for RTEMS including support,
-training, and custom development.
+RTEMS development and support services are available from a number
+of firms.  See
+@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
+using RTEMS on a commercial project, please get support.
 
 @section Are there any mailing lists?
 
-The primary RTEMS mailing list is @code{rtems-users@@oarcorp.com}.  This
+The primary RTEMS mailing list is @code{@value{RTEMSUSERS}}.  This
 list is for general RTEMS discussions, questions, design help, advice,
 etc..  Subscribe by sending an empty mail
-message to @code{rtems-users-subscribe@@OARcorp.com}.  This
+message to @code{@value{RTEMSUSERSSUBSCRIBE}}.  This
 mailing list is archived at:
 
 @example
 http://www.oarcorp.com/rtems/maillistArchives/rtems-users
 @end example
 
-The @code{rtems-snapshots@@oarcorp.com} mailing list is for those
+The @code{@value{RTEMSSNAPSHOTS}} mailing list is for those
 interested in taking a more active role in the design, development,
 and maintenance of RTEMS.  Discussions on this list tend to focus
 on problems in the development source, design of new features, problem
 reports, etc..  Subscribe by sending an empty mail
-message to @code{rtems-snapshots-subscribe@@OARcorp.com}.
+message to @code{@value{RTEMSSNAPSHOTSSUBSCRIBE}}.
 mailing list is archived at:
 
 @example
diff --git a/doc/FAQ/build45.t b/doc/FAQ/build45.t
index e4ab8bdc05..a88dc124dc 100644
--- a/doc/FAQ/build45.t
+++ b/doc/FAQ/build45.t
@@ -72,7 +72,7 @@ Native Cygwin binaries should be available at Cygnus.
 
 GNU-Toolchain binaries (gcc, binutils etc.) for Linux and patches required
 to build them from source are available from 
-@uref{ftp://ftp.oarcorp.com,OAR Corporation}.
+@uref{@value{RTEMSFTPURL},the RTEMS ftp site}.
 
 
 @section Issues when building RTEMS
@@ -154,8 +154,8 @@ prefix, eg.  i386-rtems-gcc, m68k-rtems-ld are target tools.
 Host tools are supposed not to be prefixed.
 e.g.: cc, ld, gcc, autoconf, automake, aclocal etc.
 
-If using OAR Corporation's rpms for the toolchain, simply prepend
-@code{/opt/rtems/bin} to @code{$PATH}.
+If using the pre-built tool binaries provided by the RTEMS project,
+simply prepend @code{@value{RTEMSPREFIX}} to @code{$PATH}.
 
 @subsection Can I build RTEMS Canadian Cross?
 
@@ -411,8 +411,8 @@ have been adapted to autoconf >= 2.50 demands.
 
 Several possibilities (In decreasing preference):
 @itemize @bullet
-@item File a bug report at @uref{http://www.oarcorp.com/cgi-bin/gnatsweb.pl,OAR's GNAT}
-@item Send an email to @uref{mailto:rtems-bugs@@OARcorp.com,rtems-bugs@@OARcorp.com}
+@item File a bug report at @uref{@value{RTEMSGNATS},RTEMS's GNATS}
+@item Send an email to @uref{mailto:@value{RTEMSBUGS},@value{RTEMSBUGS}}
 @item Report your problem to one of the RTEMS mailing lists 
 (Cf. @ref{Are there any mailing lists?}).
 @end itemize
diff --git a/doc/FAQ/entry b/doc/FAQ/entry
index aa74b9fe8c..518fabba93 100644
--- a/doc/FAQ/entry
+++ b/doc/FAQ/entry
@@ -29,8 +29,8 @@ POSIX 1003.1b support, and file system support.  It also includes optional
 debug aids like stack overflow and heap integrity checking. 
 
 RTEMS is built using GNU autoconf and can be built on any host supporting
-the GNU tools including Linux, FreeBSD, NetBSD, Solaris, and MS-Windows to
-name but a few.  The current RTEMS release supports the following CPU
+the GNU tools including GNU/Linux, FreeBSD, NetBSD, Solaris, and MS-Windows
+to name but a few.  The current RTEMS release supports the following CPU
 families: 
 
   Motorola m680x0, m683xx, and ColdFire
@@ -47,13 +47,13 @@ families:
 
 There are over 35 Board Support Packages included with RTEMS including
 BSPs for a standard PC as well as the SPARC, MIPS, PowerPC simulators
-included with gdb.  There are
-numerous BSPs for CPUs targetting the embedded market such as the Motorola
-m683xx, ppc4xx, and mpc8xx series which support the on-CPU peripherals. 
+included with gdb.  There are numerous BSPs for CPUs targetting the
+embedded market such as the Motorola m683xx, ppc4xx, and mpc8xx series
+which support the on-CPU peripherals. 
 
 WWW: 
 
-@uref{http://www.OARcorp.com}
+@uref{http://www.rtems.com}
 
 E-mail: 
 
diff --git a/doc/FAQ/tools.t b/doc/FAQ/tools.t
index d917f9d461..4af175bcc9 100644
--- a/doc/FAQ/tools.t
+++ b/doc/FAQ/tools.t
@@ -13,7 +13,7 @@ in a non-language specific way.
 
 @section What is GNU?
 
-Take a look at @uref{http://www.gnu.org} for information on the GNU Project.
+Take a look at @uref{http://www.gnu.org,http://www.gnu.org} for information on the GNU Project.
 
 @section How do I generate a patch?
 
@@ -49,3 +49,23 @@ in the two source files.  The GNU open-source packages usually have
 UNIX style CR/LF.  If you edit on a Windows platform, the line 
 terminators may have been transformed by the editor into Windows
 style.
+
+@section How do I apply a patch?
+
+Patches generated with the @code{diff} program are fed into the
+@code{patch} program as follows:
+
+@example
+patch -p1 <PATCHFILE
+@end example
+
+where the options are:
+
+@itemize @bullet
+
+@item -pNUM tells @code{patch} to strip off NUM slashes from the
+pathname.
+
+@end itemize
+
+If @code{patch} prompts for a file to patch, you may need to adjust NUM.