summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-03 19:29:06 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-03 19:29:06 +0000
commitcd0bab2d6c5f9b3a2316487486348291c22b79c2 (patch)
treecadd7ac2549918fa8706cc76619decbef3073b53 /doc
parent2003-09-03 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-cd0bab2d6c5f9b3a2316487486348291c22b79c2.tar.bz2
2003-09-03 Aaron J. Grier <aaron@frye.com>
* tools.t: Added how to generate and apply a patch.
Diffstat (limited to 'doc')
-rw-r--r--doc/FAQ/ChangeLog4
-rw-r--r--doc/FAQ/tools.t20
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/FAQ/ChangeLog b/doc/FAQ/ChangeLog
index 8772cababc..ffb0e7aaa4 100644
--- a/doc/FAQ/ChangeLog
+++ b/doc/FAQ/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-03 Aaron J. Grier <aaron@frye.com>
+
+ * tools.t: Added how to generate and apply a patch.
+
2003-08-30 Ralf Corsepius <corsepius@faw.uni-ulm.de>
* FAQ.texi: include common/rtems.texi.
diff --git a/doc/FAQ/tools.t b/doc/FAQ/tools.t
index 59d5cb75db..4af175bcc9 100644
--- a/doc/FAQ/tools.t
+++ b/doc/FAQ/tools.t
@@ -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.