Minor terminology tweaks (model -> build state)

4 files changed, 11 insertions, 11 deletions

diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx
index accae17..0d256a6 100644
--- a/build2/config/operation.cxx
+++ b/build2/config/operation.cxx
@@ -777,7 +777,7 @@ namespace build2
       project_set projects;
 
       // Note: doing everything in the load phase (disfigure_project () does
-      // modify the model).
+      // modify the build state).
       //
       for (const action_target& at: ts)
       {
diff --git a/build2/context.hxx b/build2/context.hxx
index 0675e6c..8ee27b3 100644
--- a/build2/context.hxx
+++ b/build2/context.hxx
@@ -27,7 +27,7 @@ namespace build2
   // execute  - execute the matched rule
   //
   // The build system starts with a "serial load" phase and then continues
-  // with parallel search and execute. Match, however, can be interrupted
+  // with parallel match and execute. Match, however, can be interrupted
   // both with load and execute.
   //
   // Match can be interrupted with "exclusive load" in order to load
@@ -39,12 +39,12 @@ namespace build2
   // phase_mutex (which is also used to synchronize the state changes between
   // phases).
   //
-  // Serial load can perform arbitrary changes to the model. Exclusive load,
-  // however, can only perform "island appends". That is, it can create new
-  // "nodes" (variables, scopes, etc) but not (semantically) change already
-  // existing nodes or invalidate any references to such (the idea here is
-  // that one should be able to load additional buildfiles as long as they
-  // don't interfere with the existing build state). The "islands" are
+  // Serial load can perform arbitrary changes to the build state. Exclusive
+  // load, however, can only perform "island appends". That is, it can create
+  // new "nodes" (variables, scopes, etc) but not (semantically) change
+  // already existing nodes or invalidate any references to such (the idea
+  // here is that one should be able to load additional buildfiles as long as
+  // they don't interfere with the existing build state). The "islands" are
   // identified by the load_generation number (0 for the initial/serial
   // load). It is incremented in case of a phase switch and can be stored in
   // various "nodes" to verify modifications are only done "within the
diff --git a/build2/scope.hxx b/build2/scope.hxx
index a0c96f0..7bdddde 100644
--- a/build2/scope.hxx
+++ b/build2/scope.hxx
@@ -340,7 +340,7 @@ namespace build2
 
   // Scope map.
   //
-  // Protected by the model mutex. Note that the scope map is only for paths
+  // Protected by the phase mutex. Note that the scope map is only for paths
   // from the out tree.
   //
   using scope_map_base = butl::dir_path_map<scope>;
diff --git a/build2/variable.hxx b/build2/variable.hxx
index 246fdf3..e45914a 100644
--- a/build2/variable.hxx
+++ b/build2/variable.hxx
@@ -937,7 +937,7 @@ namespace build2
 
   // Variable pool.
   //
-  // The global version is protected by the model mutex.
+  // The global version is protected by the phase mutex.
   //
   class variable_pool
   {
@@ -1346,7 +1346,7 @@ namespace build2
     size () const {return m_.size ();}
 
   public:
-    // Global should be true if this map is part of the global (model) state
+    // Global should be true if this map is part of the global build state
     // (e.g., scopes, etc).
     //
     explicit