From e83805c0406a31e22b21cd1bf226b9a7beb5b997 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Sat, 4 Jul 2009 14:49:09 -0700
Subject: [PATCH] [Sass] 'Control Structures' -> 'Control Directives'.

---
 doc-src/SASS_REFERENCE.md | 12 +++++++-----
 lib/sass/tree/node.rb     |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc-src/SASS_REFERENCE.md b/doc-src/SASS_REFERENCE.md
index 9d354640..397b67c8 100644
--- a/doc-src/SASS_REFERENCE.md
+++ b/doc-src/SASS_REFERENCE.md
@@ -153,13 +153,16 @@ Available options are:
 {#template_location-option} `:template_location`
 : A path to the root sass template directory for you application.
   If a hash, `:css_location` is ignored and this option designates
-  both a mapping between input and output directories.
+  a mapping between input and output directories.
   May also be given a list of 2-element lists, instead of a hash.
   Defaults to `RAILS_ROOT + "/public/stylesheets/sass"`
   or `MERB_ROOT + "/public/stylesheets/sass"`.
   Only has meaning within Ruby on Rails or Merb.
   This will be derived from the `:css_location` path list if not provided 
   by appending a folder of "sass" to each corresponding css location.
+  Please note: When multiple template locations are specified, all
+  of them are placed in the import path, allowing you to import
+  between them.
 
 {#css_location-option} `:css_location`
 : The path where CSS output should be written to.
@@ -412,7 +415,7 @@ For example:
 
 Some directives can also control whether or how many times
 a chunk of Sass is output.
-Those are documented under Control Structures.
+Those are documented under Control Directives.
 
 ### `@import` {#import}
 
@@ -518,10 +521,9 @@ compiles to:
       #main {
         background-color: white; } }
 
-## Control Structures
+## Control Directives
 
-SassScript supports basic control structures for looping and conditionals
-using the same syntax as directives.
+SassScript supports basic control directives for looping and conditional evaluation.
 
 ### `@if`
 
diff --git a/lib/sass/tree/node.rb b/lib/sass/tree/node.rb
index 04f82793..5b435552 100644
--- a/lib/sass/tree/node.rb
+++ b/lib/sass/tree/node.rb
@@ -137,7 +137,7 @@ module Sass
       end
 
       # Runs the dynamic Sass code:
-      # mixins, variables, control structures, and so forth.
+      # mixins, variables, control directives, and so forth.
       # This doesn't modify this node or any of its children.
       #
       # \{#perform} shouldn't be overridden directly;