From 434213bb1a0975fa93cd8f9df1cc79307f1bd7f3 Mon Sep 17 00:00:00 2001
From: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
Date: Sun, 8 Oct 2023 16:01:14 +0200
Subject: [PATCH] Remove the reference to gluing markers to musical time

---
 include/creating-location-markers.html |  7 ---
 include/creating-range-markers.html    |  7 ---
 include/cue-markers.html               |  6 ---
 include/list-of-menu-actions.html      |  1 -
 include/marker-context-menu.html       |  3 --
 include/punch-range.html               |  7 ---
 include/session-properties.html        | 69 ++++++++++++--------------
 include/the-loop-range.html            |  7 ---
 include/the-region-menu.html           |  1 -
 9 files changed, 33 insertions(+), 75 deletions(-)

diff --git a/include/creating-location-markers.html b/include/creating-location-markers.html
index dd679777..271f6a24 100644
--- a/include/creating-location-markers.html
+++ b/include/creating-location-markers.html
@@ -152,11 +152,4 @@
       This prevents a marker from being accidentally moved elsewhere.
     </td>
   </tr>
-  <tr>
-    <th>Glue to Bars and Beats</th>
-    <td>
-      When this option is enabled, the marker maintains its position in bars
-      and beats even if there are changes in tempo and meter.
-    </td>
-  </tr>
 </table>
diff --git a/include/creating-range-markers.html b/include/creating-range-markers.html
index 4439654d..8c5586bc 100644
--- a/include/creating-range-markers.html
+++ b/include/creating-range-markers.html
@@ -151,13 +151,6 @@
       maximized yet visible entirely within Ardour's window.
     </td>
   </tr>
-  <tr>
-    <th>Glue to Bars and Beats</th>
-    <td>
-      When this option is enabled, the marker maintains its position in bars
-      and beats even if there are changes in tempo and meter.
-    </td>
-  </tr>
   <tr>
     <th>Loudness Assistant…</th>
     <td>
diff --git a/include/cue-markers.html b/include/cue-markers.html
index b1ebedbc..3ce91e09 100644
--- a/include/cue-markers.html
+++ b/include/cue-markers.html
@@ -107,10 +107,4 @@
   	<td>This will move the selected cue marker to the current position of the
   	Playhead.</td>
   </tr>
-  <tr>
-  	<th>Glue to Bars and Beats</th>
-  	<td>If this option is enabled, the cue marker will maintain its position in
-  	bars and beats even if there are changes in tempo and time signature.
-  	</td>
-  </tr>
 </table>
diff --git a/include/list-of-menu-actions.html b/include/list-of-menu-actions.html
index 615a0d90..0379b48b 100644
--- a/include/list-of-menu-actions.html
+++ b/include/list-of-menu-actions.html
@@ -1012,7 +1012,6 @@
  <tr><th><kbd class="osc">Region/toggle-region-polarity</kbd></th><td>Invert Polarity</td></tr>
  <tr><th><kbd class="osc">Region/toggle-region-gain-envelope-active</kbd></th><td>Envelope Active</td></tr>
  <tr><th><kbd class="osc">Region/toggle-region-lock</kbd></th><td>Lock</td></tr>
- <tr><th><kbd class="osc">Region/toggle-region-lock-style</kbd></th><td>Glue to Bars and Beats</td></tr>
  <tr><th><kbd class="osc">Region/toggle-region-mute</kbd></th><td>Mute</td></tr>
  <tr><th><kbd class="osc">Region/toggle-region-video-lock</kbd></th><td>Lock to Video</td></tr>
  <tr><th><kbd class="osc">Region/transform-region</kbd></th><td>Transform...</td></tr>
diff --git a/include/marker-context-menu.html b/include/marker-context-menu.html
index c957f0a4..d932883f 100644
--- a/include/marker-context-menu.html
+++ b/include/marker-context-menu.html
@@ -23,9 +23,6 @@
   <tr><th>Lock</th>
   <td>If this is ticked, it will be impossible to drag the marker's
   position; useful if you want to prevent accidental movements.</td></tr>
-  <tr><th>Glue to Bars and Beats</th>
-  <td>If this is ticked, the marker will maintain its position in bars and
-  beats even if there are changes in tempo and meter.</td></tr>
   <tr><th>Remove</th>
   <td>Removes the marker. </td></tr>
 </table>
diff --git a/include/punch-range.html b/include/punch-range.html
index b63402a0..6a31ce06 100644
--- a/include/punch-range.html
+++ b/include/punch-range.html
@@ -120,13 +120,6 @@
       maximized yet visible entirely within Ardour's window.
     </td>
   </tr>
-  <tr>
-    <th>Glue to Bars and Beats</th>
-    <td>
-      When this option is enabled, the marker maintains its position in bars
-      and beats even if there are changes in tempo and meter.
-    </td>
-  </tr>
   <tr>
     <th>Loudness Assistant…</th>
     <td>
diff --git a/include/session-properties.html b/include/session-properties.html
index 38257507..7e2bc09f 100644
--- a/include/session-properties.html
+++ b/include/session-properties.html
@@ -317,6 +317,35 @@
 	</li>
 </ul>
 
