Merge tag 'upstream/2.3.1'

Upstream version 2.3.1

1 files changed, 15 insertions, 0 deletions

diff --git a/doc/generated/examples/caching_ex1_5.xml b/doc/generated/examples/caching_ex1_5.xml
new file mode 100644
index 0000000..0d7d00c
--- /dev/null
+++ b/doc/generated/examples/caching_ex1_5.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd">% <userinput>scons -Q --cache-disable</userinput>
+cc -o hello.o -c hello.c
+cc -o hello hello.o
+% <userinput>scons -Q -c</userinput>
+Removed hello.o
+Removed hello
+% <userinput>scons -Q --cache-disable</userinput>
+cc -o hello.o -c hello.c
+cc -o hello hello.o
+% <userinput>scons -Q --cache-force</userinput>
+scons: `.' is up to date.
+% <userinput>scons -Q</userinput>
+scons: `.' is up to date.
+</screen>