Merge "Improving some function documentation in CategoryViewer.php"