From 2bf8d0db90fa5bc43f9946d5064027f23fcb33ef Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Wed, 8 Feb 2012 17:03:43 +0000
Subject: [PATCH] Fix doc for includes/upload

---
 includes/upload/UploadBase.php       | 8 +++++---
 includes/upload/UploadFromChunks.php | 4 +---
 includes/upload/UploadFromFile.php   | 4 +---
 includes/upload/UploadFromStash.php  | 4 +---
 includes/upload/UploadFromUrl.php    | 3 +--
 includes/upload/UploadStash.php      | 2 ++
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 8d09bf51f5..32eeeb382b 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -1,7 +1,10 @@
 <?php
 /**
- * @file
- * @ingroup upload
+ * @defgroup Upload
+ */
+
+/**
+ * @ingroup Upload
  *
  * UploadBase and subclasses are the backend of MediaWiki's file uploads.
  * The frontends are formed by ApiUpload and SpecialUpload.
@@ -12,7 +15,6 @@
  * @author Bryan Tong Minh
  * @author Michael Dale
  */
-
 abstract class UploadBase {
 	protected $mTempPath;
 	protected $mDesiredDestName, $mDestName, $mRemoveTempFile, $mSourceType;
diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index f047b149fa..ec83f7d325 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -2,11 +2,9 @@
 /**
  * Implements uploading from chunks
  *
- * @file
- * @ingroup upload
+ * @ingroup Upload
  * @author Michael Dale
  */
-
 class UploadFromChunks extends UploadFromFile {
 	protected $mOffset, $mChunkIndex, $mFileKey, $mVirtualTempPath;
 	
diff --git a/includes/upload/UploadFromFile.php b/includes/upload/UploadFromFile.php
index 6d9e71a639..23ec2ef414 100644
--- a/includes/upload/UploadFromFile.php
+++ b/includes/upload/UploadFromFile.php
@@ -2,11 +2,9 @@
 /**
  * Implements regular file uploads
  *
- * @file
- * @ingroup upload
+ * @ingroup Upload
  * @author Bryan Tong Minh
  */
-
 class UploadFromFile extends UploadBase {
 
 	/**
diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index f34f156d6d..f7589bd29f 100644
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -2,11 +2,9 @@
 /**
  * Implements uploading from previously stored file.
  *
- * @file
- * @ingroup upload
+ * @ingroup Upload
  * @author Bryan Tong Minh
  */
-
 class UploadFromStash extends UploadBase {
 	protected $mFileKey, $mVirtualTempPath, $mFileProps, $mSourceType;
 
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 83f1babbe1..da772fe2c1 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -2,8 +2,7 @@
 /**
  * Implements uploading from a HTTP resource.
  *
- * @file
- * @ingroup upload
+ * @ingroup Upload
  * @author Bryan Tong Minh
  * @author Michael Dale
  */
diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index aca2c5b561..8c12150dac 100644
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -16,6 +16,8 @@
  * UploadStash represents the entire stash of temporary files.
  * UploadStashFile is a filestore for the actual physical disk files.
  * UploadFromStash extends UploadBase, and represents a single stashed file as it is moved from the stash to the regular file repository
+ *
+ * @ingroup Upload
  */
 class UploadStash {
 
-- 
2.20.1