+<h2 id="properties-midi">MIDI</h2>
+
+<ul>
+	<li>
+		<dfn>Draw tool creates opaque MIDI regions</dfn>: if selected, creates
+		MIDI regions that, when placed on top of other regions, don't mix with
+		content below during playback.
+	</li>
+	<li>
+		<dfn>MIDI region copies are independent</dfn>: if selected, when a MIDI
+		region is copied or duplicated, the new region is not linked to the
+		region it was copied from. If it is not selected, the copied regions
+		are linked and any editing done on one of the linked regions changes
+		all of the linked regions.
+	</li>
+	<li>
+		<dfn>Policy for handling overlapping notes on the same MIDI channel:</dfn>
+		selects how Ardour reacts to possibly conflicting MIDI notes:
+			<ul>
+				<li>never allow them</li>
+				<li>don't do anything in particular</li>
+				<li>replace any overlapped existing	notes</li>
+				<li>shorten the overlapped existing note</li>
+				<li>shorten	the overlapping new note</li>
+				<li>replace both overlapping notes with a	single note</li>
+			</ul>
+	</li>
+</ul>
+
 <h2 id="properties-misc">Misc</h2>
 
 <p>
@@ -325,44 +354,12 @@
 
 <ul>
 	<li>
-		<dfn>MIDI Options</dfn>
+		<dfn>Miscellaneous Options</dfn>
 		<ul>
 			<li>
-				<dfn>Draw tool creates opaque MIDI regions</dfn>: if selected, creates
-				MIDI regions that, when placed on top of other regions, don't mix with
-				content below during playback.
-			</li>
-			<li>
-				<dfn>MIDI region copies are independent</dfn>: if selected, when a MIDI
-				region is copied or duplicated, the new region is not linked to the
-				region it was copied from. If it is not selected, the copied regions
-				are linked and any editing done on one of the linked regions changes
-				all of the linked regions.
-			</li>
-			<li>
-				<dfn>Policy for handling overlapping notes on the same MIDI channel:</dfn>
-				selects how Ardour reacts to possibly conflicting MIDI notes:
-					<ul>
-						<li>never allow them</li>
-						<li>don't do anything in particular</li>
-						<li>replace any overlapped existing	notes</li>
-						<li>shorten the overlapped existing note</li>
-						<li>shorten	the overlapping new note</li>
-						<li>replace both overlapping notes with a	single note</li>
-					</ul>
-			</li>
-		</ul>
-	</li>
-	<li>
-		<dfn>Glue to Bars and Beats</dfn>
-		<ul>
-			<li>
-				<dfn>Glue new markers to bars and beats</dfn>: if checked, a newly
-				created marker will always be placed at the nearest musical time
-				instead of right where the mouse pointer is.
-			</li>
-			<li>
-				<dfn>Glue new regions to bars and beats</dfn>: same as above, for regions.
+				<dfn>Default time domain</dfn>: allows selecting either audio (wallclock)
+				time, or musical (beats) time. In an already opened session, this changes
+				what units various markers operate in.
 			</li>
 		</ul>
 	</li>
diff --git a/include/the-loop-range.html b/include/the-loop-range.html
index bacac13c..52d71aeb 100644
--- a/include/the-loop-range.html
+++ b/include/the-loop-range.html
@@ -152,13 +152,6 @@
       maximized yet visible entirely within Ardour's window.
     </td>
   </tr>
-  <tr>
-    <th>Glue to Bars and Beats</th>
-    <td>
-      When this option is enabled, the marker maintains its position in bars
-      and beats even if there are changes in tempo and meter.
-    </td>
-  </tr>
   <tr>
     <th>Loudness Assistant…</th>
     <td>
diff --git a/include/the-region-menu.html b/include/the-region-menu.html
index eec65f0d..67f40681 100644
--- a/include/the-region-menu.html
+++ b/include/the-region-menu.html
@@ -53,7 +53,6 @@
 		<tr><th class="sub1">Move to Original Position</th><td>Moves the region where it was initially recorded or inserted in the session</td></tr>
 		<tr><th class="sub1">Snap Position to Grid</th><td>If the Grid Mode is set to <em>Grid</em>, snaps the region to the nearest grid line</td></tr>
 		<tr><th class="sub1">&square; Lock</th><td>Locks the selected regions at their current positions in time and tracks, avoiding any movement on the timeline. The region name will be surrounded by <em>&gt;</em> and <em>&lt;</em> brackets</td></tr>
-		<tr><th class="sub1">&square; Glue to Bars and Beats</th><td>Locks the region position to relative to the musical grid, i.e. a change of tempo will move the region to keep it on the same bar/beat</td></tr>
 		<tr><th class="sub1">&square; Lock to Video</th><td>Same as above, relative to the position in the video</td></tr>
 		<tr><th class="sub1">Set Sync Position</th><td>Creates or move the Sync position, i.e. the point of the region that will be aligned or snapped to the grid, and that is (by default) the beginning of the region.</td></tr>
 		<tr><th class="sub1">Remove Sync</th><td>Removes any user defined Sync point, and resets the sync position to the beginning of the region</td></tr>