diff --git a/conf/radios/GRAUPNER-JRX-412.xml b/conf/radios/GRAUPNER-JRX-412.xml
index 8976b7f5d5..795c811e5c 100644
--- a/conf/radios/GRAUPNER-JRX-412.xml
+++ b/conf/radios/GRAUPNER-JRX-412.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/OSAMT7cap.xml b/conf/radios/OSAMT7cap.xml
index 30a893c0e2..728b24d3c7 100644
--- a/conf/radios/OSAMT7cap.xml
+++ b/conf/radios/OSAMT7cap.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-  
+
 <!DOCTYPE radio SYSTEM "radio.dtd">
 <radio name="OSAMT7cap" data_min="900" data_max="2100" sync_min="5500" sync_max="13500" pulse_type="POSITIVE">
   <channel ctl="right_stick_horiz" function="ROLL" min="1100" neutral="1500" max="1930" average="0"/>
   <channel ctl="right_stick_vert" function="PITCH" min="1930" neutral="1500" max="1100" average="0"/>
-  <channel ctl="left_stick_vert" function="THROTTLE" min="1100" neutral="1100" max="1930" average="0"/> 
+  <channel ctl="left_stick_vert" function="THROTTLE" min="1100" neutral="1100" max="1930" average="0"/>
   <channel ctl="left_stick_horiz" function="YAW" min="1100" neutral="1500" max="1930" average="0"/>
   <channel ctl="switch_D" function="CALIB" min="1100" neutral="1500" max="1930" average="10"/>
   <channel ctl="dial1" function="GAIN1" min="1100" neutral="1500" max="1930" average="10"/>
   <channel ctl="switch_G" function="MODE" min="1100" neutral="1500" max="1930" average="10"/>
 </radio>
-<!-- Please use only if you now what your doing-->  
+<!-- Please use only if you now what your doing-->
diff --git a/conf/radios/R6107SP_7ch.xml b/conf/radios/R6107SP_7ch.xml
index 1886310cfa..a4d2643226 100644
--- a/conf/radios/R6107SP_7ch.xml
+++ b/conf/radios/R6107SP_7ch.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -30,12 +30,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/R617FS_5ch_neg.xml b/conf/radios/R617FS_5ch_neg.xml
index c368ca499b..64fc71b981 100644
--- a/conf/radios/R617FS_5ch_neg.xml
+++ b/conf/radios/R617FS_5ch_neg.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -30,12 +30,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/T6EXAP.xml b/conf/radios/T6EXAP.xml
index 0922068a04..a675168717 100644
--- a/conf/radios/T6EXAP.xml
+++ b/conf/radios/T6EXAP.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/T6EXAP_2.xml b/conf/radios/T6EXAP_2.xml
index d9f90595c2..a54b753fd7 100644
--- a/conf/radios/T6EXAP_2.xml
+++ b/conf/radios/T6EXAP_2.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/T7cap.xml b/conf/radios/T7cap.xml
index cd6017688b..c95e06f96a 100644
--- a/conf/radios/T7cap.xml
+++ b/conf/radios/T7cap.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-  
+
 <!DOCTYPE radio SYSTEM "radio.dtd">
 <radio name="T7cap" data_min="900" data_max="2100" sync_min="5500" sync_max="13500" pulse_type="POSITIVE">
   <channel ctl="right_stick_horiz" function="ROLL" min="1930" neutral="1500" max="1100" average="0"/>
   <channel ctl="right_stick_vert" function="PITCH" min="1100" neutral="1500" max="1930" average="0"/>
-  <channel ctl="left_stick_vert" function="THROTTLE" min="1930" neutral="1930" max="1100" average="0"/> 
+  <channel ctl="left_stick_vert" function="THROTTLE" min="1930" neutral="1930" max="1100" average="0"/>
   <channel ctl="left_stick_horiz" function="YAW" min="1100" neutral="1500" max="1930" average="0"/>
   <channel ctl="switch_D" function="CALIB" min="1100" neutral="1500" max="1930" average="10"/>
   <channel ctl="dial1" function="GAIN1" min="1100" neutral="1500" max="1930" average="10"/>
