summaryrefslogtreecommitdiffstats
path: root/doc/user/mergeflags.xml
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2013-05-03 22:30:28 (GMT)
committerDirk Baechle <dl9obn@darc.de>2013-05-03 22:30:28 (GMT)
commit106a09dc814071594306eed8382fd30929e605ab (patch)
tree5cda0c7b94858ef25546d5ae059e90aaf23e9ce0 /doc/user/mergeflags.xml
parent6af67d1431b5d534731ff0dc17ff306639a1a854 (diff)
downloadSCons-106a09dc814071594306eed8382fd30929e605ab.zip
SCons-106a09dc814071594306eed8382fd30929e605ab.tar.gz
SCons-106a09dc814071594306eed8382fd30929e605ab.tar.bz2
- removed suffix= from 'scons_output_command ' and moved it
one up in the hierarchy to the 'scons_output' tag
Diffstat (limited to 'doc/user/mergeflags.xml')
-rw-r--r--doc/user/mergeflags.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/user/mergeflags.xml b/doc/user/mergeflags.xml
index 1c73f8a..9e0dcc6 100644
--- a/doc/user/mergeflags.xml
+++ b/doc/user/mergeflags.xml
@@ -81,8 +81,8 @@
</file>
</scons_example>
- <scons_output example="mergeflags_MergeFlags1">
- <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output example="mergeflags_MergeFlags1" suffix="1">
+ <scons_output_command>scons -Q</scons_output_command>
</scons_output>
<para>
@@ -108,8 +108,8 @@
</file>
</scons_example>
- <scons_output example="mergeflags_MergeFlags2">
- <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output example="mergeflags_MergeFlags2" suffix="1">
+ <scons_output_command>scons -Q</scons_output_command>
</scons_output>
<para>
@@ -143,8 +143,8 @@
</file>
</scons_example>
- <scons_output example="mergeflags_MergeFlags3">
- <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output example="mergeflags_MergeFlags3" suffix="1">
+ <scons_output_command>scons -Q</scons_output_command>
</scons_output>
<para>