=== modified file 'zen/zen/ie6.css'
--- zen/zen/ie6.css	2009-02-14 14:44:13 +0000
+++ zen/zen/ie6.css	2009-02-17 22:16:31 +0000
@@ -29,8 +29,8 @@
 
 #content,
 #navbar,
-#sidebar-left,
-#sidebar-right /* Floating divs */
+#sidebar-primary,
+#sidebar-secondary /* Floating divs */
 {
   display: inline; /* display inline or double your floated margin! [1] */
   overflow: hidden; /* in ie6, overflow auto is broken [2] and so is overflow visible [3] */

=== modified file 'zen/zen/layout-fixed.css'
--- zen/zen/layout-fixed.css	2009-02-14 14:44:13 +0000
+++ zen/zen/layout-fixed.css	2009-02-17 22:16:31 +0000
@@ -146,14 +146,14 @@
   padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */
 }
 
-.sidebar-left #content
+.sidebar-primary #content
 {
   width: 760px;
-  margin-left: 200px; /* The width of #sidebar-left. */
+  margin-left: 200px; /* The width of #sidebar-primary. */
   margin-right: -960px; /* Negative value of #content's width + left margin. */
 }
 
-.sidebar-right #content
+.sidebar-secondary #content
 {
   width: 760px;
   margin-left: 0;
@@ -163,7 +163,7 @@
 .two-sidebars #content
 {
   width: 560px;
-  margin-left: 200px; /* The width of #sidebar-left */
+  margin-left: 200px; /* The width of #sidebar-primary */
   margin-right: -760px; /* Negative value of #content's width + left margin. */
 }
 
@@ -189,8 +189,8 @@
 }
 
 .with-navbar #content,
-.with-navbar #sidebar-left,
-.with-navbar #sidebar-right
+.with-navbar #sidebar-primary,
+.with-navbar #sidebar-secondary
 {
   margin-top: 3.6em; /* Set this to the same value as the navbar height above. */
 }
@@ -240,36 +240,36 @@
 */
 
 /*
- * Sidebar-left
+ * sidebar-primary
  */
-#sidebar-left
+#sidebar-primary
 {
   float: left;
   width: 200px;
   margin-left: 0;
-  margin-right: -200px; /* Negative value of #sidebar-left's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-left-inner. */
+  margin-right: -200px; /* Negative value of #sidebar-primary's width + left margin. */
+  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-primary-inner. */
 }
 
-#sidebar-left-inner
+#sidebar-primary-inner
 {
   margin: 0 20px 0 0;
   padding: 0;
 }
 
 /*
- * Sidebar-right
+ * sidebar-secondary
  */
-#sidebar-right
+#sidebar-secondary
 {
   float: left;
   width: 200px;
-  margin-left: 760px; /* Width of content + sidebar-left. */
-  margin-right: -960px; /* Negative value of #sidebar-right's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-right-inner. */
+  margin-left: 760px; /* Width of content + sidebar-primary. */
+  margin-right: -960px; /* Negative value of #sidebar-secondary's width + left margin. */
+  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-secondary-inner. */
 }
 