diff --git a/conf/radios/T7chp.xml b/conf/radios/T7chp.xml
index 82fc0b02fa..3b52880368 100644
--- a/conf/radios/T7chp.xml
+++ b/conf/radios/T7chp.xml
@@ -1,13 +1,12 @@
 
-  
+
 <!DOCTYPE radio SYSTEM "radio.dtd">
 <radio name="T7chp" data_min="900" data_max="2100" sync_min="5000" sync_max="15000" pulse_type="POSITIVE">
   <channel ctl="right_stick_horiz" function="ROLL" min="1939" neutral="1525" max="1114" average="0"/>
   <channel ctl="right_stick_vert" function="PITCH" min="1112" neutral="1518" max="1937" average="0"/>
-  <channel ctl="left_stick_vert" function="THROTTLE" min="1940" neutral="1940" max="1115" average="0"/> 
+  <channel ctl="left_stick_vert" function="THROTTLE" min="1940" neutral="1940" max="1115" average="0"/>
   <channel ctl="left_stick_horiz" function="YAW" min="1940" neutral="1520" max="1115" average="0"/>
   <channel ctl="switch_E" function="MODE" min="966" neutral="1526" max="2079" average="10"/>
   <channel ctl="switch_G" function="CALIB" min="2080" neutral="1525" max="969" average="10"/>
   <channel ctl="VRA" function="GAIN1" min="970" neutral="970" max="2078" average="10"/>
 </radio>
-  
diff --git a/conf/radios/T9cap.xml b/conf/radios/T9cap.xml
index 32a842ecf2..a2c976242e 100644
--- a/conf/radios/T9cap.xml
+++ b/conf/radios/T9cap.xml
@@ -1,14 +1,13 @@
 
-  
+
 <!DOCTYPE radio SYSTEM "radio.dtd">
 <radio name="T9cap" data_min="900" data_max="2100" sync_min="5000" sync_max="15000" pulse_type="POSITIVE">
   <channel ctl="right_stick_horiz" function="ROLL" min="1939" neutral="1525" max="1114" average="0"/>
   <channel ctl="right_stick_vert" function="PITCH" min="1112" neutral="1518" max="1937" average="0"/>
-  <channel ctl="left_stick_vert" function="THROTTLE" min="1940" neutral="1940" max="1115" average="0"/> 
+  <channel ctl="left_stick_vert" function="THROTTLE" min="1940" neutral="1940" max="1115" average="0"/>
   <channel ctl="left_stick_horiz" function="YAW" min="1940" neutral="1498" max="1115" average="0"/>
   <channel ctl="switch_G" function="CALIB" min="2080" neutral="1525" max="969" average="10"/>
   <channel ctl="VRA" function="GAIN1" min="970" neutral="1520" max="2078" average="10"/>
   <channel ctl="VRC" function="GAIN2" min="970" neutral="1518" max="2077" average="10"/>
   <channel ctl="switch_C" function="MODE" min="2079" neutral="1526" max="966" average="10"/>
 </radio>
-  
diff --git a/conf/radios/aron.xml b/conf/radios/aron.xml
index bbe2d2f4a8..e3b1dc93b6 100644
--- a/conf/radios/aron.xml
+++ b/conf/radios/aron.xml
@@ -1,13 +1,12 @@
 
-  
+
 <!DOCTYPE radio SYSTEM "radio.dtd">
 <radio name="T9cap" data_min="900" data_max="2100" sync_min="5000" sync_max="15000" pulse_type="POSITIVE">
-	<channel ctl="switch_E" function="MODE" min="966" neutral="1526" max="2079" average="10"/>	
+	<channel ctl="switch_E" function="MODE" min="966" neutral="1526" max="2079" average="10"/>
 	<channel ctl="switch_G" function="DISABLE" min="2080" neutral="1525" max="969" average="10"/>
   <channel ctl="left_stick_horiz" function="YAW" min="1115" neutral="1520" max="1940" average="0"/>
   <channel ctl="right_stick_vert" function="PITCH" min="1937" neutral="1518" max="1112" average="0"/>
   <channel ctl="right_stick_horiz" function="ROLL" min="1114" neutral="1525" max="1939" average="0"/>
