--- web/trunk/www.linuxsampler.org/documentation.html	2009/11/22 10:03:14	2033
+++ web/trunk/www.linuxsampler.org/documentation.html	2014/01/11 19:26:07	2504
@@ -145,6 +145,12 @@
 <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 </form>
+<table><tr>
+<td><a href="http://en.wikipedia.org/wiki/Bitcoin"><img src="gfx/logos/bitcoin32.png" alt="Bitcoins"></a></td>
+<td>Or donate Bitcoins at:</td>
+</tr></table>
+<pre class="btcaddr">1Q9CK7xUhMNWryqYTZLbUTXbrjpYYtwvng</pre>
+<hr>
 <a href="donations.html">Why donate?</a>
 </div>
 <p>
@@ -159,7 +165,7 @@
 //-->
 </script>
 <script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+src="//pagead2.googlesyndication.com/pagead/show_ads.js">
 </script>
 </center>
 </div>
@@ -173,6 +179,19 @@
 			This is still quite under construction. Be welcome to help us with writing some documentation!
 			</p>
 
+			<a name="sfz"></a>
+			<a name="sfz2"></a>
+			<h2>SFZ(2) format specification and implementation status</h2>
+			<p class="default">
+			We are currently in the works of a SFZ(2) format based sampler engine,
+			as additional powerful sampler engine for LinuxSampler. As there is
+			currently no official document defining the so called <i>SFZ version 2</i>
+			format, we created our own <a href="https://docs.google.com/Doc?docid=0AVrDa5LNWylnZGZ6ejk4eHRfNDVjbmsyd3Zmag">SFZ2 reference document</a>,
+			reflecting the format and the progress of implementation in LinuxSampler's
+			Subversion developers version. This reference document is currently maintained by
+			<a href="developers.html#Dahnielson">Anders Dahnielson</a>.
+			</p>
+
 			<a name="windows"></a>
 			<a name="osx"></a>
 			<a name="debian"></a>
@@ -209,6 +228,12 @@
             </td>
           </tr>
           <tr>
+            <td class="decorated"><a href="http://de.musix-wiki.org/index.php?title=LinuxSampler">Debian HOWTO (German)</a></td>
+            <td class="decorated">
+              Another guide for Debian on an external site, this one in German language.
+            </td>
+          </tr>
+          <tr>
             <td class="decorated"><a href="msys.html">Windows Build HOWTO</a></td>
             <td class="decorated">
               Guide for how to build libgig, linuxsampler and gigedit
@@ -283,16 +308,40 @@
             <td class="decorated">
               <a href="http://www.linuxsampler.org/api/draft-linuxsampler-protocol.txt">TXT</a>,
               <a href="http://www.linuxsampler.org/api/draft-linuxsampler-protocol.html">HTML</a>,
-              <a href="http://cvs.linuxsampler.org/cgi-bin/viewcvs.cgi/*checkout*/linuxsampler/Documentation/lscp.xml?rev=HEAD&content-type=text/xml">XML</a>
+              <a href="http://svn.linuxsampler.org/cgi-bin/viewvc.cgi/linuxsampler/trunk/Documentation/lscp.xml">XML</a>
             </td>
             <td class="decorated">unreleased</td>
             <td class="decorated">
               Very latest draft of the protocol (which usually reflects the
-              latest development state from CVS or may even not be implemented
+              latest development state from SVN or may even not be implemented
               yet).
             </td>
           </tr>
           <tr>
+            <td class="decorated">LSCP&nbsp;1.6</td>
+            <td class="decorated">
+              <a href="http://www.linuxsampler.org/api/lscp-1.6.txt">TXT</a>,
+              <a href="http://www.linuxsampler.org/api/lscp-1.6.html">HTML</a>,
+              <a href="http://www.linuxsampler.org/api/lscp-1.6.xml">XML</a>
+            </td>
+            <td class="decorated">2014-01-10</td>
+            <td class="decorated">
+              Protocol specification of a SVN LinuxSampler version (1.0.0.svn25 - svn r2500).
+            </td>
+          </tr>
+          <tr>
+            <td class="decorated">LSCP&nbsp;1.5</td>
+            <td class="decorated">
+              <a href="http://www.linuxsampler.org/api/lscp-1.5.txt">TXT</a>,
+              <a href="http://www.linuxsampler.org/api/lscp-1.5.html">HTML</a>,
+              <a href="http://www.linuxsampler.org/api/lscp-1.5.xml">XML</a>
+            </td>
+            <td class="decorated">2011-06-24</td>
+            <td class="decorated">
+              Protocol specification of a SVN LinuxSampler version (svn r2188).
+            </td>
+          </tr>
+          <tr>
             <td class="decorated">LSCP&nbsp;1.4</td>
             <td class="decorated">
               <a href="http://www.linuxsampler.org/api/lscp-1.4.txt">TXT</a>,