-#sidebar-right-inner
+#sidebar-secondary-inner
 {
   margin: 0 0 0 20px;
   padding: 0;
@@ -299,8 +299,8 @@
 #header,
 #content,
 #navbar,
-#sidebar-left,
-#sidebar-right,
+#sidebar-primary,
+#sidebar-secondary,
 #footer,
 #closure-blocks
 {

=== modified file 'zen/zen/layout-liquid.css'
--- zen/zen/layout-liquid.css	2009-02-14 14:44:13 +0000
+++ zen/zen/layout-liquid.css	2009-02-17 22:16:31 +0000
@@ -145,22 +145,22 @@
   padding: 0;
 }
 
-.sidebar-left #content-inner
+.sidebar-primary #content-inner
 {
-  padding-left: 200px; /* The width + left margin of #sidebar-left. */
+  padding-left: 200px; /* The width + left margin of #sidebar-primary. */
   padding-right: 0;
 }
 
-.sidebar-right #content-inner
+.sidebar-secondary #content-inner
 {
   padding-left: 0;
-  padding-right: 200px; /* The width + right margin of #sidebar-right. */
+  padding-right: 200px; /* The width + right margin of #sidebar-secondary. */
 }
 
 .two-sidebars #content-inner
 {
-  padding-left: 200px; /* The width + left margin of #sidebar-left. */
-  padding-right: 200px; /* The width + right margin of #sidebar-right. */
+  padding-left: 200px; /* The width + left margin of #sidebar-primary. */
+  padding-right: 200px; /* The width + right margin of #sidebar-secondary. */
 }
 
 /*
@@ -179,8 +179,8 @@
 }
 
 .with-navbar #content,
-.with-navbar #sidebar-left,
-.with-navbar #sidebar-right
+.with-navbar #sidebar-primary,
+.with-navbar #sidebar-secondary
 {
   margin-top: 3.6em; /* Set this to the same value as the navbar height above. */
 }
@@ -230,36 +230,36 @@
 */
 
 /*
- * Sidebar-left
+ * Sidebar-primary
  */
-#sidebar-left
+#sidebar-primary
 {
-  float: left;
+  float: left; /* Left on LTR */
   width: 200px;
   margin-left: 0;
-  margin-right: -200px; /* Negative value of #sidebar-left's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-left-inner. */
+  margin-right: -200px; /* Negative value of #sidebar-primary's width + left margin. */
+  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-primary-inner. */
 }
 
-#sidebar-left-inner
+#sidebar-primary-inner
 {
   margin: 0 20px 0 0;
   padding: 0;
 }
 
 /*
- * Sidebar-right
+ * Sidebar-secondary
  */
-#sidebar-right
+#sidebar-secondary
 {
-  float: right;
+  float: right; /* Right on LTR */
   width: 200px;
-  margin-left: -200px; /* Negative value of #sidebar-right's width + right margin. */
+  margin-left: -200px; /* Negative value of #sidebar-secondary's width + right margin. */
   margin-right: 0;
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-right-inner. */
+  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-secondary-inner. */
 }
 