-  <channel ctl="left_stick_vert" function="THROTTLE" min="1115" neutral="1115" max="1940" average="0"/> 
-  
+  <channel ctl="left_stick_vert" function="THROTTLE" min="1115" neutral="1115" max="1940" average="0"/>
+
 </radio>
-  
diff --git a/conf/radios/cockpitMM.xml b/conf/radios/cockpitMM.xml
index ff162a564c..ff9c4e1671 100644
--- a/conf/radios/cockpitMM.xml
+++ b/conf/radios/cockpitMM.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/cockpitSX.xml b/conf/radios/cockpitSX.xml
index dd4839c96b..0496a207f0 100644
--- a/conf/radios/cockpitSX.xml
+++ b/conf/radios/cockpitSX.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -32,12 +32,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/eric_DX7wAR6110e.xml b/conf/radios/eric_DX7wAR6110e.xml
index 3de1d96c84..8b1f41c7d7 100644
--- a/conf/radios/eric_DX7wAR6110e.xml
+++ b/conf/radios/eric_DX7wAR6110e.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/eric_DX7wAR7000.xml b/conf/radios/eric_DX7wAR7000.xml
index 8585767333..92ca64429a 100644
--- a/conf/radios/eric_DX7wAR7000.xml
+++ b/conf/radios/eric_DX7wAR7000.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/eric_PCM9XwAR7000.xml b/conf/radios/eric_PCM9XwAR7000.xml
index 65a51774da..30ca10c3fc 100644
--- a/conf/radios/eric_PCM9XwAR7000.xml
+++ b/conf/radios/eric_PCM9XwAR7000.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/fc16.xml b/conf/radios/fc16.xml
index fe9c1498f1..897e905a20 100644
--- a/conf/radios/fc16.xml
+++ b/conf/radios/fc16.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -30,12 +30,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/fc28.xml b/conf/radios/fc28.xml
index 864590b836..ee1877e811 100644
--- a/conf/radios/fc28.xml
+++ b/conf/radios/fc28.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
@@ -58,4 +57,3 @@
   <channel ctl="H" function="LLS"      min="1000" neutral="1600" max="2200" average="10"/>
   <channel ctl="I" function="CALIB"    min="1000" neutral="1600" max="2200" average="10"/>
 </radio>
-  
diff --git a/conf/radios/generic_tm.xml b/conf/radios/generic_tm.xml
index b35b928b6f..065774c3f9 100644
--- a/conf/radios/generic_tm.xml
+++ b/conf/radios/generic_tm.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
@@ -57,4 +56,3 @@
   <channel ctl="H" function="MODE"     min="1000" neutral="1500" max="2000" average="1"/>
   <channel ctl="I" function="SWITCH2"  min="1000" neutral="1500" max="2000" average="1"/>
 </radio>
-  
diff --git a/conf/radios/jrxp9303.xml b/conf/radios/jrxp9303.xml
index a30d1c7de7..b9461042a4 100644
--- a/conf/radios/jrxp9303.xml
+++ b/conf/radios/jrxp9303.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/mc20.xml b/conf/radios/mc20.xml
index 270319cb99..b16816e465 100644
--- a/conf/radios/mc20.xml
+++ b/conf/radios/mc20.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -30,12 +30,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/mc22.xml b/conf/radios/mc22.xml
index 43adfdd64a..267900ed15 100644
--- a/conf/radios/mc22.xml
+++ b/conf/radios/mc22.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -30,12 +30,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
@@ -53,4 +52,4 @@ Note: a command may be reversed by exchanging min and max values
   <channel ctl="G" function="TILT" min="1100" neutral="1500" max="1900" average="0"/>     <!-- left switch -->
   <channel ctl="H" function="GENERAL1" min="1100" neutral="1500" max="1900" average="10"/>     <!-- left switch -->
   <channel ctl="I" function="GENERAL2" min="1100" neutral="1500" max="1900" average="10"/>     <!-- left switch -->
