5 files changed, 19 insertions, 8 deletions
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index cbc2569..a4e470f 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -1359,6 +1359,16 @@ method.
 Enables or disables warnings about missing SConscript files.
 
 .TP
+--warn=fortran-cxx-mix, --warn=no-fortran-cxx-mix
+Enables or disables the specific warning about linking
+Fortran and C++ object files in a single executable,
+which can yield unpredictable behavior with some compilers.
+
+.TP
+--warn=link, --warn=no-link
+Enables or disables warnings about link steps.
+
+.TP
 --warn=misleading-keywords, --warn=no-misleading-keywords
 Enables or disables warnings about use of the misspelled keywords
 .B targets
@@ -4360,7 +4370,7 @@ Interpreted options
 and the construction variables they affect
 are as specified for the
 .BR env.ParseFlags ()
-method (which thie method calls).
+method (which this method calls).
 See that method's description, below,
 for a table of options and construction variables.
 
@@ -8434,9 +8444,9 @@ Execute(Mkdir('/tmp/outputdir'))
 
 env.Command('foo.out', 'foo.in',
             [Mkdir('/tmp/builddir',
-             Copy('$SOURCE', '/tmp/builddir')
-             "cd /tmp/builddir && ])
-
+             Copy('$SOURCE', '/tmp/builddir/foo.in')
+             "cd /tmp/builddir && make",
+             Copy('/tmp/builddir/foo.out', '$TARGET')])
 .EE
 
 .TP
diff --git a/doc/user/add-method.in b/doc/user/add-method.in
index a0a6039..8997efb 100644
--- a/doc/user/add-method.in
+++ b/doc/user/add-method.in
@@ -55,7 +55,7 @@
   </para>
 
   <scons_output example="ex1">
-    <scons_output_command>scons -Q</scons_output_command>
+    <scons_output_command>scons -Q /</scons_output_command>
   </scons_output>
 
   <para>
diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml
index 7e84b80..b6a597b 100644
--- a/doc/user/add-method.xml
+++ b/doc/user/add-method.xml
@@ -50,10 +50,11 @@
   </para>
 
   <screen>
-    % <userinput>scons -Q</userinput>
+    % <userinput>scons -Q /</userinput>
     cc -o hello.o -c hello.c
     cc -o hello hello.o
     Install file: "hello" as "install/bin/hello"
+    Install file: "hello" as "/usr/bin/hello"
   </screen>
 
   <para>
diff --git a/doc/user/builders-writing.in b/doc/user/builders-writing.in
index 67a95f9..eefbb31 100644
--- a/doc/user/builders-writing.in
+++ b/doc/user/builders-writing.in
@@ -864,7 +864,7 @@ This functionality could be invoked as in the following example:
     <file name="site_scons/my_utils.py" printme=1>
       def build_id():
          """Return a build ID (stub version)"""
-	 return "100"
+         return "100"
     </file>
     <file name="SConscript">
       import my_utils
diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml
index df3affa..6a5a7c1 100644
--- a/doc/user/builders-writing.xml
+++ b/doc/user/builders-writing.xml
@@ -752,7 +752,7 @@ This functionality could be invoked as in the following example:
   <programlisting>
       def build_id():
          """Return a build ID (stub version)"""
-	 return "100"
+         return "100"
   </programlisting>
 
   <para>