summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Thiessen <alex.thiessen.de+github@gmail.com>2024-11-15 13:09:34 (GMT)
committerAlex Thiessen <alex.thiessen.de+github@gmail.com>2024-11-15 15:07:52 (GMT)
commite7848aa95663a4d89fe71fab90a8105a0c9d9fe0 (patch)
tree0dd6d20559145e17e80d1c1e1570a37ca8c47da0
parent39f1cb1092aa647c8322f6eeabae23932e987054 (diff)
downloadSCons-e7848aa95663a4d89fe71fab90a8105a0c9d9fe0.zip
SCons-e7848aa95663a4d89fe71fab90a8105a0c9d9fe0.tar.gz
SCons-e7848aa95663a4d89fe71fab90a8105a0c9d9fe0.tar.bz2
*.xml: Don't abbreviate `directory` in normal text
-rw-r--r--doc/user/add-method.xml4
-rw-r--r--doc/user/builders-writing.xml6
-rw-r--r--doc/user/troubleshoot.xml4
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml
index 071d654..001a575 100644
--- a/doc/user/add-method.xml
+++ b/doc/user/add-method.xml
@@ -54,14 +54,14 @@ This file is processed by the bin/SConsDoc.py module.
<scons_example name="addmethod_ex1">
<file name="SConstruct" printme="1">
def install_in_bin_dirs(env, source):
- """Install source in both bin dirs"""
+ """Install source in both bin directories"""
i1 = env.Install("$BIN", source)
i2 = env.Install("$LOCALBIN", source)
return [i1[0], i2[0]] # Return a list, like a normal builder
env = Environment(BIN='__ROOT__/usr/bin', LOCALBIN='#install/bin')
env.AddMethod(install_in_bin_dirs, "InstallInBinDirs")
-env.InstallInBinDirs(Program('hello.c')) # installs hello in both bin dirs
+env.InstallInBinDirs(Program('hello.c')) # installs hello in both bin directories
</file>
<file name="hello.c">
int main() { printf("Hello, world!\n"); }
diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml
index b9eb064..8d2c948 100644
--- a/doc/user/builders-writing.xml
+++ b/doc/user/builders-writing.xml
@@ -941,9 +941,9 @@ main()
Each system type (Windows, Mac, Linux, etc.) searches a canonical
set of directories for <filename>site_scons</filename>;
see the man page for details.
- The top-level SConstruct's <filename>site_scons</filename> dir
+ The top-level SConstruct's <filename>site_scons</filename> directory
(that is, the one in the project) is always searched last,
- and its dir is placed first in the tool path so it overrides all
+ and its directory is placed first in the tool path so it overrides all
others.
</para>
@@ -952,7 +952,7 @@ main()
If you get a tool from somewhere (the &SCons; wiki or a third party,
for instance) and you'd like to use it in your project, a
- <filename>site_scons</filename> dir is the simplest place to put it.
+ <filename>site_scons</filename> directory is the simplest place to put it.
Tools come in two flavors; either a &Python; function that operates on
an &Environment; or a &Python; module or package containing two functions,
<function>exists()</function> and <function>generate()</function>.
diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml
index 763e55c..e2b59a5 100644
--- a/doc/user/troubleshoot.xml
+++ b/doc/user/troubleshoot.xml
@@ -893,7 +893,7 @@ prog.c
<para>
- When using the &Duplicate; option to create variant dirs,
+ When using the &Duplicate; option to create variant directories,
sometimes you may find files not getting linked or copied to where you
expect (or not at all), or files mysteriously disappearing.
These are usually because of a misconfiguration of some kind in the
@@ -901,7 +901,7 @@ prog.c
&debug-duplicate; option shows each time a variant file is
unlinked and relinked from its source (or copied, depending on
settings), and also shows a message for removing "stale"
- variant-dir files that no longer have a corresponding source file.
+ variant-directory files that no longer have a corresponding source file.
It also prints a line for each target that's removed just before
building, since that can also be mistaken for the same thing.