Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
for testing.

From Prabhu S. Khalsa:
- Fix typo in preface
- Remove word "below" when content is not actually located below
- Fix typos in preface, Chapter 6, Chapter 9 and Chapter 10 of User Guide
- Fix broken links in Chapter 1 of User Guide

Expand Down
3 changes: 3 additions & 0 deletions RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ DOCUMENTATION

- Update documentation for IMPLICIT_COMMAND_DEPENDENCIES construction variable.

- Fix typo in preface
- Remove word "below" when content is not actually located below

- Fix typos in preface, Chapter 6, Chapter 9 and Chapter 10 of User Guide


Expand Down
4 changes: 2 additions & 2 deletions doc/user/command-line.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ This file is processed by the bin/SConsDoc.py module.
including defining types, default values, help text,
and automatic validation,
as well as applying those to a &consenv;.
See <xref linkend="sect-command-line-variables"></xref>, below.
See <xref linkend="sect-command-line-variables"></xref>.

</para>
</listitem>
Expand All @@ -97,7 +97,7 @@ This file is processed by the bin/SConsDoc.py module.
&SCons; provides access to the list of specified targets,
as well as ways to set the default list of targets
from within the &SConscript; files.
See <xref linkend="sect-command-line-targets"></xref>, below.
See <xref linkend="sect-command-line-targets"></xref>.

</para>
</listitem>
Expand Down
4 changes: 2 additions & 2 deletions doc/user/environments.xml
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ environment, of directory names, suffixes, etc.
is the ability to create multiple &consenvs;,
including the ability to clone a new, customized
&consenv; from an existing &consenv;.
See <xref linkend="sect-construction-environments"></xref>, below.
See <xref linkend="sect-construction-environments"></xref>.

</para>
</listitem>
Expand All @@ -400,7 +400,7 @@ environment, of directory names, suffixes, etc.
Note that this is not the same as
the external environment
(see above).
See <xref linkend="sect-execution-environments"></xref>, below.
See <xref linkend="sect-execution-environments"></xref>.

</para>
</listitem>
Expand Down
4 changes: 2 additions & 2 deletions doc/user/hierarchy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ x

(Notice that the <literal>lib/foo1.o</literal> object file
is built in the same directory as its source file.
See <xref linkend="chap-separate"></xref>, below,
See <xref linkend="chap-separate"></xref>,
for information about
how to build the object file in a different subdirectory.)

Expand Down Expand Up @@ -532,7 +532,7 @@ x
(As was the case with top-relative path names,
notice that the <literal>/usr/joe/lib/foo1.o</literal> object file
is built in the same directory as its source file.
See <xref linkend="chap-separate"></xref>, below,
See <xref linkend="chap-separate"></xref>,
for information about
how to build the object file in a different subdirectory.)

Expand Down
4 changes: 2 additions & 2 deletions doc/user/less-simple.xml
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ void bar2() { printf("bar2.c\n"); }
the individual object files must be built
before the resulting program can be built.
(This will be covered in greater detail in
<xref linkend="chap-depends"/>, below.)
<xref linkend="chap-depends"/>.)

</para>

Expand All @@ -550,7 +550,7 @@ void bar2() { printf("bar2.c\n"); }
from the common source files,
which can then be linked into resulting programs.
(Creating libraries is discussed in
<xref linkend="chap-libraries"></xref>, below.)
<xref linkend="chap-libraries"></xref>.)

</para>

Expand Down
2 changes: 1 addition & 1 deletion doc/user/libraries.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ object file

Of course, in this example, the object files
must already exist for the build to succeed.
See <xref linkend="chap-nodes"></xref>, below,
See <xref linkend="chap-nodes"></xref>,
for information about how you can
build object files explicitly
and include the built files in a library.
Expand Down
2 changes: 1 addition & 1 deletion doc/user/separate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ int main() { printf("Hello, world!\n"); }
then to look in the directories in the preprocessor search path.
Add to this that the &SCons; implementation of
support for code repositories
(described below)
(described later)
means not all of the files
will be found in the same directory hierarchy,
and the simplest way to make sure
Expand Down
2 changes: 1 addition & 1 deletion doc/user/simple.xml
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ Program("#goodbye.c") # the # in "#goodbye" does not indicate a comment
take those steps if/when it's necessary.
you'll learn more about how
&SCons; decides when building or rebuilding a target
is necessary in <xref linkend="chap-depends"></xref>, below.
is necessary in <xref linkend="chap-depends"></xref>.

</para>

Expand Down
Loading