reviewed config samples to show more options and be more consistent
review catalog security to better support non-partitionned mode