Merge.

diff --cc doc/example.conf
Simple merge

diff --cc doc/reference.conf
Simple merge

diff --cc include/channel.h
Simple merge

diff --cc include/s_conf.h
Simple merge

diff --cc modules/core/m_join.c
Simple merge

diff --cc modules/core/m_message.c
Simple merge

diff --cc modules/core/m_mode.c
Simple merge

diff --cc modules/m_info.c
Simple merge

diff --cc src/channel.c
Simple merge

diff --cc src/chmode.c
Simple merge

diff --cc src/newconf.c
index a48f6397231dd999c592d30cc110b28b4bcc3fae,66671091acd7b405e412907a4a8ea64c835a029c..40ef4ec4320601a42e849fc1ccf0c2368566f8ff
--- 1/src/newconf.c
--- 2/src/newconf.c
+++ b/src/newconf.c
@@@ -2283,9 -2285,9 +2285,10 @@@ static struct ConfEntry conf_channel_ta
        { "use_except",         CF_YESNO, NULL, 0, &ConfigChannel.use_except            },
        { "use_invex",          CF_YESNO, NULL, 0, &ConfigChannel.use_invex             },
        { "use_knock",          CF_YESNO, NULL, 0, &ConfigChannel.use_knock             },
 +      { "use_forward",        CF_YESNO, NULL, 0, &ConfigChannel.use_forward           },
        { "use_local_channels", CF_YESNO, NULL, 0, &ConfigChannel.use_local_channels    },
        { "resv_forcepart",     CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart        },
+       { "channel_target_change", CF_YESNO, NULL, 0, &ConfigChannel.channel_target_change  },
        { "exempt_cmode_c",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_c        },
        { "exempt_cmode_C",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_C        },
        { "exempt_cmode_D",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_D        },

diff --cc src/s_conf.c
Simple merge

diff --cc src/s_user.c
Simple merge