diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index 4cdebcc36921ba421fbe00020ede20d91131c305..cd082cbba832d64925d38b761bf2a30d8e239e5d 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -1106,6 +1106,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param string $outputName
+     */
     function _writeJPEG($outputName) {
         $this->_parseAll();
 
@@ -1238,6 +1242,12 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $marker
+     * @param integer $length
+     * @param integer $origLength
+     */
     function _writeJPEGMarker($marker, $length, &$data, $origLength) {
         if ($length <= 0) {
             return false;
@@ -1565,6 +1575,7 @@ class JpegMeta {
      * Parses XMP nodes by recursion
      *
      * @author  Hakan Sandell <hakan.sandell@mydata.se>
+     * @param integer $count
      */
     function _parseXmpNode($values, &$i, &$meta, $count) {
         if ($values[$i]['type'] == 'close') return;
@@ -1668,6 +1679,12 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $base
+     * @param boolean $isBigEndian
+     * @param string $mode
+     */
     function _readIFD($data, $base, $offset, $isBigEndian, $mode) {
         $EXIFTags = $this->_exifTagNames($mode);
 
@@ -1923,6 +1940,12 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $offsetBase
+     * @param boolean $isBigEndian
+     * @param boolean $hasNext
+     */
     function _writeIFD(&$data, $pos, $offsetBase, &$entries, $isBigEndian, $hasNext) {
         $tiffData = null;
         $tiffDataOffsetPos = -1;
@@ -1979,6 +2002,11 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param boolean $isBigEndian
+     * @param string $mode
+     */
     function & _getIFDEntries($isBigEndian, $mode) {
         $EXIFNames = $this->_exifTagNames($mode);
         $EXIFTags = $this->_exifNameTags($mode);
@@ -2487,6 +2515,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _write8BIM(&$data, $pos, $type, $header, &$value) {
         $signature = "8BIM";
 
@@ -2547,6 +2579,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _writeIPTCEntry(&$data, $pos, $type, &$value) {
         $pos = $this->_putShort($data, $pos, 0x1C02);
         $pos = $this->_putByte($data, $pos, $type);
@@ -2907,11 +2943,19 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _getByte(&$data, $pos) {
         return ord($data{$pos});
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _putByte(&$data, $pos, $val) {
         $val = intval($val);
 
@@ -2947,6 +2991,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _getLong(&$data, $pos, $bigEndian = true) {
         if ($bigEndian) {
             return (ord($data{$pos}) << 24)
@@ -2962,6 +3010,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _putLong(&$data, $pos, $val, $bigEndian = true) {
         $val = intval($val);
 
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 731c1982820d10655ed4f1fc7338a44bfda8628c..b8e2de82ae48f372e4d6faf1b878b00d444bc2ba 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -21,6 +21,9 @@ class Doku_Handler {
         $this->CallWriter = new Doku_Handler_CallWriter($this);
     }
 
+    /**
+     * @param string $handler
+     */
     function _addCall($handler, $args, $pos) {
         $call = array($handler,$args, $pos);
         $this->CallWriter->writeCall($call);
@@ -133,6 +136,9 @@ class Doku_Handler {
         return true;
     }
 
+    /**
+     * @param string $name
+     */
     function _nestingTag($match, $state, $pos, $name) {
         switch ( $state ) {
             case DOKU_LEXER_ENTER:
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index df01f3302fff02a3682ab7e37a2fc0c48c89917e..5f86cf5c4ebf8be1505d1520936fae62cd0c5066 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -61,6 +61,9 @@ class Doku_Parser {
 
     var $connected = false;
 
+    /**
+     * @param Doku_Parser_Mode_base $BaseMode
+     */
     function addBaseMode(& $BaseMode) {
         $this->modes['base'] =& $BaseMode;
         if ( !$this->Lexer ) {
@@ -139,6 +142,7 @@ interface Doku_Parser_Mode_Interface {
 
     /**
      * Called before any calls to connectTo
+     * @return void
      */
     function preConnect();
 
@@ -146,11 +150,13 @@ interface Doku_Parser_Mode_Interface {
      * Connects the mode
      *
      * @param string $mode
+     * @return void
      */
     function connectTo($mode);
 
     /**
      * Called after all calls to connectTo
+     * @return void
      */
     function postConnect();
 
@@ -407,6 +413,9 @@ class Doku_Parser_Mode_formatting extends Doku_Parser_Mode {
             ),
         );
 
+    /**
+     * @param string $type
+     */
     function Doku_Parser_Mode_formatting($type) {
         global $PARSER_MODES;
 
diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php
index 9df96389a5ac855fb21a10214c21ae344e652499..e1eade8d4c273666fbc80bac11516f8402a3e593 100644
--- a/lib/plugins/authplain/_test/escaping.test.php
+++ b/lib/plugins/authplain/_test/escaping.test.php
@@ -106,6 +106,9 @@ class helper_plugin_authplain_escaping_test extends DokuWikiTest {
 
 class auth_plugin_authplainharness extends auth_plugin_authplain {
 
+    /**
+     * @param boolean $bool
+     */
     public function setPregsplit_safe($bool) {
         $this->_pregsplit_safe = $bool;
     }
@@ -114,6 +117,9 @@ class auth_plugin_authplainharness extends auth_plugin_authplain {
         return $this->_pregsplit_safe;
     }
 
+    /**
+     * @param string $line
+     */
     public function splitUserData($line){
         return $this->_splitUserData($line);
     }