Merge tag 'upstream/2.3.1'

Upstream version 2.3.1

1 files changed, 30 insertions, 3 deletions

diff --git a/src/engine/SCons/Tool/dvi.xml b/src/engine/SCons/Tool/dvi.xml
index cd7e682..7699629 100644
--- a/src/engine/SCons/Tool/dvi.xml
+++ b/src/engine/SCons/Tool/dvi.xml
@@ -1,13 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
 
 This file is processed by the bin/SConsDoc.py module.
 See its __doc__ string for a discussion of the format.
 -->
+
+<!DOCTYPE sconsdoc [
+<!ENTITY % scons SYSTEM '../../../../doc/scons.mod'>
+%scons;
+<!ENTITY % builders-mod SYSTEM '../../../../doc/generated/builders.mod'>
+%builders-mod;
+<!ENTITY % functions-mod SYSTEM '../../../../doc/generated/functions.mod'>
+%functions-mod;
+<!ENTITY % tools-mod SYSTEM '../../../../doc/generated/tools.mod'>
+%tools-mod;
+<!ENTITY % variables-mod SYSTEM '../../../../doc/generated/variables.mod'>
+%variables-mod;
+]>
+
+<sconsdoc 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">
+
 <tool name="dvi">
 <summary>
+<para>
 Attaches the &b-DVI; builder to the
 construction environment.
+</para>
 </summary>
 <sets>
 </sets>
@@ -17,6 +38,7 @@ construction environment.
 
 <builder name="DVI">
 <summary>
+<para>
 Builds a <filename>.dvi</filename> file
 from a <filename>.tex</filename>,
 <filename>.ltx</filename> or <filename>.latex</filename> input file.
@@ -47,21 +69,26 @@ and will examine the contents
 <filename>.log</filename>
 file and re-run the &cv-link-LATEXCOM; command
 if the log file says it is necessary.
+</para>
 
+<para>
 The suffix <filename>.dvi</filename>
 (hard-coded within TeX itself)
 is automatically added to the target
 if it is not already present.
 Examples:
+</para>
 
-<example>
+<example_commands>
 # builds from aaa.tex
 env.DVI(target = 'aaa.dvi', source = 'aaa.tex')
 # builds bbb.dvi
 env.DVI(target = 'bbb', source = 'bbb.ltx')
 # builds from ccc.latex
 env.DVI(target = 'ccc.dvi', source = 'ccc.latex')
-</example>
+</example_commands>
 </summary>
 </builder>
 
+
+</sconsdoc>
\ No newline at end of file