Index: trunk/doc/conf/tree/editor.html
===================================================================
--- trunk/doc/conf/tree/editor.html	(revision 32593)
+++ trunk/doc/conf/tree/editor.html	(revision 32594)
@@ -38,6 +38,7 @@
 <tr><td> hide_names <td><a href="RND_CFN_BOOLEAN.html"> rnd_cfn_boolean </a><td> 0 <td> when set, subc floater text objects (typical use case: refdes text) are not drawn.
 <tr><td> description <td><a href="RND_CFN_BOOLEAN.html"> rnd_cfn_boolean </a><td> 0 <td> obsolete - DO NOT USE - kept for compatibility
 <tr><td> name_on_pcb <td><a href="RND_CFN_BOOLEAN.html"> rnd_cfn_boolean </a><td> 0 <td> obsolete - DO NOT USE - kept for compatibility
+<tr><td> trace_auto_merge <td><a href="RND_CFN_BOOLEAN.html"> rnd_cfn_boolean </a><td> 0 <td> automatically merge trace overlapping trace lines while drawing or moving traces
 <tr><td> subc_id <td><a href="RND_CFN_STRING.html"> rnd_cfn_string </a><td> 0 <td> subcircuit ID template for diplaying the subcircuit label on the subcircuit layer; default to displaying the refes, if empty; syntax if the same as for DYNTEXT
 <tr><td> term_id <td><a href="RND_CFN_STRING.html"> rnd_cfn_string </a><td> 0 <td> terminal ID template for diplaying the subcircuit label on the subcircuit layer; default to displaying termid[intconn], if empty; syntax if the same as for DYNTEXT
 <tr><td> move_linepoint_uses_route <td><a href="RND_CFN_BOOLEAN.html"> rnd_cfn_boolean </a><td> 0 <td> Moving a line point calculates a new line route. This allows 45/90 line modes when editing lines.