@@ -301,7 +350,7 @@
             </td>
             <td class="decorated">2009-07-31</td>
             <td class="decorated">
-              Protocol specification of the latest official release of LinuxSampler (1.0.0).
+              Protocol specification of old official LinuxSampler release v1.0.0.
             </td>
           </tr>
           <tr>
@@ -313,7 +362,7 @@
             </td>
             <td class="decorated">2007-12-06</td>
             <td class="decorated">
-              Protocol specification of the previous official release of LinuxSampler (0.5.1).
+              Protocol specification of ancient LinuxSampler release (0.5.1).
             </td>
           </tr>
           <tr>
@@ -325,7 +374,7 @@
             </td>
             <td class="decorated">2007-10-15</td>
             <td class="decorated">
-              Protocol specification old LinuxSampler release (0.5.0).
+              Protocol specification of ancient LinuxSampler release (0.5.0).
             </td>
           </tr>
           <tr>
@@ -425,8 +474,12 @@
 # connect to ALSA playback JACK client so we can hear something
 # (you can use 'GET AUDIO_OUTPUT_CHANNEL_PARAMETER INFO 0 0 JACK_BINDINGS'
 #  to get all available JACK clients / ports)
-SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 0 JACK_BINDINGS='alsa_pcm:playback_1'
-SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 1 JACK_BINDINGS='alsa_pcm:playback_2'
+SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 0 JACK_BINDINGS='system:playback_1'
+SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 1 JACK_BINDINGS='system:playback_2'
+# Note: above is for JACK2 (a.k.a. jackmp). If you are still using JACK1,
+# you would need to use this instead:
+# SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 0 JACK_BINDINGS='alsa_pcm:playback_1'
+# SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 1 JACK_BINDINGS='alsa_pcm:playback_2'
 
 # load the ALSA MIDI driver
 CREATE MIDI_INPUT_DEVICE ALSA
@@ -453,7 +506,7 @@
 			It shows how to setup a more realistic sampler session, handle routing of MIDI input channels,
 			handle routing of audio channels, it uses JACK again as audio
 			output driver, but creates the JACK client with four output channels instead, it creates two
-			sampler channels, loads two different instrument on those two sampler channels and alters
+			sampler channels, loads two different instruments on those two sampler channels and alters
 			the audio channel routing so that the two output channels of sampler channel 1 are routed to
 			the first two JACK output channels and the two output channels of sampler channel 2 are routed
 			the second pair of the JACK client's output channels. That way you could e.g. record the output
@@ -501,10 +554,12 @@
 
 # automatic connection between the four 4 ports of LS's Jack client and the
 # ALSA PCM JACK client (assuming your sound card has at least 4 outputs ;-)
-SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 0 JACK_BINDINGS='alsa_pcm:playback_1'
-SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 1 JACK_BINDINGS='alsa_pcm:playback_2'
-SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 2 JACK_BINDINGS='alsa_pcm:playback_3'
-SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 3 JACK_BINDINGS='alsa_pcm:playback_4'
+# (assumimg JACK2 a.k.a. jackmp here, if you are still using JACK1 then
+#  you have to replace "system" by "alsa_pcm" here)
+SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 0 JACK_BINDINGS='system:playback_1'
+SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 1 JACK_BINDINGS='system:playback_2'
+SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 2 JACK_BINDINGS='system:playback_3'
+SET AUDIO_OUTPUT_CHANNEL_PARAMETER 0 3 JACK_BINDINGS='system:playback_4'
 
 # not necessary, just to see our setup
 GET CHANNEL INFO 0