tables fixing
Merge branch 'doc_configuration'