Merged in some wiki fixes into the main docs.