diff --git a/build.py b/build.py
index e427623a..144760df 100755
--- a/build.py
+++ b/build.py
@@ -22,7 +22,7 @@ import argparse
 # This matches all *non* letter/number, ' ', '.', '-', and '_' chars
 cleanString = re.compile(r'[^a-zA-Z0-9 \._-]+')
 # This matches new 'unbreakable' links, up to the closing quote or anchor
-findLinks = re.compile(r'@@[^#"]*')
+findLinks = re.compile(r'"@@[^#"]*"')
 githuburl = 'https://github.com/Ardour/manual/edit/master/include/'
 
 #
@@ -257,7 +257,7 @@ def FindInternalLinks(fs):
 
 	for hdr in fs:
 		if 'link' in hdr:
-			linkDict['@@' + hdr['link']] = '/' + hdr['filename'] + '/'
+			linkDict['"@@' + hdr['link'] + '"'] = '"/' + hdr['filename'] + '/"'
 
 	return linkDict
 
diff --git a/include/osc58-feedback-and-strip-types-values.html b/include/osc58-feedback-and-strip-types-values.html
index e19a4374..b6aba35b 100644
--- a/include/osc58-feedback-and-strip-types-values.html
+++ b/include/osc58-feedback-and-strip-types-values.html
@@ -5,7 +5,7 @@
   to turn various kinds of feedback on or off or to determine which
   kinds of strips are currently viewed/controlled.
 </p>
-<p>Both ,<em>feedback</em> and <em>strip-types</em> use bitsets to keep
+<p>Both <em>feedback</em> and <em>strip-types</em> use bitsets to keep
   track what they are doing. Any number in a computer is made out of
   bits that are on or off, but we represent them as normal base 10
   numbers. Any one bit turned on will add a unique value to the
diff --git a/master-doc.txt b/master-doc.txt
index 80e35c44..006ffaaa 100644
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -229,6 +229,15 @@ uri: setting-up-your-system/using_more_than_one_audio_device
 part: subchapter
 ---
 
+---
+title: Monitor Setup in Ardour
+menu_title: Monitor Setup in Ardour
+include: monitor-setup-in-ardour.html
+link: monitor-setup-in-ardour
+uri: recording/monitoring/monitor-setup-in-ardour
+part: subchapter
+---
+
 
 ---
 title: Synchronization
@@ -1164,15 +1173,6 @@ uri: recording/monitoring/monitor-signal-flow
 part: subchapter
 ---
 
----
-title: Monitor Setup in Ardour
-menu_title: Setup in Ardour
-include: monitor-setup-in-ardour.html
-link: monitor-setup-in-ardour
-uri: recording/monitoring/monitor-setup-in-ardour
-part: subchapter
----
-
 ---
 title: Punch Recording Modes
 include: punch-recording-modes.html