merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/file/file.admin.view.php

@@ -1,20 +1,21 @@
 <?php
     /**
-     * @class  fileAdminView
+     * Admin view of the module class file
      * @author NHN (developers@xpressengine.com)
-     * @brief admin view of the module class file
      **/
-
     class fileAdminView extends file {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Display output list (for administrator)
+         * Display output list (for administrator)
+		 *
+		 * @return Object
          **/
         function dispFileAdminList() {
             // Options to get a list
@@ -174,7 +175,9 @@
         }
 
         /**
-         * @brief Set attachment information (for administrator)
+         * Set attachment information (for administrator)
+		 *
+		 * @return Object
          **/
         function dispFileAdminConfig() {
             $oFileModel = &getModel('file');