some spelling

6 files changed, 21 insertions, 21 deletions

diff --git a/inc/Ui/Diff.php b/inc/Ui/Diff.php
index 2934e2dc7..f0e9342b1 100644
--- a/inc/Ui/Diff.php
+++ b/inc/Ui/Diff.php
@@ -15,9 +15,9 @@ abstract class Diff extends Ui
     /* @var string */
     protected $id;   // page id or media id
 
-    /* @var int */
+    /* @var int|false */
     protected $rev1;  // timestamp of older revision
-    /* @var int */
+    /* @var int|false */
     protected $rev2;  // timestamp of newer revision
 
     /* @var array */
@@ -94,7 +94,7 @@ abstract class Diff extends Ui
     {
         global $INPUT;
 
-        // difflink icon click, eg. &do=diff&rev=#
+        // diff link icon click, eg. &do=diff&rev=#
         if ($INPUT->has('rev')) {
             $this->rev1 = $INPUT->int('rev');
             $this->rev2 = $this->changelog->currentRevision();
diff --git a/inc/Ui/MediaDiff.php b/inc/Ui/MediaDiff.php
index b862ee225..496702ebf 100644
--- a/inc/Ui/MediaDiff.php
+++ b/inc/Ui/MediaDiff.php
@@ -92,7 +92,7 @@ class MediaDiff extends Diff
             if ($this->is_img) {
                 $rev = $isCurrent ? '' : $Revision->val('date');
                 $meta = new JpegMeta(mediaFN($this->id, $rev));
-                // get image width and height for the mediamanager preview panel
+                // get image width and height for the media manager preview panel
                 $Revision->append([
                     'previewSize' => media_image_preview_size($this->id, $rev, $meta)
                 ]);
diff --git a/inc/Ui/MediaRevisions.php b/inc/Ui/MediaRevisions.php
index ef5ee55e1..2cba80b01 100644
--- a/inc/Ui/MediaRevisions.php
+++ b/inc/Ui/MediaRevisions.php
@@ -52,7 +52,7 @@ class MediaRevisions extends Revisions
         global $lang;
         $changelog =& $this->changelog;
 
-        // get revisions, and set correct pagenation parameters (first, hasNext)
+        // get revisions, and set correct pagination parameters (first, hasNext)
         if ($first === null) $first = 0;
         $hasNext = false;
         $revisions = $this->getRevisions($first, $hasNext);
@@ -88,7 +88,7 @@ class MediaRevisions extends Revisions
 
             $html = implode(' ', [
                 $RevInfo->showEditDate(),          // edit date and time
-                $RevInfo->showIconCompareWithCurrent(),  // link to diffview icon
+                $RevInfo->showIconCompareWithCurrent(),  // link to diff view icon
                 $RevInfo->showFileName(),          // name of page or media
                 '<div>',
                 $RevInfo->showEditSummary(),       // edit summary
@@ -111,7 +111,7 @@ class MediaRevisions extends Revisions
 
         print $form->toHTML('Revisions');
 
-        // provide navigation for pagenated revision list (of pages and/or media files)
+        // provide navigation for paginated revision list (of pages and/or media files)
         print $this->navigation($first, $hasNext, function ($n) {
             return media_managerURL(['first' => $n], '&', false, true);
         });
diff --git a/inc/Ui/PageRevisions.php b/inc/Ui/PageRevisions.php
index 50001a77f..bda048ef7 100644
--- a/inc/Ui/PageRevisions.php
+++ b/inc/Ui/PageRevisions.php
@@ -50,7 +50,7 @@ class PageRevisions extends Revisions
         global $lang, $REV;
         $changelog =& $this->changelog;
 
-        // get revisions, and set correct pagenation parameters (first, hasNext)
+        // get revisions, and set correct pagination parameters (first, hasNext)
         if ($first === null) $first = 0;
         $hasNext = false;
         $revisions = $this->getRevisions($first, $hasNext);
@@ -89,7 +89,7 @@ class PageRevisions extends Revisions
 
             $html = implode(' ', [
                 $RevInfo->showEditDate(true),      // edit date and time
-                $RevInfo->showIconCompareWithCurrent(),  // link to diffview icon
+                $RevInfo->showIconCompareWithCurrent(),  // link to diff view icon
                 $RevInfo->showFileName(),          // name of page or media
                 $RevInfo->showEditSummary(),       // edit summary
                 $RevInfo->showEditor(),            // editor info
diff --git a/inc/Ui/Recent.php b/inc/Ui/Recent.php
index 1b7d05b34..f1fd6ad17 100644
--- a/inc/Ui/Recent.php
+++ b/inc/Ui/Recent.php
@@ -21,7 +21,7 @@ class Recent extends Ui
      * Recent Ui constructor
      *
      * @param int $first  skip the first n changelog lines
-     * @param string $show_changes  type of changes to show; pages, mediafiles, or both
+     * @param string $show_changes  type of changes to show; 'pages', 'mediafiles', or 'both'
      */
     public function __construct($first = 0, $show_changes = 'both')
     {
@@ -45,7 +45,7 @@ class Recent extends Ui
         global $conf, $lang;
         global $ID;
 
-        // get recent items, and set correct pagenation parameters (first, hasNext)
+        // get recent items, and set correct pagination parameters (first, hasNext)
         $first = $this->first;
         $hasNext = false;
         $recents = $this->getRecents($first, $hasNext);
@@ -85,8 +85,8 @@ class Recent extends Ui
             $html = implode(' ', [
                 $RevInfo->showFileIcon(),          // filetype icon
                 $RevInfo->showEditDate(),          // edit date and time
-                $RevInfo->showIconCompareWithPrevious(),    // link to diffview icon
-                $RevInfo->showIconRevisions(),     // linkto revisions icon
+                $RevInfo->showIconCompareWithPrevious(),    // link to diff view icon
+                $RevInfo->showIconRevisions(),     // link to revisions icon
                 $RevInfo->showFileName(),          // name of page or media
                 $RevInfo->showEditSummary(),       // edit summary
                 $RevInfo->showEditor(),            // editor info
@@ -100,18 +100,18 @@ class Recent extends Ui
 
         $form->addTagClose('div'); // close div class=no
 
-        // provide navigation for pagenated recent list (of pages and/or media files)
+        // provide navigation for paginated recent list (of pages and/or media files)
         $form->addHTML($this->htmlNavigation($first, $hasNext));
 
         print $form->toHTML('Recent');
     }
 
     /**
-     * Get recent items, and set correct pagenation parameters (first, hasNext)
+     * Get recent items, and set correct pagination parameters (first, hasNext)
      *
      * @param int  $first
      * @param bool $hasNext
-     * @return array  recent items to be shown in a pagenated list
+     * @return array  recent items to be shown in a paginated list
      *
      * @see also dokuwiki\Changelog::getRevisionInfo()
      */
@@ -173,7 +173,7 @@ class Recent extends Ui
     }
 
     /**
-     * Navigation buttons for Pagenation (prev/next)
+     * Navigation buttons for Pagination (prev/next)
      *
      * @param int  $first
      * @param bool $hasNext
diff --git a/inc/Ui/Revisions.php b/inc/Ui/Revisions.php
index 2e8f8d30b..72632ff04 100644
--- a/inc/Ui/Revisions.php
+++ b/inc/Ui/Revisions.php
@@ -39,7 +39,7 @@ abstract class Revisions extends Ui
      *
      * @param int  $first
      * @param bool $hasNext
-     * @return array  revisions to be shown in a pagenated list
+     * @return array  revisions to be shown in a paginated list
      * @see also https://www.dokuwiki.org/devel:changelog
      */
     protected function getRevisions(&$first, &$hasNext)
@@ -54,7 +54,7 @@ abstract class Revisions extends Ui
 
         $num = $conf['recent'];
         if ($first == 0) {
-            // add extrenal or existing last revision that is excluded from $changelog->getRevisions()
+            // add external or existing last revision that is excluded from $changelog->getRevisions()
             if (array_key_exists('timestamp', $currentRevInfo) || (
                 $currentRevInfo['type'] != DOKU_CHANGE_TYPE_DELETE &&
                 $currentRevInfo['date'] == $changelog->lastRevision() )
@@ -81,7 +81,7 @@ abstract class Revisions extends Ui
             array_pop($revlist); // remove one additional log entry
         }
 
-        // append each revison info array to the revisions
+        // append each revision info array to the revisions
         foreach ($revlist as $rev) {
             $revisions[] = $changelog->getRevisionInfo($rev);
         }
@@ -89,7 +89,7 @@ abstract class Revisions extends Ui
     }
 
     /**
-     * Navigation buttons for Pagenation (prev/next)
+     * Navigation buttons for Pagination (prev/next)
      *
      * @param int  $first
      * @param bool $hasNext