Merge branch 'master' of git.ardour.org:ardour/manual

diff --git a/_manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html b/_manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html
index 85db871a7f53e7194697d7576003ff858708e88e..95a7fdd53941f77ceb54cc22804534392622c12f 100644 (file)
--- a/_manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html
+++ b/_manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html
@@ -1,39 +1,37 @@
----
-layout: default
-title: The Right Computer System for Digital Audio
----                        
-
-
-  
-  
-<p>It would be nice to think that you could just go and buy any computer, install a bit of software on it and start using it to record and create music. This idea isn't wrong, but there some important details that it misses. </p>
-<p>Any computer that you can buy today (somewhere around the end of 2012) is capable of recording and processing a lot of audio data. It will come with a builtin audio interface that can accept inputs from microphones or electrical instruments. It will have a disk with a huge amount of space for storing audio files. </p>
-<p>When you are recording, editing and mixing music, you generally want to work with very little delay between the time that a sound is generated and when you can hear it. When the audio signal flows through a computer, that means that the computer has to be able to receive the signal, process it and send it back out again as fast as possible. And that is where it becomes very important <em>what</em> computer system you have, because it is <strong>absolutely not</strong> the case that any computer can do this job well. </p>
-<p>Routing audio through a computer will always cause some delay, but if it is small, you will generally never notice it.  There are also ways to work in which the delay does not matter at all (for example, not sending the output from the computer to speakers).</p>
-<p>The delay or "latency" that you want for working with digital audio is more typically in the 1-5msec range. For comparison, if you are sitting 1m (3ft) from your speakers, the time the sound takes to reach your ears is about 3msec. Any modern computer can limit the delay to 100msec. Most can keep it under 50msec. Many will be able to get down to 10msec without too much effort. If you try to reduce the delay on a computer that cannot meet your goal, you will get clicks and glitches in the audio, which is clearly extremely undesirable.</p>
-<p>Many, many things can affect the lowest latency that a computer can support.</p>
-<h3>Hardware-related Considerations</h3>
-<dl class="wide-table">
-<dt>Video interface
-</dt>
-<dd>Poorly engineered video interfaces (and/or their device drivers) can "steal" computer resources for a long time, preventing the audio interface from keeping up with the flow of data</dd>
-<dt>Wireless interface
-</dt>
-<dd>Poorly engineered wireless networking interfaces (and/or their device drivers) can also block the audio interface from keeping up with the flow of data</dd>
-<dt>USB ports
-</dt>
-<dd>If you are using an audio interface connected via USB, and sometimes even if you are not, the precise configuration of your system's USB ports can make a big difference. There are many cases where plugging the interface into one port will work, but using different USB port results in much worse performance. This has been seen even on Apple systems.</dd>
-<dt>CPU speed control
-</dt>
-<dd>Handling audio with low latency requires that your processor keeps running at its best performance (speed) at all times. Many portable systems try to regulate processor speed in order to save power - for low latency audio, you want this totally disabled, either in the BIOS or at the OS level</dd>
-<dt>Excessive Interrupt Sharing</dt>
-<dd>If your audio interface is forced by your computer to share an "interrupt line" (basically a way to tell the CPU that something needs its attention) with too many, or the wrong, other devices, this can also prevent the audio interface from keeping up with the flow of data. In laptops it is generally impossible to do anything about this. In many desktop systems, it is possible at the BIOS level to reassign interrupts to workaround the problem.</dd>
-<dt>System Management Interrupts (SMIs)
-</dt>
-<dd>SMIs are interrupts sent by the motherboard to tell the computer about the state of various hardware. They cannot be (safely) disabled, but they can also take a (relatively) long time to process. It is better to have a motherboard which never sends SMIs at all - this is also a requirement for realtime stock trading systems, which have similar issues with latency.</dd>
-<dt>Excessive (bass) vibration
-</dt>
-<dd>This doesn't affect the flow of data to/from the audio interface, but it can cause the flow of data to/from your disk storage to become <em>much</em> slower. If you are going to use a computer in an environment with live sound, make sure to place it so that the disk is not subject to noticeable bass vibration. What actually happens is that the vibrations cause the mechanism inside the disk to detect read errors, and this forces a retry of the reading from the disk itself. Retrying over and over massively reduces the rate at which data can be read from the disk. Avoid this.</dd>
-</dl>
-<p>  </p>
-<!-- remove if more text is added below --><!-- remove if more text is added below -->  
+---\r
+layout: default\r
+title: The Right Computer System for Digital Audio\r
+menu_title: The Right Computer System\r
+---                        \r
+\r
+<p>It would be nice to think that you could just go and buy any computer, install a bit of software on it and start using it to record and create music. This idea isn't wrong, but there some important details that it misses. </p>\r
+<p>Any computer that you can buy today (somewhere around the end of 2012) is capable of recording and processing a lot of audio data. It will come with a builtin audio interface that can accept inputs from microphones or electrical instruments. It will have a disk with a huge amount of space for storing audio files. </p>\r
+<p>When you are recording, editing and mixing music, you generally want to work with very little delay between the time that a sound is generated and when you can hear it. When the audio signal flows through a computer, that means that the computer has to be able to receive the signal, process it and send it back out again as fast as possible. And that is where it becomes very important <em>what</em> computer system you have, because it is <strong>absolutely not</strong> the case that any computer can do this job well. </p>\r
+<p>Routing audio through a computer will always cause some delay, but if it is small, you will generally never notice it.  There are also ways to work in which the delay does not matter at all (for example, not sending the output from the computer to speakers).</p>\r
+<p>The delay or "latency" that you want for working with digital audio is more typically in the 1-5msec range. For comparison, if you are sitting 1m (3ft) from your speakers, the time the sound takes to reach your ears is about 3msec. Any modern computer can limit the delay to 100msec. Most can keep it under 50msec. Many will be able to get down to 10msec without too much effort. If you try to reduce the delay on a computer that cannot meet your goal, you will get clicks and glitches in the audio, which is clearly extremely undesirable.</p>\r
+<p>Many, many things can affect the lowest latency that a computer can support.</p>\r
+<h3>Hardware-related Considerations</h3>\r
+<dl class="wide-table">\r
+<dt>Video interface\r
+</dt>\r
+<dd>Poorly engineered video interfaces (and/or their device drivers) can "steal" computer resources for a long time, preventing the audio interface from keeping up with the flow of data</dd>\r
+<dt>Wireless interface\r
+</dt>\r
+<dd>Poorly engineered wireless networking interfaces (and/or their device drivers) can also block the audio interface from keeping up with the flow of data</dd>\r
+<dt>USB ports\r
+</dt>\r
+<dd>If you are using an audio interface connected via USB, and sometimes even if you are not, the precise configuration of your system's USB ports can make a big difference. There are many cases where plugging the interface into one port will work, but using different USB port results in much worse performance. This has been seen even on Apple systems.</dd>\r
+<dt>CPU speed control\r
+</dt>\r
+<dd>Handling audio with low latency requires that your processor keeps running at its best performance (speed) at all times. Many portable systems try to regulate processor speed in order to save power - for low latency audio, you want this totally disabled, either in the BIOS or at the OS level</dd>\r
+<dt>Excessive Interrupt Sharing</dt>\r
+<dd>If your audio interface is forced by your computer to share an "interrupt line" (basically a way to tell the CPU that something needs its attention) with too many, or the wrong, other devices, this can also prevent the audio interface from keeping up with the flow of data. In laptops it is generally impossible to do anything about this. In many desktop systems, it is possible at the BIOS level to reassign interrupts to workaround the problem.</dd>\r
+<dt>System Management Interrupts (SMIs)\r
+</dt>\r
+<dd>SMIs are interrupts sent by the motherboard to tell the computer about the state of various hardware. They cannot be (safely) disabled, but they can also take a (relatively) long time to process. It is better to have a motherboard which never sends SMIs at all - this is also a requirement for realtime stock trading systems, which have similar issues with latency.</dd>\r
+<dt>Excessive (bass) vibration\r
+</dt>\r
+<dd>This doesn't affect the flow of data to/from the audio interface, but it can cause the flow of data to/from your disk storage to become <em>much</em> slower. If you are going to use a computer in an environment with live sound, make sure to place it so that the disk is not subject to noticeable bass vibration. What actually happens is that the vibrations cause the mechanism inside the disk to detect read errors, and this forces a retry of the reading from the disk itself. Retrying over and over massively reduces the rate at which data can be read from the disk. Avoid this.</dd>\r
+</dl>\r
+<p>  </p>\r
+<!-- remove if more text is added below --><!-- remove if more text is added below -->
\ No newline at end of file