-</radio>	
+</radio>
diff --git a/conf/radios/mc24.xml b/conf/radios/mc24.xml
index 0ea0d6de06..c4de73a3b6 100644
--- a/conf/radios/mc24.xml
+++ b/conf/radios/mc24.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
@@ -57,4 +56,3 @@
   <channel ctl="H" function="MODE"  min="966" neutral="1500" max="2025" average="1"/>
   <channel ctl="I" function="SWITCH2"  min="1096" neutral="1500" max="1900" average="1"/>
 </radio>
-  
diff --git a/conf/radios/mc24_j.xml b/conf/radios/mc24_j.xml
index 8c65a4e5dc..06d809ed08 100644
--- a/conf/radios/mc24_j.xml
+++ b/conf/radios/mc24_j.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
@@ -57,4 +56,3 @@
   <channel ctl="H" function="MODE"  min="966" neutral="1500" max="2025" average="1"/>
   <channel ctl="I" function="SWITCH2"  min="1096" neutral="1500" max="1900" average="1"/>
 </radio>
-  
diff --git a/conf/radios/mc24r.xml b/conf/radios/mc24r.xml
index 05b3bb7e1a..0c350e7607 100644
--- a/conf/radios/mc24r.xml
+++ b/conf/radios/mc24r.xml
@@ -19,7 +19,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -32,12 +32,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
@@ -56,4 +55,3 @@
   <channel ctl="E" function="GAIN1"    min="1096" neutral="1500" max="1900" average="1"/>
   <channel ctl="F" function="CALIB"    min="1096" neutral="1500" max="1900" average="0"/>
 </radio>
-  
diff --git a/conf/radios/mc3030.xml b/conf/radios/mc3030.xml
index 4b7926fdd4..9068c6c616 100644
--- a/conf/radios/mc3030.xml
+++ b/conf/radios/mc3030.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
@@ -57,4 +56,3 @@
   <channel ctl="H" function="SWITCH1"  min="1000" neutral="1600" max="2200" average="1"/>
   <channel ctl="I" function="CALIB"    min="1000" neutral="1600" max="2200" average="1"/>
 </radio>
-  
diff --git a/conf/radios/spektrum.xml b/conf/radios/spektrum.xml
index 4e8fcd9d40..70a16490e7 100644
--- a/conf/radios/spektrum.xml
+++ b/conf/radios/spektrum.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/vanguard.xml b/conf/radios/vanguard.xml
index da0eeb4250..33433e1492 100644
--- a/conf/radios/vanguard.xml
+++ b/conf/radios/vanguard.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
diff --git a/conf/radios/x412.xml b/conf/radios/x412.xml
index 100d80fbf7..57a683b4a8 100644
--- a/conf/radios/x412.xml
+++ b/conf/radios/x412.xml
@@ -18,7 +18,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with paparazzi; see the file COPYING.  If not, write to
 -- the Free Software Foundation, 59 Temple Place - Suite 330,
--- Boston, MA 02111-1307, USA.  
+-- Boston, MA 02111-1307, USA.
 -->
 
 <!--
@@ -31,12 +31,11 @@
 -- min, max and sync are expressed in micro-seconds
 -->
 
-<!-- 
+<!--
 -- Attributes of channel tag :
 -- ctl: name of the command on the transmitter - only for displaying
--- no: order in the PPM frame
 -- function: logical command
--- averaged: channel filtered through several frames (for discrete commands)
+-- average: (boolean) channel filtered through several frames (for discrete commands)
 -- min: minimum pulse length (micro-seconds)
 -- max: maximum pulse length (micro-seconds)
 -- neutral: neutral pulse length (micro-seconds)
@@ -54,4 +53,3 @@
   <channel ctl="E" function="SWITCH1"  min="1096" neutral="1500" max="1900" average="1"/>
   <channel ctl="F" function="MODE"     min="966"  neutral="1500" max="2025" average="1"/>
 </radio>
-