I think we should add the fact that some nodes can have just bmx6 or just batman-adv enabled, when it would be conveniente, as we discussed when we was together.
I think we can put it like that: default configuration is with both bmx6 and batman-adv enabled on all nodes, but in some case where it would be convenient some nodes can have just one of them activated ( for example a node inside the cloud can have just batman-adv activated, a node that make only routing between clouds can have just bmx6 activated )
i am very bad with english so i am not touching the wiki now, but i hope someone would integrate those info ;)