diff --git a/_manual/08_working-with-regions.html b/_manual/08_working-with-regions.html
index 38e21fcb0cb628df28dd58d03d4604d42ef17453..d06c47f686ca16425652e9801b154276bb62db03 100644 (file)
--- a/_manual/08_working-with-regions.html
+++ b/_manual/08_working-with-regions.html
@@ -1,11 +1,11 @@
 ---
 layout: default
-title: Working WIth Regions
+title: Working With Regions
 ---                        
 
 
   
-  <h2>Working Witth Regions</h2>
+  <h2>Working With Regions</h2>
 <p>Regions are the basic elements of editing and composing in Ardour. In most cases, a region represents a single contiguous section of one or more media files. Regions are defined by a fixed set of attributes:</p>
 <ul>
 <li>the source audio/MIDI file(s) they represent

diff --git a/_manual/10_working-with-tracks.html b/_manual/10_working-with-tracks.html
index 3a2f0ef65400c6e46b560e384e5d477839233cda..861466f53fcbb6357091f387ef2fdb82e1eb56fc 100644 (file)
--- a/_manual/10_working-with-tracks.html
+++ b/_manual/10_working-with-tracks.html
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Working with Tracks
+title: Working With Tracks
 ---                        
 
 

diff --git a/_manual/11_working-with-plugins.html b/_manual/11_working-with-plugins.html
index e56adf5ae160987a84139d8256a23739212f2d2d..d36b03eb0d92db2b7888131415d270621ca128b2 100644 (file)
--- a/_manual/11_working-with-plugins.html
+++ b/_manual/11_working-with-plugins.html
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Working with Plugins
+title: Working With Plugins
 ---                        
 
 