-#sidebar-right-inner
+#sidebar-secondary-inner
 {
   margin: 0 0 0 20px;
   padding: 0;
@@ -289,8 +289,8 @@
 #header,
 #content,
 #navbar,
-#sidebar-left,
-#sidebar-right,
+#sidebar-primary,
+#sidebar-secondary,
 #footer,
 #closure-blocks
 {

=== modified file 'zen/zen/maintenance-page.tpl.php'
--- zen/zen/maintenance-page.tpl.php	2009-02-14 14:44:13 +0000
+++ zen/zen/maintenance-page.tpl.php	2009-02-17 22:16:31 +0000
@@ -105,15 +105,15 @@
       <?php endif; ?>
 
       <?php if ($left): ?>
-        <div id="sidebar-left"><div id="sidebar-left-inner" class="region region-left">
+        <div id="sidebar-primary"><div id="sidebar-primary-inner" class="region region-left">
           <?php print $left; ?>
-        </div></div> <!-- /#sidebar-left-inner, /#sidebar-left -->
+        </div></div> <!-- /#sidebar-primary-inner, /#sidebar-primary -->
       <?php endif; ?>
 
       <?php if ($right): ?>
-        <div id="sidebar-right"><div id="sidebar-right-inner" class="region region-right">
+        <div id="sidebar-secondary"><div id="sidebar-secondary-inner" class="region region-right">
           <?php print $right; ?>
-        </div></div> <!-- /#sidebar-right-inner, /#sidebar-right -->
+        </div></div> <!-- /#sidebar-secondary-inner, /#sidebar-secondary -->
       <?php endif; ?>
 
     </div></div> <!-- /#main-inner, /#main -->

=== modified file 'zen/zen/navigation.css'
--- zen/zen/navigation.css	2009-02-14 14:44:13 +0000
+++ zen/zen/navigation.css	2009-02-17 22:17:06 +0000
@@ -4,8 +4,8 @@
  * @file
  * Navigation Styling
  *
- * Remember to NOT add padding or margin to your #sidebar-left or #sidebar-right
- * (see the layout.css file.)
+ * Remember to NOT add padding or margin to your #sidebar-primary or 
+ * #sidebar-secondary (see the layout.css file.)
  */
 
 

=== modified file 'zen/zen/page.tpl.php'
--- zen/zen/page.tpl.php	2009-02-14 14:44:13 +0000
+++ zen/zen/page.tpl.php	2009-02-17 22:16:31 +0000
@@ -208,15 +208,15 @@
       <?php endif; ?>
 
       <?php if ($left): ?>
-        <div id="sidebar-left"><div id="sidebar-left-inner" class="region region-left">
+        <div id="sidebar-primary"><div id="sidebar-primary-inner" class="region region-left">
           <?php print $left; ?>
-        </div></div> <!-- /#sidebar-left-inner, /#sidebar-left -->
+        </div></div> <!-- /#sidebar-primary-inner, /#sidebar-primary -->
       <?php endif; ?>
 
       <?php if ($right): ?>
-        <div id="sidebar-right"><div id="sidebar-right-inner" class="region region-right">
+        <div id="sidebar-secondary"><div id="sidebar-secondary-inner" class="region region-right">
           <?php print $right; ?>
-        </div></div> <!-- /#sidebar-right-inner, /#sidebar-right -->
+        </div></div> <!-- /#sidebar-secondary-inner, /#sidebar-secondary -->
       <?php endif; ?>
 
     </div></div> <!-- /#main-inner, /#main -->

=== modified file 'zen/zen/pages.css'
--- zen/zen/pages.css	2009-02-17 22:00:42 +0000
+++ zen/zen/pages.css	2009-02-17 22:09:01 +0000
@@ -40,7 +40,7 @@
 
 #logo /* Wrapper for logo */
 {
-  margin: 0 10px 0 0;
+  margin: 0 10px 0 10px; /* Margin for LTR and RTL */
   padding: 0;
 }
 
@@ -204,24 +204,24 @@
 }
 
 /*
- * Left sidebar
+ * Primary sidebar (left sidebar in LTR/ right sidebar in RTL).
  */
-#sidebar-left
+#sidebar-primary
 {
 }
 
-#sidebar-left-inner
+#sidebar-primary-inner
 {
 }
 
 /*
- * Right sidebar
+ * Secondary sidebar (right sidebar in LTR/ left sidebar in RTL)
  */
-#sidebar-right
+#sidebar-secondary
 {
 }
 
-#sidebar-right-inner
+#sidebar-secondary-inner
 {
 }
 

=== modified file 'zen/zen/print.css'
--- zen/zen/print.css	2009-02-14 14:44:13 +0000
+++ zen/zen/print.css	2009-02-17 22:16:31 +0000
@@ -52,7 +52,7 @@
 }
 
 /* Hide sidebars and nav elements */
-#skip-to-nav, #navbar, #sidebar-left, #sidebar-right, #footer,
+#skip-to-nav, #navbar, #sidebar-primary, #sidebar-secondary, #footer,
 .breadcrumb, div.tabs, .links, .taxonomy,
 .book-navigation, .forum-topic-navigation, .pager, .feed-icons
 {

=== modified file 'zen/zen/wireframes.css'
--- zen/zen/wireframes.css	2009-02-14 14:44:13 +0000
+++ zen/zen/wireframes.css	2009-02-17 22:16:31 +0000
@@ -12,8 +12,8 @@
 .with-wireframes #content-inner,
 .with-wireframes #content-inner>*,
 .with-wireframes #navbar-inner,
-.with-wireframes #sidebar-left-inner,
-.with-wireframes #sidebar-right-inner,
+.with-wireframes #sidebar-primary-inner,
+.with-wireframes #sidebar-secondary-inner,
 .with-wireframes #footer-inner
 {
   margin: 1px;
