Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2012-07-04 16:19:50 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2012-07-04 16:19:50 +0400
commit4d2a6a8e21031702f1ca6fdd1130af73362dcb91 (patch)
tree0b9df93d1b327a4e7301c498b1c5d3087232acc2 /doc/build_systems
parent16e6b7b867778fb041dd7cbe10cb83e8b3de0920 (diff)
Spellfixes: colour -> color
Diffstat (limited to 'doc/build_systems')
-rw-r--r--doc/build_systems/scons-dev.txt2
-rw-r--r--doc/build_systems/scons.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/build_systems/scons-dev.txt b/doc/build_systems/scons-dev.txt
index b7cac8109d4..ae2be2b2a94 100644
--- a/doc/build_systems/scons-dev.txt
+++ b/doc/build_systems/scons-dev.txt
@@ -37,7 +37,7 @@
Much of the actual functionality can be found in the python scripts
in the directory $BLENDERHOME/tools, with Blender.py defining the
bulk of the functionality. btools.py has some helper functions, and
- bcolors.py is for the terminal colours. mstoolkit.py and crossmingw.py
+ bcolors.py is for the terminal colors. mstoolkit.py and crossmingw.py
are modules which set up SCons for the MS VC++ 2003 toolkit and
the cross-compile toolset for compiling Windows binaries on Linux
respectively. Note: the cross-compile doesn't work yet for Blender,
diff --git a/doc/build_systems/scons.txt b/doc/build_systems/scons.txt
index d6ead8d32ae..cb88c56ddbc 100644
--- a/doc/build_systems/scons.txt
+++ b/doc/build_systems/scons.txt
@@ -48,7 +48,7 @@
% python ./scons/scons.py
This will start the build process with default values. Depending
- on your platform you may see colour in your output (non-Windows
+ on your platform you may see color in your output (non-Windows
machines). In the the beginning an overview of targets and arguments
from the command-line is given, then all libraries and binaries to
build are configured.
@@ -123,11 +123,11 @@
This rewrite features a cleaner output during the build process. If
you need to see the full command-line for compiles, then you can
- change that behaviour. Also the use of colours can be changed:
+ change that behaviour. Also the use of colors can be changed:
% python scons\scons.py BF_FANCY=0
- This will disable the use of colours.
+ This will disable the use of colors.
% python scons\scons.py BF_QUIET=0