diff --git a/_manual/15_editing-and-arranging/10_stripping-siience-from-audio-regions.html b/_manual/15_editing-and-arranging/10_stripping-siience-from-audio-regions.html
index 15717717f5282ed7d929a31940cf25de198eb54f..b0d5d27c5c94ad8253e239f89b0ba1e8643c7bfa 100644 (file)
--- a/_manual/15_editing-and-arranging/10_stripping-siience-from-audio-regions.html
+++ b/_manual/15_editing-and-arranging/10_stripping-siience-from-audio-regions.html
@@ -1,6 +1,7 @@
 ---
 layout: default
-title: Stripping SiIence from Audio Regions
+title: Stripping Silence from Audio Regions
+menu_title: Stripping Silence
 ---                        
 
 

diff --git a/source/_layouts/bootstrap.html b/source/_layouts/bootstrap.html
index c49167114a9adba937827789b2934cb5e19ed09c..f2e93967a344a656bf7a4c2bfdeac9bc4d771166 100644 (file)
--- a/source/_layouts/bootstrap.html
+++ b/source/_layouts/bootstrap.html
@@ -45,12 +45,19 @@ page_title: The Ardour Manual
     <div class="container-fluid">
         <div class="row-fluid">
             <div id="tree">
-                <h1 class="title"><a href="/"><img src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
-                {% tree %}
+                <div id="tree-inner">
+                    <h1 class="title"><a href="/"><img src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
+                    {% tree %}
+                </div>
             </div>
             <div class="span12" id="content">
-                <h1 class="title">{{ page.title }}</h1>
-                {{ content }}
+                <div id="search">
+                    <gcse:search></gcse:search>
+                </div>
+                <div id="content-main">
+                    <h1 class="title">{{ page.title }}</h1>
+                    {{ content }}
+                </div>
             </div>
         </div>
     </div>
@@ -79,6 +86,18 @@ page_title: The Ardour Manual
         }
 
     </script>
+
+    <script>
+        (function() {
+          var cx = '011950134405426689607:2lg2y9xgf3a';
+          var gcse = document.createElement('script'); gcse.type = 'text/javascript';
+          gcse.async = true;
+          gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+              '//www.google.com/cse/cse.js?cx=' + cx;
+          var s = document.getElementsByTagName('script')[0];
+          s.parentNode.insertBefore(gcse, s);
+        })();
+    </script>
   
     </body>
 </html>

diff --git a/source/css/app.css b/source/css/app.css
index 747ecbe335419431ec2c0b72e5d318c7bd12a6bd..a4f54614adbae221146058866bc293834b93b6de 100644 (file)
--- a/source/css/app.css
+++ b/source/css/app.css
@@ -1,6 +1,5 @@
 #tree {
-    padding: 20px; 
-    padding-bottom: 80px;
+ 
   background-color: #eee;
   height: 100%;
   overflow: scroll;
@@ -11,6 +10,10 @@
   width: 300px;
 }
 
+#tree-inner {
+    padding: 15px 20px 30px 30px;  
+}
+
 #tree h1.title {
   font-size: 28px;
   margin-bottom: 20px;
@@ -47,11 +50,20 @@
 }
 
 
+#search {
+  height: 70px;
+}
+
 #content {
-    padding: 70px 30px 30px 360px;
+    padding: 10px 30px 30px 350px;
     margin-left: 0;
 }
 
+#content-main {
+  padding-top: 10px;
+  padding-left: 10px;
+}
+
 #content p,
 #content li,
 #content dt,
@@ -311,6 +323,13 @@
 
 
 
+#gs_tti0 {
+
+  padding-top: 2px;
+  padding-bottom: 0;
+
+}
+