Merge branch 'master' into doc-brackets

doc/2-interface/asset-list.md

@@ -17,7 +17,7 @@ Buttons from left to right:
 ![instruments window in folder view](instruments-folder.png)
 
 In folder view, the "Move up" and "Move down buttons disappear and a new one appears:
-- **New Folder**: Creates a new folder.
+- **New folder**: Creates a new folder.
 
 Instruments may be dragged from folder to folder and even rearranged within folders without changing their associated numbers.
 

doc/4-instrument/README.md

@@ -15,18 +15,18 @@ depending on the instrument type, there are currently 13 different types of an i
 - [FM synthesis](fm.md) - for use with YM2612, YM2151 and FM block portion of YM2610.
 - [Standard](standard.md) - for use with NES and Sega Master System's PSG sound source and its derivatives. 
 - [Game Boy](game-boy.md) - for use with Game Boy APU.
-- [PC Engine/TurboGrafx-16](pce.md) - for use with PC Engine's wavetable synthesizer.
+- [PC Engine / TurboGrafx-16](pce.md) - for use with PC Engine's wavetable synthesizer.
 - [WonderSwan](wonderswan.md) - for use with WonderSwan's wavetable synthesizer.
 - [AY8930](8930.md) - for use with Microchip AY8930 E-PSG sound source.
 - [Commodore 64](c64.md) - for use with Commodore 64 SID.
 - [SAA1099](saa.md) - for use with Philips SAA1099 PSG sound source.
 - [TIA](tia.md) - for use with Atari 2600 chip.
 - [AY-3-8910](ay8910.md) - for use with AY-3-8910 PSG sound source and SSG portion in YM2610.
-- [Amiga/sample](amiga.md) for controlling Amiga and other sample based synthsizers like YM2612's Channel 6 PCM mode, NES channel 5, Sega PCM, X1-010 and PC Engine's sample playback mode.
+- [Amiga / sample](amiga.md) for controlling Amiga and other sample based synthsizers like YM2612's Channel 6 PCM mode, NES channel 5, Sega PCM, X1-010 and PC Engine's sample playback mode.
 - [Atari Lynx](lynx.md) - for use with Atari Lynx handheld console.
 - [VERA](vera.md) - for use with Commander X16 VERA.
 - [Seta/Allumer X1-010](x1_010.md) - for use with Wavetable portion in Seta/Allumer X1-010.
-- [Konami SCC/Bubble System WSG](scc.md) - for use with Konami SCC and Wavetable portion in Bubble System's sound hardware.
+- [Konami SCC / Bubble System WSG](scc.md) - for use with Konami SCC and Wavetable portion in Bubble System's sound hardware.
 - [Namco 163](n163.md) - for use with Namco 163.
 - [Konami VRC6](vrc6.md) - for use with VRC6's PSG sound source.
 
@@ -77,14 +77,15 @@ Finally, the sequence of values can be directly edited in the text box at the bo
 
 ![ADSR macro editor](macro-ADSR.png)
 
-- **Bottom** and **Top** determine the range of values generated by the macro. (Bottom can be larger than Top to invert the envelope!) All generated values will fall between these two points.
-- **Attack** is how quickly the value goes from Bottom to Top. A 0 means nothing will change; a 255 instantly jumps to the Top value.
-- **Hold** sets how many ticks the note will wait at Top before decay.
-- **Decay** is how quickly the value moves to the Sustain level.
-- **Sustain** is the where the value will stay while the note is held until SusTime has passed.
-- **SusTime** is how many ticks until SusDecay.
-- **SusDecay** is the rate at which the value moves toward Bottom while the note is held.
-- **Release** is the rate at which the value moves toward Bottom after the note is released.
+- **Bottom** and **Top** determine the range of outputs generated by the macro. (Bottom can be larger than Top to invert the envelope!) All outputs will be between these two values.
+- Attack, Decay, Sustain, SusDecay, and Release accept inputs between 0 to 255. These are scaled to the distance between Bottom and Top.
+- **Attack** is how much the value moves toward Top with each tick.
+- **Hold** sets how many ticks to stay at Top before Decay.
+- **Decay** is how much the value moves to the Sustain level.
+- **Sustain** is how far from Bottom the value stays while the note is held.
+- **SusTime** is how many ticks to stay at Sustain until SusDecay.
+- **SusDecay** is how much the value moves toward Bottom with each tick while the note is held.
+- **Release** is how much the value moves toward Bottom with each tick after the note is released.
 
 ![macro ADSR chart](macro-ADSRchart.png)