copy-editing 21. not much there yet.

diff --git a/_manual/21_preferences-and-session-properties.html b/_manual/21_preferences-and-session-properties.html
index 8a80df656c66811a448a5565e017854e624e0fff..3b56fc321ce1a77f2bde7c7919fd218f783d69e6 100644 (file)
--- a/_manual/21_preferences-and-session-properties.html
+++ b/_manual/21_preferences-and-session-properties.html
@@ -3,15 +3,21 @@ layout: default
 title: Preferences and Session Properties
 ---                        
 
-
-  
-  <p>Ardour splits preferences into two categories:</p>
+<p>
+  Ardour splits its configuration options into two categories:
+</p>
 <ul>
-<li>Settings that should logically apply to all sessions, because they are based on user workflow or system configuration
-</li>
-<li>Settings that are per session, because they depend or reflect session content or design
-</li>
+  <li>
+    Global <dfn>preferences</dfn> control general workflow and system 
+    configuration, and should apply to all sessions. They are located in
+    <kbd class="menu">Edit &gt; Preferences</kbd> and stored in 
+    Ardour's <dfn>user configuration file</dfn> in your home directory. 
+  </li>
+  <li><dfn>Session properties</dfn> control aspects of the workflow or
+    configuration that pertain to the current session only. You can find them
+    in <kbd class="menu">Session &t; Properties</kbd>, and they will be stored
+    in the session file.
+  </li>
 </ul>
-<p>There are two separate (but similarly designed) dialogs, one under <code>Edit &gt; Preferences</code> for the first category of preferences and <code>Session &gt; Properties</code> for the second. Each window uses tabs to group a set of preferences</p>
 
 {% children %}

diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog.html
index 51ab9eb0f82a0ae74e4a3873e597538d178e2b59..56fca491fc44529c802a22ad67abaa84a199df7d 100644 (file)
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog.html
@@ -1,11 +1,10 @@
 ---
 layout: default
-title: Preferences Dialog
+title: Global Preferences Dialog
+menu-title: Global Preferences
 ---                        
 
-
-  
   
-<p><img src="/files/a3/a3_ardour_preferences.png" alt="ardour preferences
-dialog"/></p>
+<img src="/files/a3/a3_ardour_preferences.png" alt="ardour preferences
+dialog"/>
   

diff --git a/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html b/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html
index 4ae5abab9fc2ab08893bc2655c02dccb65f27d71..a4079923a59a914f932bffa16c769e0c9e56535f 100644 (file)
--- a/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html
+++ b/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html
@@ -1,10 +1,9 @@
 ---
 layout: default
-title: Seession Properties Dialog
+title: Session Properties Dialog
+menu-title: Session Properties
 ---                        
 
+<img src="/files/a3/a3_session_properties.png" alt="session properties dialog"  />
 
   
-  <h2>Session Properties Dialog</h2>
-<p><img src="/files/a3/a3_session_properties.png" alt="session properties dialog"  /></p>
-