Merge xnet and xorg wiki code into the same file