diff --git a/administrator/components/com_admin/postinstall/joomla40checks.php b/administrator/components/com_admin/postinstall/joomla40checks.php
index 7f921fa3629e7..c55571c29015e 100644
--- a/administrator/components/com_admin/postinstall/joomla40checks.php
+++ b/administrator/components/com_admin/postinstall/joomla40checks.php
@@ -18,7 +18,7 @@
  *
  * @since   3.7
  *
- * @see     https://developer.joomla.org/news/658-joomla4-manifesto.html
+ * @link    https://developer.joomla.org/news/658-joomla4-manifesto.html
  */
 function admin_postinstall_joomla40checks_condition()
 {
diff --git a/administrator/components/com_admin/postinstall/languageaccess340.php b/administrator/components/com_admin/postinstall/languageaccess340.php
index 86186a95d355d..d55964eb122dd 100644
--- a/administrator/components/com_admin/postinstall/languageaccess340.php
+++ b/administrator/components/com_admin/postinstall/languageaccess340.php
@@ -15,8 +15,8 @@
 /**
  * Checks if the installation is affected by the issue with content languages access in 3.4.0
  *
- * @see     https://github.com/joomla/joomla-cms/pull/6172
- * @see     https://github.com/joomla/joomla-cms/pull/6194
+ * @link    https://github.com/joomla/joomla-cms/pull/6172
+ * @link    https://github.com/joomla/joomla-cms/pull/6194
  *
  * @return  boolean
  *
diff --git a/administrator/components/com_associations/controllers/association.php b/administrator/components/com_associations/controllers/association.php
index cbc614ebc1e59..60d5234559b58 100644
--- a/administrator/components/com_associations/controllers/association.php
+++ b/administrator/components/com_associations/controllers/association.php
@@ -52,7 +52,7 @@ public function edit($key = null, $urlVar = null)
 	 *
 	 * @param   string  $key  The name of the primary key of the URL variable.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   3.7.0
 	 */
diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php
index da87beab3b9da..3103328d8b8a7 100644
--- a/administrator/components/com_categories/helpers/categories.php
+++ b/administrator/components/com_categories/helpers/categories.php
@@ -152,7 +152,7 @@ public static function validateCategoryId($catid, $extension)
 	 *
 	 * @param   array  $data  Array of data for new category.
 	 *
-	 * @return  integer.
+	 * @return  integer
 	 */
 	public static function createCategory($data)
 	{
diff --git a/administrator/components/com_fields/models/fields.php b/administrator/components/com_fields/models/fields.php
index b39cf2319525f..58d7eeb8d54c2 100644
--- a/administrator/components/com_fields/models/fields.php
+++ b/administrator/components/com_fields/models/fields.php
@@ -344,7 +344,7 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
 	 * @param   array    $data      data
 	 * @param   boolean  $loadData  load current data
 	 *
-	 * @return  JForm/false  the JForm object or false
+	 * @return  JForm|false  the JForm object or false
 	 *
 	 * @since   3.7.0
 	 */
diff --git a/administrator/components/com_languages/helpers/multilangstatus.php b/administrator/components/com_languages/helpers/multilangstatus.php
index 7f81901b625fe..c4c3c798a7e25 100644
--- a/administrator/components/com_languages/helpers/multilangstatus.php
+++ b/administrator/components/com_languages/helpers/multilangstatus.php
@@ -40,7 +40,7 @@ public static function getHomes()
 	/**
 	 * Method to get the number of published language switcher modules.
 	 *
-	 * @return  integer.
+	 * @return  integer
 	 */
 	public static function getLangswitchers()
 	{
diff --git a/administrator/components/com_login/views/login/view.html.php b/administrator/components/com_login/views/login/view.html.php
index 0f9d047e4bf87..0297dc3f4fff8 100644
--- a/administrator/components/com_login/views/login/view.html.php
+++ b/administrator/components/com_login/views/login/view.html.php
@@ -31,8 +31,8 @@ public function display($tpl = null)
 		 * To prevent clickjacking, only allow the login form to be used inside a frame in the same origin.
 		 * So send a X-Frame-Options HTTP Header with the SAMEORIGIN value.
 		 * 
-		 * @see https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet
-		 *      https://tools.ietf.org/html/rfc7034
+		 * @link https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet
+		 * @link https://tools.ietf.org/html/rfc7034
 		 */
 		JFactory::getApplication()->setHeader('X-Frame-Options', 'SAMEORIGIN');
 
diff --git a/administrator/components/com_redirect/controllers/links.php b/administrator/components/com_redirect/controllers/links.php
index a543b4167d677..9994730988b0f 100644
--- a/administrator/components/com_redirect/controllers/links.php
+++ b/administrator/components/com_redirect/controllers/links.php
@@ -21,7 +21,7 @@ class RedirectControllerLinks extends JControllerAdmin
 	/**
 	 * Method to update a record.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   1.6
 	 */
@@ -62,7 +62,7 @@ public function activate()
 	/**
 	 * Method to duplicate URLs in records.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   3.6.0
 	 */
diff --git a/administrator/components/com_redirect/helpers/redirect.php b/administrator/components/com_redirect/helpers/redirect.php
index 9e88a3f23c83d..93779082edeb6 100644
--- a/administrator/components/com_redirect/helpers/redirect.php
+++ b/administrator/components/com_redirect/helpers/redirect.php
@@ -25,7 +25,7 @@ class RedirectHelper
 	 *
 	 * @param   string  $vName  The name of the active view.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   1.6
 	 */
diff --git a/administrator/components/com_redirect/models/fields/redirect.php b/administrator/components/com_redirect/models/fields/redirect.php
index dacfb755e7a56..2daf53e9ef786 100644
--- a/administrator/components/com_redirect/models/fields/redirect.php
+++ b/administrator/components/com_redirect/models/fields/redirect.php
@@ -33,7 +33,7 @@ class JFormFieldRedirect extends JFormFieldList
 	 *
 	 * @var    object
 	 * @since  3.4
-	 * @see    http://www.iana.org/assignments/http-status-codes/
+	 * @link   http://www.iana.org/assignments/http-status-codes/
 	 */
 	protected $responseMap = array(
 		100 => 'HTTP/1.1 100 Continue',
diff --git a/administrator/components/com_redirect/views/link/view.html.php b/administrator/components/com_redirect/views/link/view.html.php
index f49ebc8da2cd9..b9f4db8a8c1eb 100644
--- a/administrator/components/com_redirect/views/link/view.html.php
+++ b/administrator/components/com_redirect/views/link/view.html.php
@@ -52,7 +52,7 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   1.6
 	 */
diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php
index ec758c8a3a1bb..81efc3116a0a5 100644
--- a/administrator/components/com_redirect/views/links/view.html.php
+++ b/administrator/components/com_redirect/views/links/view.html.php
@@ -79,7 +79,7 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   1.6
 	 */
diff --git a/administrator/components/com_templates/controllers/template.php b/administrator/components/com_templates/controllers/template.php
index 376459b6ac9d9..6f707a34c816f 100644
--- a/administrator/components/com_templates/controllers/template.php
+++ b/administrator/components/com_templates/controllers/template.php
@@ -37,7 +37,7 @@ public function __construct($config = array())
 	/**
 	 * Method for closing the template.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   3.2
 	 */
@@ -49,7 +49,7 @@ public function cancel()
 	/**
 	 * Method for closing a file.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   3.2
 	 */
diff --git a/build/phpcs/Joomla/Sniffs/Commenting/SingleCommentSniff.php b/build/phpcs/Joomla/Sniffs/Commenting/SingleCommentSniff.php
index 045af7604366d..b64c9f5fd5c23 100644
--- a/build/phpcs/Joomla/Sniffs/Commenting/SingleCommentSniff.php
+++ b/build/phpcs/Joomla/Sniffs/Commenting/SingleCommentSniff.php
@@ -5,7 +5,7 @@ class Joomla_Sniffs_Commenting_SingleCommentSniff implements PHP_CodeSniffer_Sni
 	/**
 	 * Returns the token types that this sniff is interested in.
 	 *
-	 * @return array(int)
+	 * @return integer[]
 	 */
 	public function register()
 	{
diff --git a/build/phpcs/Joomla/Sniffs/ControlStructures/ControlSignatureSniff.php b/build/phpcs/Joomla/Sniffs/ControlStructures/ControlSignatureSniff.php
index c077459e37448..8f175a4b52e40 100644
--- a/build/phpcs/Joomla/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/build/phpcs/Joomla/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -45,7 +45,7 @@ public function __construct()
 	/**
 	 * Returns the patterns that this test wishes to verify.
 	 *
-	 * @return array(string)
+	 * @return string[]
 	 */
 	protected function getPatterns()
 	{
diff --git a/components/com_content/models/archive.php b/components/com_content/models/archive.php
index 5de3b822de9e7..c17d3a6dd552c 100644
--- a/components/com_content/models/archive.php
+++ b/components/com_content/models/archive.php
@@ -33,7 +33,7 @@ class ContentModelArchive extends ContentModelArticles
 	 * @param   string  $ordering   The field to order on.
 	 * @param   string  $direction  The direction to order on.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   1.6
 	 */
diff --git a/components/com_content/models/categories.php b/components/com_content/models/categories.php
index 878caf857df7c..d5209aa96d662 100644
--- a/components/com_content/models/categories.php
+++ b/components/com_content/models/categories.php
@@ -42,7 +42,7 @@ class ContentModelCategories extends JModelList
 	 * @param   string  $ordering   The field to order on.
 	 * @param   string  $direction  The direction to order on.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   1.6
 	 */
diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php
index 8e92249006576..77fafca8fa990 100644
--- a/components/com_content/models/category.php
+++ b/components/com_content/models/category.php
@@ -103,7 +103,7 @@ public function __construct($config = array())
 	 * @param   string  $ordering   The field to order on.
 	 * @param   string  $direction  The direction to order on.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   1.6
 	 */
diff --git a/components/com_content/models/featured.php b/components/com_content/models/featured.php
index 0f97b910d9076..a823903624fc4 100644
--- a/components/com_content/models/featured.php
+++ b/components/com_content/models/featured.php
@@ -33,7 +33,7 @@ class ContentModelFeatured extends ContentModelArticles
 	 * @param   string  $ordering   The field to order on.
 	 * @param   string  $direction  The direction to order on.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   1.6
 	 */
diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php
index e09346a73c7f4..0fd92e7af03c9 100644
--- a/components/com_content/views/archive/view.html.php
+++ b/components/com_content/views/archive/view.html.php
@@ -148,7 +148,7 @@ public function display($tpl = null)
 	/**
 	 * Prepares the document
 	 *
-	 * @return  void.
+	 * @return  void
 	 */
 	protected function _prepareDocument()
 	{
diff --git a/components/com_content/views/article/view.html.php b/components/com_content/views/article/view.html.php
index 974f2d1c553da..8b2a723c7fc45 100644
--- a/components/com_content/views/article/view.html.php
+++ b/components/com_content/views/article/view.html.php
@@ -210,7 +210,7 @@ public function display($tpl = null)
 	/**
 	 * Prepares the document.
 	 *
-	 * @return  void.
+	 * @return  void
 	 */
 	protected function _prepareDocument()
 	{
diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php
index 2824651f589a3..45d4fe229dcaf 100644
--- a/components/com_content/views/featured/view.html.php
+++ b/components/com_content/views/featured/view.html.php
@@ -163,7 +163,7 @@ public function display($tpl = null)
 	/**
 	 * Prepares the document.
 	 *
-	 * @return  void.
+	 * @return  void
 	 */
 	protected function _prepareDocument()
 	{
diff --git a/components/com_content/views/form/view.html.php b/components/com_content/views/form/view.html.php
index d98564f66a33e..944db4ea81309 100644
--- a/components/com_content/views/form/view.html.php
+++ b/components/com_content/views/form/view.html.php
@@ -130,7 +130,7 @@ public function display($tpl = null)
 	/**
 	 * Prepares the document
 	 *
-	 * @return  void.
+	 * @return  void
 	 */
 	protected function _prepareDocument()
 	{
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
index 41a475eba0d96..0dc2945ad7c92 100644
--- a/libraries/cms/html/html.php
+++ b/libraries/cms/html/html.php
@@ -211,7 +211,7 @@ public static function isRegistered($key)
 	 *
 	 * @return  mixed   Function result or false on error.
 	 *
-	 * @see     https://secure.php.net/manual/en/function.call-user-func-array.php
+	 * @link    https://secure.php.net/manual/en/function.call-user-func-array.php
 	 * @since   1.6
 	 * @throws  InvalidArgumentException
 	 */
diff --git a/libraries/cms/html/number.php b/libraries/cms/html/number.php
index 1dc87aa76af23..d28c0fb2d50d8 100644
--- a/libraries/cms/html/number.php
+++ b/libraries/cms/html/number.php
@@ -37,7 +37,7 @@ abstract class JHtmlNumber
 	 * @return  string   The number of bytes in the proper units.
 	 *
 	 * @since   1.6
-	 * @see     https://en.wikipedia.org/wiki/Binary_prefix
+	 * @link    https://en.wikipedia.org/wiki/Binary_prefix
 	 */
 	public static function bytes($bytes, $unit = 'auto', $precision = 2, $iec = false)
 	{
diff --git a/libraries/cms/layout/base.php b/libraries/cms/layout/base.php
index 3fae2476cbf43..b5f659e87480c 100644
--- a/libraries/cms/layout/base.php
+++ b/libraries/cms/layout/base.php
@@ -14,7 +14,7 @@
 /**
  * Base class for rendering a display layout
  *
- * @see    https://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @link   https://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
  * @since  3.0
  */
 class JLayoutBase implements JLayout
diff --git a/libraries/cms/layout/file.php b/libraries/cms/layout/file.php
index e488e4d568fbc..f548f77c0c226 100644
--- a/libraries/cms/layout/file.php
+++ b/libraries/cms/layout/file.php
@@ -13,7 +13,7 @@
  * Base class for rendering a display layout
  * loaded from from a layout file
  *
- * @see    https://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @link   https://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
  * @since  3.0
  */
 class JLayoutFile extends JLayoutBase
diff --git a/libraries/cms/layout/helper.php b/libraries/cms/layout/helper.php
index 13db595687261..b973567df58e6 100644
--- a/libraries/cms/layout/helper.php
+++ b/libraries/cms/layout/helper.php
@@ -12,7 +12,7 @@
 /**
  * Helper to render a JLayout object, storing a base path
  *
- * @see    https://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @link   https://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
  * @since  3.1
  */
 class JLayoutHelper
diff --git a/libraries/cms/layout/layout.php b/libraries/cms/layout/layout.php
index 2d22324fb42b4..823b23b6db80b 100644
--- a/libraries/cms/layout/layout.php
+++ b/libraries/cms/layout/layout.php
@@ -12,7 +12,7 @@
 /**
  * Interface to handle display layout
  *
- * @see    https://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @link   https://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
  * @since  3.0
  */
 interface JLayout
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index fb5124c05d7ba..310340b3f58bf 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -153,7 +153,7 @@ public function isInDevelopmentState()
 	 *
 	 * @return  boolean True if the version is compatible.
 	 *
-	 * @see     https://secure.php.net/version_compare
+	 * @link    https://secure.php.net/version_compare
 	 * @since   1.0
 	 */
 	public function isCompatible($minimum)
diff --git a/libraries/fof/database/query.php b/libraries/fof/database/query.php
index 2a9c89ea2d885..cb610f0847697 100644
--- a/libraries/fof/database/query.php
+++ b/libraries/fof/database/query.php
@@ -1429,7 +1429,7 @@ public function __clone()
 	 *
 	 * @return  mixed    The FOFDatabaseQuery object on success or boolean false on failure.
 	 *
-	 * @link http://dev.mysql.com/doc/refman/5.0/en/union.html
+	 * @see  http://dev.mysql.com/doc/refman/5.0/en/union.html
 	 *
 	 * @since   12.1
 	 */
@@ -1684,7 +1684,7 @@ public function format($format)
 	 *
 	 * @return  string  The string with the appropriate sql for addition of dates
 	 *
-	 * @see     http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_date-add
+	 * @link     http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_date-add
 	 * @since   13.1
 	 */
 	public function dateAdd($date, $interval, $datePart)
diff --git a/libraries/joomla/application/daemon.php b/libraries/joomla/application/daemon.php
index 621faaa134b26..83478c8161528 100644
--- a/libraries/joomla/application/daemon.php
+++ b/libraries/joomla/application/daemon.php
@@ -16,15 +16,15 @@
 /**
  * Class to turn JApplicationCli applications into daemons.  It requires CLI and PCNTL support built into PHP.
  *
- * @see    https://secure.php.net/manual/en/book.pcntl.php
- * @see    https://secure.php.net/manual/en/features.commandline.php
+ * @link   https://secure.php.net/manual/en/book.pcntl.php
+ * @link   https://secure.php.net/manual/en/features.commandline.php
  * @since  11.1
  */
 class JApplicationDaemon extends JApplicationCli
 {
 	/**
 	 * @var    array  The available POSIX signals to be caught by default.
-	 * @see    https://secure.php.net/manual/pcntl.constants.php
+	 * @link   https://secure.php.net/manual/pcntl.constants.php
 	 * @since  11.1
 	 */
 	protected static $signals = array(
diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index a8b6ce9116fda..712be8e45438e 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -79,7 +79,7 @@ class JApplicationWeb extends JApplicationBase
 	 *
 	 * @var    object
 	 * @since  3.4
-	 * @see    http://tools.ietf.org/pdf/rfc7231.pdf
+	 * @link   http://tools.ietf.org/pdf/rfc7231.pdf
 	 */
 	private $responseMap = array(
 		300 => 'HTTP/1.1 300 Multiple Choices',
@@ -99,7 +99,7 @@ class JApplicationWeb extends JApplicationBase
          * 
          * @var    object
          * @since  3.5.2
-         * @see    https://tools.ietf.org/html/rfc7230
+         * @link   https://tools.ietf.org/html/rfc7230
          */
 	private $singleValueResponseHeaders = array(
 		'status', // This is not a valid header name, but the representation used by Joomla to identify the HTTP Response Code
diff --git a/libraries/joomla/authentication/authentication.php b/libraries/joomla/authentication/authentication.php
index 062645965237b..ed940cdc9860a 100644
--- a/libraries/joomla/authentication/authentication.php
+++ b/libraries/joomla/authentication/authentication.php
@@ -319,7 +319,7 @@ public function authenticate($credentials, $options = array())
 	 * @param   JAuthenticationResponse  $response  response including username of the user to authorise
 	 * @param   array                    $options   list of options
 	 *
-	 * @return  array[JAuthenticationResponse]  results of authorisation
+	 * @return  JAuthenticationResponse[]  Array of authentication response objects
 	 *
 	 * @since  11.2
 	 */
diff --git a/libraries/joomla/cache/storage/apc.php b/libraries/joomla/cache/storage/apc.php
index c63de1decb7cb..2e153242488e8 100644
--- a/libraries/joomla/cache/storage/apc.php
+++ b/libraries/joomla/cache/storage/apc.php
@@ -12,7 +12,7 @@
 /**
  * APC cache storage handler
  *
- * @see    https://secure.php.net/manual/en/book.apc.php
+ * @link   https://secure.php.net/manual/en/book.apc.php
  * @since  11.1
  */
 class JCacheStorageApc extends JCacheStorage
diff --git a/libraries/joomla/cache/storage/apcu.php b/libraries/joomla/cache/storage/apcu.php
index eeee074a53906..16c611cefdf9c 100644
--- a/libraries/joomla/cache/storage/apcu.php
+++ b/libraries/joomla/cache/storage/apcu.php
@@ -12,7 +12,7 @@
 /**
  * APCu cache storage handler
  *
- * @see    https://secure.php.net/manual/en/ref.apcu.php
+ * @link   https://secure.php.net/manual/en/ref.apcu.php
  * @since  3.5
  */
 class JCacheStorageApcu extends JCacheStorage
diff --git a/libraries/joomla/cache/storage/cachelite.php b/libraries/joomla/cache/storage/cachelite.php
index d77475f048609..e60b1df5c3aa9 100644
--- a/libraries/joomla/cache/storage/cachelite.php
+++ b/libraries/joomla/cache/storage/cachelite.php
@@ -12,7 +12,7 @@
 /**
  * Cache lite storage handler
  *
- * @see    http://pear.php.net/package/Cache_Lite/
+ * @link   http://pear.php.net/package/Cache_Lite/
  * @since  11.1
  */
 class JCacheStorageCachelite extends JCacheStorage
diff --git a/libraries/joomla/cache/storage/memcache.php b/libraries/joomla/cache/storage/memcache.php
index af287244fbe0d..f6fb1ad7496ef 100644
--- a/libraries/joomla/cache/storage/memcache.php
+++ b/libraries/joomla/cache/storage/memcache.php
@@ -12,7 +12,7 @@
 /**
  * Memcache cache storage handler
  *
- * @see    https://secure.php.net/manual/en/book.memcache.php
+ * @link   https://secure.php.net/manual/en/book.memcache.php
  * @since  11.1
  */
 class JCacheStorageMemcache extends JCacheStorage
diff --git a/libraries/joomla/cache/storage/memcached.php b/libraries/joomla/cache/storage/memcached.php
index 5331fa1381e34..92f1831e89c27 100644
--- a/libraries/joomla/cache/storage/memcached.php
+++ b/libraries/joomla/cache/storage/memcached.php
@@ -12,7 +12,7 @@
 /**
  * Memcached cache storage handler
  *
- * @see    https://secure.php.net/manual/en/book.memcached.php
+ * @link   https://secure.php.net/manual/en/book.memcached.php
  * @since  12.1
  */
 class JCacheStorageMemcached extends JCacheStorage
diff --git a/libraries/joomla/cache/storage/wincache.php b/libraries/joomla/cache/storage/wincache.php
index c309bedb67c10..c82462879cb6d 100644
--- a/libraries/joomla/cache/storage/wincache.php
+++ b/libraries/joomla/cache/storage/wincache.php
@@ -12,7 +12,7 @@
 /**
  * WinCache cache storage handler
  *
- * @see    https://secure.php.net/manual/en/book.wincache.php
+ * @link   https://secure.php.net/manual/en/book.wincache.php
  * @since  11.1
  */
 class JCacheStorageWincache extends JCacheStorage
diff --git a/libraries/joomla/crypt/cipher/3des.php b/libraries/joomla/crypt/cipher/3des.php
index 3d7bed32dacc3..255db00f662ae 100644
--- a/libraries/joomla/crypt/cipher/3des.php
+++ b/libraries/joomla/crypt/cipher/3des.php
@@ -19,14 +19,14 @@ class JCryptCipher3Des extends JCryptCipherMcrypt
 {
 	/**
 	 * @var    integer  The mcrypt cipher constant.
-	 * @see    https://secure.php.net/manual/en/mcrypt.ciphers.php
+	 * @link   https://secure.php.net/manual/en/mcrypt.ciphers.php
 	 * @since  12.1
 	 */
 	protected $type = MCRYPT_3DES;
 
 	/**
 	 * @var    integer  The mcrypt block cipher mode.
-	 * @see    https://secure.php.net/manual/en/mcrypt.constants.php
+	 * @link   https://secure.php.net/manual/en/mcrypt.constants.php
 	 * @since  12.1
 	 */
 	protected $mode = MCRYPT_MODE_CBC;
diff --git a/libraries/joomla/crypt/cipher/blowfish.php b/libraries/joomla/crypt/cipher/blowfish.php
index cb19de9fec457..8cdf3565c2e29 100644
--- a/libraries/joomla/crypt/cipher/blowfish.php
+++ b/libraries/joomla/crypt/cipher/blowfish.php
@@ -19,14 +19,14 @@ class JCryptCipherBlowfish extends JCryptCipherMcrypt
 {
 	/**
 	 * @var    integer  The mcrypt cipher constant.
-	 * @see    https://secure.php.net/manual/en/mcrypt.ciphers.php
+	 * @link   https://secure.php.net/manual/en/mcrypt.ciphers.php
 	 * @since  12.1
 	 */
 	protected $type = MCRYPT_BLOWFISH;
 
 	/**
 	 * @var    integer  The mcrypt block cipher mode.
-	 * @see    https://secure.php.net/manual/en/mcrypt.constants.php
+	 * @link   https://secure.php.net/manual/en/mcrypt.constants.php
 	 * @since  12.1
 	 */
 	protected $mode = MCRYPT_MODE_CBC;
diff --git a/libraries/joomla/crypt/cipher/mcrypt.php b/libraries/joomla/crypt/cipher/mcrypt.php
index 6378a4a664dbb..56cf0164759c5 100644
--- a/libraries/joomla/crypt/cipher/mcrypt.php
+++ b/libraries/joomla/crypt/cipher/mcrypt.php
@@ -19,14 +19,14 @@ abstract class JCryptCipherMcrypt implements JCryptCipher
 {
 	/**
 	 * @var    integer  The mcrypt cipher constant.
-	 * @see    https://secure.php.net/manual/en/mcrypt.ciphers.php
+	 * @link   https://secure.php.net/manual/en/mcrypt.ciphers.php
 	 * @since  12.1
 	 */
 	protected $type;
 
 	/**
 	 * @var    integer  The mcrypt block cipher mode.
-	 * @see    https://secure.php.net/manual/en/mcrypt.constants.php
+	 * @link   https://secure.php.net/manual/en/mcrypt.constants.php
 	 * @since  12.1
 	 */
 	protected $mode;
@@ -144,8 +144,8 @@ public function generateKey(array $options = array())
 	 *
 	 * @return  string  The derived key.
 	 *
-	 * @see     https://en.wikipedia.org/wiki/PBKDF2
-	 * @see     http://www.ietf.org/rfc/rfc2898.txt
+	 * @link    https://en.wikipedia.org/wiki/PBKDF2
+	 * @link    http://www.ietf.org/rfc/rfc2898.txt
 	 * @since   12.1
 	 */
 	public function pbkdf2($p, $s, $kl, $c = 10000, $a = 'sha256')
diff --git a/libraries/joomla/crypt/cipher/rijndael256.php b/libraries/joomla/crypt/cipher/rijndael256.php
index e058219c2f0b7..bc4e723e11b45 100644
--- a/libraries/joomla/crypt/cipher/rijndael256.php
+++ b/libraries/joomla/crypt/cipher/rijndael256.php
@@ -19,14 +19,14 @@ class JCryptCipherRijndael256 extends JCryptCipherMcrypt
 {
 	/**
 	 * @var    integer  The mcrypt cipher constant.
-	 * @see    https://secure.php.net/manual/en/mcrypt.ciphers.php
+	 * @link   https://secure.php.net/manual/en/mcrypt.ciphers.php
 	 * @since  12.1
 	 */
 	protected $type = MCRYPT_RIJNDAEL_256;
 
 	/**
 	 * @var    integer  The mcrypt block cipher mode.
-	 * @see    https://secure.php.net/manual/en/mcrypt.constants.php
+	 * @link   https://secure.php.net/manual/en/mcrypt.constants.php
 	 * @since  12.1
 	 */
 	protected $mode = MCRYPT_MODE_CBC;
diff --git a/libraries/joomla/crypt/crypt.php b/libraries/joomla/crypt/crypt.php
index 9f5ffd733b804..0dd6042d7e954 100644
--- a/libraries/joomla/crypt/crypt.php
+++ b/libraries/joomla/crypt/crypt.php
@@ -153,7 +153,7 @@ public static function timingSafeCompare($known, $unknown)
 	 * @return  boolean  Always returns true since 3.3
 	 *
 	 * @note    To be removed when PHP 5.3.7 or higher is the minimum supported version.
-	 * @see     https://github.com/ircmaxell/password_compat/blob/master/version-test.php
+	 * @link    https://github.com/ircmaxell/password_compat/blob/master/version-test.php
 	 * @since   3.2
 	 * @deprecated  4.0
 	 */
diff --git a/libraries/joomla/database/driver/mysql.php b/libraries/joomla/database/driver/mysql.php
index 1cfb02863f565..3aaa798421605 100644
--- a/libraries/joomla/database/driver/mysql.php
+++ b/libraries/joomla/database/driver/mysql.php
@@ -12,7 +12,7 @@
 /**
  * MySQL database driver
  *
- * @see         http://dev.mysql.com/doc/
+ * @link        https://dev.mysql.com/doc/
  * @since       12.1
  * @deprecated  4.0  Use MySQLi or PDO MySQL instead
  */
diff --git a/libraries/joomla/database/driver/mysqli.php b/libraries/joomla/database/driver/mysqli.php
index 37c9ae0f44fbf..29ca98b37709e 100644
--- a/libraries/joomla/database/driver/mysqli.php
+++ b/libraries/joomla/database/driver/mysqli.php
@@ -12,7 +12,7 @@
 /**
  * MySQLi database driver
  *
- * @see    https://secure.php.net/manual/en/book.mysqli.php
+ * @link   https://secure.php.net/manual/en/book.mysqli.php
  * @since  12.1
  */
 class JDatabaseDriverMysqli extends JDatabaseDriver
diff --git a/libraries/joomla/database/driver/oracle.php b/libraries/joomla/database/driver/oracle.php
index 1ad20fdc95cb3..f920d36b30e24 100644
--- a/libraries/joomla/database/driver/oracle.php
+++ b/libraries/joomla/database/driver/oracle.php
@@ -12,7 +12,7 @@
 /**
  * Oracle database driver
  *
- * @see    https://secure.php.net/pdo
+ * @link   https://secure.php.net/pdo
  * @since  12.1
  */
 class JDatabaseDriverOracle extends JDatabaseDriverPdo
diff --git a/libraries/joomla/database/driver/pdo.php b/libraries/joomla/database/driver/pdo.php
index 86046916d832a..4dacafa9c0fde 100644
--- a/libraries/joomla/database/driver/pdo.php
+++ b/libraries/joomla/database/driver/pdo.php
@@ -12,7 +12,7 @@
 /**
  * Joomla Platform PDO Database Driver Class
  *
- * @see    https://secure.php.net/pdo
+ * @link   https://secure.php.net/pdo
  * @since  12.1
  */
 abstract class JDatabaseDriverPdo extends JDatabaseDriver
@@ -492,7 +492,7 @@ public function execute()
 	 *
 	 * @return  mixed
 	 *
-	 * @see     https://secure.php.net/manual/en/pdo.getattribute.php
+	 * @link    https://secure.php.net/manual/en/pdo.getattribute.php
 	 * @since   12.1
 	 */
 	public function getOption($key)
@@ -524,7 +524,7 @@ public function getConnectedQuery()
 	 *
 	 * @return  boolean
 	 *
-	 * @see     https://secure.php.net/manual/en/pdo.setattribute.php
+	 * @link   https://secure.php.net/manual/en/pdo.setattribute.php
 	 * @since   12.1
 	 */
 	public function setOption($key, $value)
diff --git a/libraries/joomla/database/driver/pdomysql.php b/libraries/joomla/database/driver/pdomysql.php
index f55e3108fc3cc..2df375d9aae70 100644
--- a/libraries/joomla/database/driver/pdomysql.php
+++ b/libraries/joomla/database/driver/pdomysql.php
@@ -12,7 +12,7 @@
 /**
  * MySQL database driver supporting PDO based connections
  *
- * @see    https://secure.php.net/manual/en/ref.pdo-mysql.php
+ * @link   https://secure.php.net/manual/en/ref.pdo-mysql.php
  * @since  3.4
  */
 class JDatabaseDriverPdomysql extends JDatabaseDriverPdo
diff --git a/libraries/joomla/database/driver/sqlazure.php b/libraries/joomla/database/driver/sqlazure.php
index fe7d163ebbb5e..925208b5de275 100644
--- a/libraries/joomla/database/driver/sqlazure.php
+++ b/libraries/joomla/database/driver/sqlazure.php
@@ -12,7 +12,7 @@
 /**
  * SQL Server database driver
  *
- * @see    https://azure.microsoft.com/en-us/documentation/services/sql-database/
+ * @link   https://azure.microsoft.com/en-us/documentation/services/sql-database/
  * @since  12.1
  */
 class JDatabaseDriverSqlazure extends JDatabaseDriverSqlsrv
diff --git a/libraries/joomla/database/driver/sqlite.php b/libraries/joomla/database/driver/sqlite.php
index 6c57faf21e47b..6c7dba3dce0b3 100644
--- a/libraries/joomla/database/driver/sqlite.php
+++ b/libraries/joomla/database/driver/sqlite.php
@@ -12,7 +12,7 @@
 /**
  * SQLite database driver
  *
- * @see    https://secure.php.net/pdo
+ * @link   https://secure.php.net/pdo
  * @since  12.1
  */
 class JDatabaseDriverSqlite extends JDatabaseDriverPdo
diff --git a/libraries/joomla/database/driver/sqlsrv.php b/libraries/joomla/database/driver/sqlsrv.php
index 81594497a1fd0..dca0d5a08b113 100644
--- a/libraries/joomla/database/driver/sqlsrv.php
+++ b/libraries/joomla/database/driver/sqlsrv.php
@@ -12,7 +12,7 @@
 /**
  * SQL Server database driver
  *
- * @see    https://msdn.microsoft.com/en-us/library/cc296152(SQL.90).aspx
+ * @link   https://msdn.microsoft.com/en-us/library/cc296152(SQL.90).aspx
  * @since  12.1
  */
 class JDatabaseDriverSqlsrv extends JDatabaseDriver
diff --git a/libraries/joomla/database/iterator/mysql.php b/libraries/joomla/database/iterator/mysql.php
index 01564d3982a40..8393197248303 100644
--- a/libraries/joomla/database/iterator/mysql.php
+++ b/libraries/joomla/database/iterator/mysql.php
@@ -12,7 +12,7 @@
 /**
  * MySQL database iterator.
  *
- * @see         http://dev.mysql.com/doc/
+ * @link        http://dev.mysql.com/doc/
  * @since       12.1
  * @deprecated  4.0  Use MySQLi or PDO MySQL instead
  */
diff --git a/libraries/joomla/database/iterator/pdomysql.php b/libraries/joomla/database/iterator/pdomysql.php
index 94924e5df9b92..e79dfe68ab20a 100644
--- a/libraries/joomla/database/iterator/pdomysql.php
+++ b/libraries/joomla/database/iterator/pdomysql.php
@@ -14,7 +14,7 @@
  *
  * @package     Joomla.Platform
  * @subpackage  Database
- * @see         http://dev.mysql.com/doc/
+ * @link        https://dev.mysql.com/doc/
  * @since       3.4
  */
 class JDatabaseIteratorPdomysql extends JDatabaseIteratorPdo
diff --git a/libraries/joomla/database/query.php b/libraries/joomla/database/query.php
index 09233b6621446..d6e91c79b87a3 100644
--- a/libraries/joomla/database/query.php
+++ b/libraries/joomla/database/query.php
@@ -1762,7 +1762,7 @@ public function format($format)
 	 *
 	 * @return  string  The string with the appropriate sql for addition of dates
 	 *
-	 * @see     http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_date-add
+	 * @link    http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_date-add
 	 * @since   13.1
 	 */
 	public function dateAdd($date, $interval, $datePart)
diff --git a/libraries/joomla/document/feed/renderer/atom.php b/libraries/joomla/document/feed/renderer/atom.php
index e9cb8e756f798..bd81a81ac49bb 100644
--- a/libraries/joomla/document/feed/renderer/atom.php
+++ b/libraries/joomla/document/feed/renderer/atom.php
@@ -18,7 +18,7 @@
  * produce valid atom files. For example, you have to specify either an editor
  * for the feed or an author for every single feed item.
  *
- * @see         http://www.atomenabled.org/developers/syndication/atom-format-spec.php
+ * @link        http://www.atomenabled.org/developers/syndication/atom-format-spec.php
  * @since       11.1
  * @deprecated  4.0  Use JDocumentRendererFeedAtom instead
  */
diff --git a/libraries/joomla/document/feed/renderer/rss.php b/libraries/joomla/document/feed/renderer/rss.php
index b97acc0cd6751..65bec5a3679e8 100644
--- a/libraries/joomla/document/feed/renderer/rss.php
+++ b/libraries/joomla/document/feed/renderer/rss.php
@@ -14,7 +14,7 @@
 /**
  * JDocumentRendererRSS is a feed that implements RSS 2.0 Specification
  *
- * @see         http://www.rssboard.org/rss-specification
+ * @link        http://www.rssboard.org/rss-specification
  * @since       11.1
  * @deprecated  4.0  Use JDocumentRendererFeedRss instead
  */
diff --git a/libraries/joomla/document/json.php b/libraries/joomla/document/json.php
index 2d88fb08b8a43..7fb5107931b3b 100644
--- a/libraries/joomla/document/json.php
+++ b/libraries/joomla/document/json.php
@@ -12,7 +12,7 @@
 /**
  * JDocumentJson class, provides an easy interface to parse and display JSON output
  *
- * @see    http://www.json.org/
+ * @link   http://www.json.org/
  * @since  11.1
  */
 class JDocumentJson extends JDocument
diff --git a/libraries/joomla/document/opensearch.php b/libraries/joomla/document/opensearch.php
index 2606020d119db..cfd04c8252606 100644
--- a/libraries/joomla/document/opensearch.php
+++ b/libraries/joomla/document/opensearch.php
@@ -12,7 +12,7 @@
 /**
  * OpenSearch class, provides an easy interface to display an OpenSearch document
  *
- * @see    http://www.opensearch.org/
+ * @link   http://www.opensearch.org/
  * @since  11.1
  */
 class JDocumentOpensearch extends JDocument
diff --git a/libraries/joomla/document/renderer/feed/atom.php b/libraries/joomla/document/renderer/feed/atom.php
index a7787f1020c4f..9e6aaade40bea 100644
--- a/libraries/joomla/document/renderer/feed/atom.php
+++ b/libraries/joomla/document/renderer/feed/atom.php
@@ -16,7 +16,7 @@
  * produce valid atom files. For example, you have to specify either an editor
  * for the feed or an author for every single feed item.
  *
- * @see    http://www.atomenabled.org/developers/syndication/atom-format-spec.php
+ * @link   http://www.atomenabled.org/developers/syndication/atom-format-spec.php
  * @since  3.5
  *
  * @property-read  JDocumentFeed  $_doc  Reference to the JDocument object that instantiated the renderer
diff --git a/libraries/joomla/document/renderer/feed/rss.php b/libraries/joomla/document/renderer/feed/rss.php
index caddd14cf32eb..c04238b0abe3e 100644
--- a/libraries/joomla/document/renderer/feed/rss.php
+++ b/libraries/joomla/document/renderer/feed/rss.php
@@ -12,7 +12,7 @@
 /**
  * JDocumentRendererRSS is a feed that implements RSS 2.0 Specification
  *
- * @see    http://www.rssboard.org/rss-specification
+ * @link   http://www.rssboard.org/rss-specification
  * @since  3.5
  *
  * @property-read  JDocumentFeed  $_doc  Reference to the JDocument object that instantiated the renderer
diff --git a/libraries/joomla/facebook/album.php b/libraries/joomla/facebook/album.php
index f24c19e310300..90c5621723417 100644
--- a/libraries/joomla/facebook/album.php
+++ b/libraries/joomla/facebook/album.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Album class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/album/
+ * @link        http://developers.facebook.com/docs/reference/api/album/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/checkin.php b/libraries/joomla/facebook/checkin.php
index d357b9db141c0..25317f0d995d4 100644
--- a/libraries/joomla/facebook/checkin.php
+++ b/libraries/joomla/facebook/checkin.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Checkin class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/checkin/
+ * @link        http://developers.facebook.com/docs/reference/api/checkin/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/comment.php b/libraries/joomla/facebook/comment.php
index 69022109de841..45c95275c2a3f 100644
--- a/libraries/joomla/facebook/comment.php
+++ b/libraries/joomla/facebook/comment.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Comment class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/Comment/
+ * @link        http://developers.facebook.com/docs/reference/api/Comment/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/event.php b/libraries/joomla/facebook/event.php
index 18472575cdc41..a4b68a46d2fd4 100644
--- a/libraries/joomla/facebook/event.php
+++ b/libraries/joomla/facebook/event.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API User class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/event/
+ * @link        http://developers.facebook.com/docs/reference/api/event/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/group.php b/libraries/joomla/facebook/group.php
index 49dbb908f5967..49e2149dac402 100644
--- a/libraries/joomla/facebook/group.php
+++ b/libraries/joomla/facebook/group.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Group class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/group/
+ * @link        http://developers.facebook.com/docs/reference/api/group/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/link.php b/libraries/joomla/facebook/link.php
index 042fce6f75cb7..d3f40a5c233f5 100644
--- a/libraries/joomla/facebook/link.php
+++ b/libraries/joomla/facebook/link.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Link class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/link/
+ * @link        http://developers.facebook.com/docs/reference/api/link/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/note.php b/libraries/joomla/facebook/note.php
index 8bb677d260a35..68ea080569a9e 100644
--- a/libraries/joomla/facebook/note.php
+++ b/libraries/joomla/facebook/note.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Note class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/note/
+ * @link        http://developers.facebook.com/docs/reference/api/note/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/photo.php b/libraries/joomla/facebook/photo.php
index fa4a0de478b23..ea374a64757e5 100644
--- a/libraries/joomla/facebook/photo.php
+++ b/libraries/joomla/facebook/photo.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Photo class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/photo/
+ * @link        http://developers.facebook.com/docs/reference/api/photo/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/post.php b/libraries/joomla/facebook/post.php
index 4756e2eaed593..3302cbe79d97c 100644
--- a/libraries/joomla/facebook/post.php
+++ b/libraries/joomla/facebook/post.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Post class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/post/
+ * @link        http://developers.facebook.com/docs/reference/api/post/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/status.php b/libraries/joomla/facebook/status.php
index 489e63c101a64..2b083de8f68bc 100644
--- a/libraries/joomla/facebook/status.php
+++ b/libraries/joomla/facebook/status.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Status class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/status/
+ * @link        http://developers.facebook.com/docs/reference/api/status/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/user.php b/libraries/joomla/facebook/user.php
index 3a2fe1c668f71..6cb66a2767696 100644
--- a/libraries/joomla/facebook/user.php
+++ b/libraries/joomla/facebook/user.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API User class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/user/
+ * @link        http://developers.facebook.com/docs/reference/api/user/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/facebook/video.php b/libraries/joomla/facebook/video.php
index 02fae2a3d3155..4eccbff8d05ce 100644
--- a/libraries/joomla/facebook/video.php
+++ b/libraries/joomla/facebook/video.php
@@ -12,7 +12,7 @@
 /**
  * Facebook API Video class for the Joomla Platform.
  *
- * @see         http://developers.facebook.com/docs/reference/api/video/
+ * @link        http://developers.facebook.com/docs/reference/api/video/
  * @since       13.1
  * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
diff --git a/libraries/joomla/feed/parser/rss/itunes.php b/libraries/joomla/feed/parser/rss/itunes.php
index 8668519e55b4e..7e93cee617e3e 100644
--- a/libraries/joomla/feed/parser/rss/itunes.php
+++ b/libraries/joomla/feed/parser/rss/itunes.php
@@ -12,7 +12,7 @@
 /**
  * RSS Feed Parser Namespace handler for iTunes.
  *
- * @see    https://itunespartner.apple.com/en/podcasts/overview
+ * @link   https://itunespartner.apple.com/en/podcasts/overview
  * @since  12.3
  */
 class JFeedParserRssItunes implements JFeedParserNamespace
diff --git a/libraries/joomla/feed/parser/rss/media.php b/libraries/joomla/feed/parser/rss/media.php
index 151e17abdeaf9..6615425dc51a8 100644
--- a/libraries/joomla/feed/parser/rss/media.php
+++ b/libraries/joomla/feed/parser/rss/media.php
@@ -12,7 +12,7 @@
 /**
  * RSS Feed Parser Namespace handler for MediaRSS.
  *
- * @see    http://video.search.yahoo.com/mrss
+ * @link   http://video.search.yahoo.com/mrss
  * @since  12.3
  */
 class JFeedParserRssMedia implements JFeedParserNamespace
diff --git a/libraries/joomla/filesystem/helper.php b/libraries/joomla/filesystem/helper.php
index fa99506684220..35ad7bc095692 100644
--- a/libraries/joomla/filesystem/helper.php
+++ b/libraries/joomla/filesystem/helper.php
@@ -25,7 +25,7 @@ class JFilesystemHelper
 	 *
 	 * @return  mixed
 	 *
-	 * @see     https://secure.php.net/manual/en/function.filesize.php#71098
+	 * @link    https://secure.php.net/manual/en/function.filesize.php#71098
 	 * @since   11.1
 	 */
 	public static function remotefsize($url)
@@ -120,7 +120,7 @@ public static function remotefsize($url)
 	 *
 	 * @return  mixed
 	 *
-	 * @see     https://secure.php.net/manual/en/function.ftp-chmod.php
+	 * @link    https://secure.php.net/manual/en/function.ftp-chmod.php
 	 * @since   11.1
 	 */
 	public static function ftpChmod($url, $mode)
diff --git a/libraries/joomla/filesystem/stream.php b/libraries/joomla/filesystem/stream.php
index eacd0b8a3b7f2..dc38554a205eb 100644
--- a/libraries/joomla/filesystem/stream.php
+++ b/libraries/joomla/filesystem/stream.php
@@ -17,11 +17,11 @@
  * atomic manner.
  *
  * @note   This class adheres to the stream wrapper operations:
- * @see    https://secure.php.net/manual/en/function.stream-get-wrappers.php
- * @see    https://secure.php.net/manual/en/intro.stream.php PHP Stream Manual
- * @see    https://secure.php.net/manual/en/wrappers.php Stream Wrappers
- * @see    https://secure.php.net/manual/en/filters.php Stream Filters
- * @see    https://secure.php.net/manual/en/transports.php Socket Transports (used by some options, particularly HTTP proxy)
+ * @link   https://secure.php.net/manual/en/function.stream-get-wrappers.php
+ * @link   https://secure.php.net/manual/en/intro.stream.php PHP Stream Manual
+ * @link   https://secure.php.net/manual/en/wrappers.php Stream Wrappers
+ * @link   https://secure.php.net/manual/en/filters.php Stream Filters
+ * @link   https://secure.php.net/manual/en/transports.php Socket Transports (used by some options, particularly HTTP proxy)
  * @since  11.1
  */
 class JStream extends JObject
@@ -533,7 +533,7 @@ public function gets($length = 0)
 	 *
 	 * @return  mixed
 	 *
-	 * @see     https://secure.php.net/manual/en/function.fread.php
+	 * @link    https://secure.php.net/manual/en/function.fread.php
 	 * @since   11.1
 	 */
 	public function read($length = 0)
@@ -636,7 +636,7 @@ public function read($length = 0)
 	 *
 	 * @return  boolean  True on success, false on failure
 	 *
-	 * @see     https://secure.php.net/manual/en/function.fseek.php
+	 * @link    https://secure.php.net/manual/en/function.fseek.php
 	 * @since   11.1
 	 */
 	public function seek($offset, $whence = SEEK_SET)
@@ -749,7 +749,7 @@ public function tell()
 	 *
 	 * @return  boolean
 	 *
-	 * @see     https://secure.php.net/manual/en/function.fwrite.php
+	 * @link    https://secure.php.net/manual/en/function.fwrite.php
 	 * @since   11.1
 	 */
 	public function write(&$string, $length = 0, $chunk = 0)
@@ -891,7 +891,7 @@ public function chmod($filename = '', $mode = 0)
 	 *
 	 * @return  array  header/metadata
 	 *
-	 * @see     https://secure.php.net/manual/en/function.stream-get-meta-data.php
+	 * @link    https://secure.php.net/manual/en/function.stream-get-meta-data.php
 	 * @since   11.1
 	 */
 	public function get_meta_data()
@@ -936,7 +936,7 @@ public function _buildContext()
 	 *
 	 * @return  void
 	 *
-	 * @see     https://secure.php.net/stream_context_create
+	 * @link    https://secure.php.net/stream_context_create
 	 * @since   11.1
 	 */
 	public function setContextOptions($context)
@@ -954,8 +954,8 @@ public function setContextOptions($context)
 	 *
 	 * @return  void
 	 *
-	 * @see     https://secure.php.net/stream_context_create Stream Context Creation
-	 * @see     https://secure.php.net/manual/en/context.php Context Options for various streams
+	 * @link    https://secure.php.net/stream_context_create Stream Context Creation
+	 * @link    https://secure.php.net/manual/en/context.php Context Options for various streams
 	 * @since   11.1
 	 */
 	public function addContextEntry($wrapper, $name, $value)
@@ -972,7 +972,7 @@ public function addContextEntry($wrapper, $name, $value)
 	 *
 	 * @return  void
 	 *
-	 * @see     https://secure.php.net/stream_context_create
+	 * @link    https://secure.php.net/stream_context_create
 	 * @since   11.1
 	 */
 	public function deleteContextEntry($wrapper, $name)
@@ -1042,7 +1042,7 @@ public function applyContextToStream()
 	 *
 	 * @return  mixed
 	 *
-	 * @see     https://secure.php.net/manual/en/function.stream-filter-append.php
+	 * @link    https://secure.php.net/manual/en/function.stream-filter-append.php
 	 * @since   11.1
 	 */
 	public function appendFilter($filtername, $read_write = STREAM_FILTER_READ, $params = array())
@@ -1083,7 +1083,7 @@ public function appendFilter($filtername, $read_write = STREAM_FILTER_READ, $par
 	 *
 	 * @return  mixed
 	 *
-	 * @see     https://secure.php.net/manual/en/function.stream-filter-prepend.php
+	 * @link    https://secure.php.net/manual/en/function.stream-filter-prepend.php
 	 * @since   11.1
 	 */
 	public function prependFilter($filtername, $read_write = STREAM_FILTER_READ, $params = array())
diff --git a/libraries/joomla/filesystem/streams/string.php b/libraries/joomla/filesystem/streams/string.php
index c070c6280268a..3eaa9d22247f9 100644
--- a/libraries/joomla/filesystem/streams/string.php
+++ b/libraries/joomla/filesystem/streams/string.php
@@ -83,7 +83,7 @@ class JStreamString
 	 * @var    array
 	 * @since  12.1
 	 *
-	 * @see    http://us.php.net/manual/en/function.stat.php
+	 * @link   http://us.php.net/manual/en/function.stat.php
 	 */
 	protected $stat;
 
@@ -122,7 +122,7 @@ public function stream_open($path, $mode, $options, &$opened_path)
 	 *
 	 * @return  array
 	 *
-	 * @see     https://secure.php.net/manual/en/streamwrapper.stream-stat.php
+	 * @link    https://secure.php.net/manual/en/streamwrapper.stream-stat.php
 	 * @since   11.1
 	 */
 	public function stream_stat()
@@ -138,7 +138,7 @@ public function stream_stat()
 	 *
 	 * @return  array
 	 *
-	 * @see     https://secure.php.net/manual/en/streamwrapper.url-stat.php
+	 * @link    https://secure.php.net/manual/en/streamwrapper.url-stat.php
 	 * @since   11.1
 	 */
 	public function url_stat($path, $flags = 0)
@@ -175,7 +175,7 @@ public function url_stat($path, $flags = 0)
 	 *
 	 * @since   11.1
 	 *
-	 * @see     https://secure.php.net/manual/en/streamwrapper.stream-read.php
+	 * @link    https://secure.php.net/manual/en/streamwrapper.stream-read.php
 	 */
 	public function stream_read($count)
 	{
diff --git a/libraries/joomla/form/rule/email.php b/libraries/joomla/form/rule/email.php
index 1bdc61d5e4a58..bcff4426a732b 100644
--- a/libraries/joomla/form/rule/email.php
+++ b/libraries/joomla/form/rule/email.php
@@ -23,7 +23,7 @@ class JFormRuleEmail extends JFormRule
 	 *
 	 * @var    string
 	 * @since  11.1
-	 * @see    http://www.w3.org/TR/html-markup/input.email.html
+	 * @link   http://www.w3.org/TR/html-markup/input.email.html
 	 */
 	protected $regex = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$";
 
diff --git a/libraries/joomla/form/rule/tel.php b/libraries/joomla/form/rule/tel.php
index defab8b45ee15..36e284af13662 100644
--- a/libraries/joomla/form/rule/tel.php
+++ b/libraries/joomla/form/rule/tel.php
@@ -44,12 +44,12 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 		}
 
 		/*
-		 * @see http://www.nanpa.com/
-		 * @see http://tools.ietf.org/html/rfc4933
-		 * @see http://www.itu.int/rec/T-REC-E.164/en
+		 * @link http://www.nanpa.com/
+		 * @link http://tools.ietf.org/html/rfc4933
+		 * @link http://www.itu.int/rec/T-REC-E.164/en
 		 *
 		 * Regex by Steve Levithan
-		 * @see http://blog.stevenlevithan.com/archives/validate-phone-number
+		 * @link http://blog.stevenlevithan.com/archives/validate-phone-number
 		 * @note that valid ITU-T and EPP must begin with +.
 		 */
 		$regexarray = array(
diff --git a/libraries/joomla/form/rule/url.php b/libraries/joomla/form/rule/url.php
index 51185d224d2fa..0c9c39df1d96b 100644
--- a/libraries/joomla/form/rule/url.php
+++ b/libraries/joomla/form/rule/url.php
@@ -65,7 +65,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 		 * Note that parse_url() does not always parse accurately without a scheme,
 		 * but at least the path should be set always. Note also that parse_url()
 		 * returns False for seriously malformed URLs instead of an associative array.
-		 * @see https://secure.php.net/manual/en/function.parse-url.php
+		 * @link https://secure.php.net/manual/en/function.parse-url.php
 		 */
 		if ($urlParts === false or !array_key_exists('scheme', $urlParts))
 		{
diff --git a/libraries/joomla/http/transport/curl.php b/libraries/joomla/http/transport/curl.php
index 1f8635f5e8af9..52a6bb290ea46 100644
--- a/libraries/joomla/http/transport/curl.php
+++ b/libraries/joomla/http/transport/curl.php
@@ -29,7 +29,7 @@ class JHttpTransportCurl implements JHttpTransport
 	 *
 	 * @param   Registry  $options  Client options object.
 	 *
-	 * @see     https://secure.php.net/manual/en/function.curl-setopt.php
+	 * @link    https://secure.php.net/manual/en/function.curl-setopt.php
 	 * @since   11.3
 	 * @throws  RuntimeException
 	 */
diff --git a/libraries/joomla/image/image.php b/libraries/joomla/image/image.php
index a1122defa533e..301ee44dacede 100644
--- a/libraries/joomla/image/image.php
+++ b/libraries/joomla/image/image.php
@@ -971,7 +971,7 @@ public function flip($mode, $createNew = true)
 	 *
 	 * @return  boolean
 	 *
-	 * @see     https://secure.php.net/manual/image.constants.php
+	 * @link    https://secure.php.net/manual/image.constants.php
 	 * @since   11.3
 	 * @throws  LogicException
 	 */
diff --git a/libraries/joomla/linkedin/oauth.php b/libraries/joomla/linkedin/oauth.php
index 7a536839d96dc..6da9aebd9295b 100644
--- a/libraries/joomla/linkedin/oauth.php
+++ b/libraries/joomla/linkedin/oauth.php
@@ -119,7 +119,7 @@ public function validateResponse($url, $response)
 	 *
 	 * @return  JLinkedinOauth  This object for method chaining
 	 *
-	 * @see     https://developer.linkedin.com/documents/authentication
+	 * @link    https://developer.linkedin.com/documents/authentication
 	 * @since   13.1
 	 */
 	public function setScope($scope)
diff --git a/libraries/joomla/log/logger/w3c.php b/libraries/joomla/log/logger/w3c.php
index 1980c87a2506a..4dbad6db2ad6b 100644
--- a/libraries/joomla/log/logger/w3c.php
+++ b/libraries/joomla/log/logger/w3c.php
@@ -14,7 +14,7 @@
  *
  * This class is designed to build log files based on the W3C specification.
  *
- * @see    https://www.w3.org/TR/WD-logfile.html
+ * @link   https://www.w3.org/TR/WD-logfile.html
  * @since  11.1
  */
 class JLogLoggerW3c extends JLogLoggerFormattedtext
diff --git a/libraries/joomla/platform.php b/libraries/joomla/platform.php
index 688d6de181337..cd198220cc4cb 100644
--- a/libraries/joomla/platform.php
+++ b/libraries/joomla/platform.php
@@ -56,7 +56,7 @@ final class JPlatform
 	 *
 	 * @return  boolean  True if the version is compatible.
 	 *
-	 * @see     https://secure.php.net/version_compare
+	 * @link    https://secure.php.net/version_compare
 	 * @since   11.1
 	 * @deprecated  4.0  Deprecated without replacement
 	 */
diff --git a/libraries/joomla/session/session.php b/libraries/joomla/session/session.php
index 3d16d06b540f9..597273e8a2333 100644
--- a/libraries/joomla/session/session.php
+++ b/libraries/joomla/session/session.php
@@ -449,7 +449,7 @@ public function isNew()
 	 * @param   JInput            $input       JInput object for the session to use.
 	 * @param   JEventDispatcher  $dispatcher  Dispatcher object for the session to use.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   12.2
 	 */
@@ -943,7 +943,7 @@ protected function _setOptions(array $options)
 	 *
 	 * @return  boolean  True on success
 	 *
-	 * @see     http://shiflett.org/articles/the-truth-about-sessions
+	 * @link    http://shiflett.org/articles/the-truth-about-sessions
 	 * @since   11.1
 	 */
 	protected function _validate($restart = false)
diff --git a/libraries/joomla/session/storage.php b/libraries/joomla/session/storage.php
index 1ad47bd9774dd..641f0fbadb540 100644
--- a/libraries/joomla/session/storage.php
+++ b/libraries/joomla/session/storage.php
@@ -12,7 +12,7 @@
 /**
  * Custom session storage handler for PHP
  *
- * @see         https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @link        https://secure.php.net/manual/en/function.session-set-save-handler.php
  * @since       11.1
  * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
  */
diff --git a/libraries/joomla/session/storage/apc.php b/libraries/joomla/session/storage/apc.php
index 45350b7046775..d3c9ac43b41cb 100644
--- a/libraries/joomla/session/storage/apc.php
+++ b/libraries/joomla/session/storage/apc.php
@@ -12,7 +12,7 @@
 /**
  * APC session storage handler for PHP
  *
- * @see         https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @link        https://secure.php.net/manual/en/function.session-set-save-handler.php
  * @since       11.1
  * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
  */
diff --git a/libraries/joomla/session/storage/database.php b/libraries/joomla/session/storage/database.php
index da7b242cf388d..5b152e2d2c1c7 100644
--- a/libraries/joomla/session/storage/database.php
+++ b/libraries/joomla/session/storage/database.php
@@ -12,7 +12,7 @@
 /**
  * Database session storage handler for PHP
  *
- * @see         https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @link        https://secure.php.net/manual/en/function.session-set-save-handler.php
  * @since       11.1
  * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
  */
diff --git a/libraries/joomla/session/storage/none.php b/libraries/joomla/session/storage/none.php
index 60aaccf5baaa3..a60f4500d50dd 100644
--- a/libraries/joomla/session/storage/none.php
+++ b/libraries/joomla/session/storage/none.php
@@ -12,7 +12,7 @@
 /**
  * File session handler for PHP
  *
- * @see         https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @link        https://secure.php.net/manual/en/function.session-set-save-handler.php
  * @since       11.1
  * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
  */
diff --git a/libraries/joomla/string/string.php b/libraries/joomla/string/string.php
index 8d2f5afc1bbde..0e763d8ba9102 100644
--- a/libraries/joomla/string/string.php
+++ b/libraries/joomla/string/string.php
@@ -53,7 +53,7 @@ public static function splitCamelCase($string)
 	 *
 	 * @return  mixed  Associative array or false if badly formed URL.
 	 *
-	 * @see     http://us3.php.net/manual/en/function.parse-url.php
+	 * @link    http://us3.php.net/manual/en/function.parse-url.php
 	 * @since   11.1
 	 * @deprecated  4.0 (CMS) - Use {@link \Joomla\Uri\UriHelper::parse_url()} instead.
 	 */
diff --git a/libraries/joomla/utilities/arrayhelper.php b/libraries/joomla/utilities/arrayhelper.php
index f22b4f87cad71..50be7db43ff65 100644
--- a/libraries/joomla/utilities/arrayhelper.php
+++ b/libraries/joomla/utilities/arrayhelper.php
@@ -424,7 +424,7 @@ protected static function _sortObjects(&$a, &$b)
 	 *
 	 * @return  array
 	 *
-	 * @see     https://secure.php.net/manual/en/function.array-unique.php
+	 * @link    https://secure.php.net/manual/en/function.array-unique.php
 	 * @since   11.2
 	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::arrayUnique instead
 	 */
diff --git a/libraries/legacy/database/mysql.php b/libraries/legacy/database/mysql.php
index b5ec20fc96c57..7f3da4b8c0509 100644
--- a/libraries/legacy/database/mysql.php
+++ b/libraries/legacy/database/mysql.php
@@ -14,7 +14,7 @@
 /**
  * MySQL database driver
  *
- * @see         http://dev.mysql.com/doc/
+ * @link        http://dev.mysql.com/doc/
  * @since       1.5
  * @deprecated  3.0 Use JDatabaseDriverMysql instead.
  */
diff --git a/libraries/legacy/database/mysqli.php b/libraries/legacy/database/mysqli.php
index c332c6ce75f01..d847bc0eb6ab7 100644
--- a/libraries/legacy/database/mysqli.php
+++ b/libraries/legacy/database/mysqli.php
@@ -14,7 +14,7 @@
 /**
  * MySQLi database driver
  *
- * @see         https://secure.php.net/manual/en/book.mysqli.php
+ * @link        https://secure.php.net/manual/en/book.mysqli.php
  * @since       1.5
  * @deprecated  3.0 Use JDatabaseDriverMysqli instead.
  */
diff --git a/libraries/legacy/database/sqlazure.php b/libraries/legacy/database/sqlazure.php
index e4399b3a16de7..03d9c323870fa 100644
--- a/libraries/legacy/database/sqlazure.php
+++ b/libraries/legacy/database/sqlazure.php
@@ -14,7 +14,7 @@
 /**
  * SQL Server database driver
  *
- * @see         https://azure.microsoft.com/en-us/documentation/services/sql-database/
+ * @link        https://azure.microsoft.com/en-us/documentation/services/sql-database/
  * @since       1.7
  * @deprecated  3.0 Use JDatabaseDriverSqlazure instead.
  */
diff --git a/libraries/legacy/database/sqlsrv.php b/libraries/legacy/database/sqlsrv.php
index a0308864be6a4..e38e59daceb7b 100644
--- a/libraries/legacy/database/sqlsrv.php
+++ b/libraries/legacy/database/sqlsrv.php
@@ -14,7 +14,7 @@
 /**
  * SQL Server database driver
  *
- * @see         https://msdn.microsoft.com/en-us/library/cc296152(SQL.90).aspx
+ * @link        https://msdn.microsoft.com/en-us/library/cc296152(SQL.90).aspx
  * @since       1.7
  * @deprecated  3.0 Use JDatabaseDriverSqlsrv instead.
  */
diff --git a/plugins/quickicon/phpversioncheck/phpversioncheck.php b/plugins/quickicon/phpversioncheck/phpversioncheck.php
index 5400f37e798e3..ad6ea4d9d68dc 100644
--- a/plugins/quickicon/phpversioncheck/phpversioncheck.php
+++ b/plugins/quickicon/phpversioncheck/phpversioncheck.php
@@ -99,8 +99,8 @@ public function onGetIcons($context)
 	 *
 	 * @since   3.7.0
 	 * @note    The dates used in this method should correspond to the dates given on PHP.net
-	 * @see     https://secure.php.net/supported-versions.php
-	 * @see     https://secure.php.net/eol.php
+	 * @link    https://secure.php.net/supported-versions.php
+	 * @link    https://secure.php.net/eol.php
 	 */
 	private function getPhpSupport()
 	{
diff --git a/plugins/system/stats/stats.php b/plugins/system/stats/stats.php
index d6ad57a153682..182c03cf3a83a 100644
--- a/plugins/system/stats/stats.php
+++ b/plugins/system/stats/stats.php
@@ -274,7 +274,7 @@ protected function getLayoutData()
 	/**
 	 * Get the layout paths
 	 *
-	 * @return  array()
+	 * @return  array
 	 *
 	 * @since   3.5
 	 */
@@ -309,7 +309,7 @@ protected function getRenderer($layoutId = 'default')
 	/**
 	 * Get the data that will be sent to the stats server.
 	 *
-	 * @return  array.
+	 * @return  array
 	 *
 	 * @since   3.5
 	 */
diff --git a/tests/unit/suites/libraries/cms/html/stubs/JHtmlBehaviorInspector.php b/tests/unit/suites/libraries/cms/html/stubs/JHtmlBehaviorInspector.php
index 0493a83f6e17d..daf0e326de1b1 100644
--- a/tests/unit/suites/libraries/cms/html/stubs/JHtmlBehaviorInspector.php
+++ b/tests/unit/suites/libraries/cms/html/stubs/JHtmlBehaviorInspector.php
@@ -19,7 +19,7 @@ abstract class JHtmlBehaviorInspector extends JHtmlBehavior
 	/**
 	 * Resets the JHtmlBehavior::$loaded array
 	 *
-	 * @return  mixed  void.
+	 * @return  mixed  void
 	 *
 	 * @since   3.1
 	 */
diff --git a/tests/unit/suites/libraries/cms/router/JRouterTest.php b/tests/unit/suites/libraries/cms/router/JRouterTest.php
index 321c58481f361..260b032141fd0 100644
--- a/tests/unit/suites/libraries/cms/router/JRouterTest.php
+++ b/tests/unit/suites/libraries/cms/router/JRouterTest.php
@@ -252,7 +252,7 @@ public function testModeCanBeSetToAnyArbitraryValue()
 	}
 
 	/**
-	 * @see     https://github.com/joomla-projects/joomla-pythagoras/issues/3
+	 * @link    https://github.com/joomla-projects/joomla-pythagoras/issues/3
 	 * @since   3.4
 	 */
 	public function testMultipleVariablesCanBeAddedAtOnceAndOptionallyReplaceExistingVariables()
diff --git a/tests/unit/suites/libraries/joomla/application/stubs/JApplicationDaemonInspector.php b/tests/unit/suites/libraries/joomla/application/stubs/JApplicationDaemonInspector.php
index d449353fb0f73..35f79a9f85a20 100644
--- a/tests/unit/suites/libraries/joomla/application/stubs/JApplicationDaemonInspector.php
+++ b/tests/unit/suites/libraries/joomla/application/stubs/JApplicationDaemonInspector.php
@@ -73,7 +73,7 @@ public function getClassProperty($name)
 	 *
 	 * @param   mixed  $value  The value of the property.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   11.3
 	 */
@@ -87,7 +87,7 @@ public function setClassInstance($value)
 	 *
 	 * @param   mixed  $value  The value of the property.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   11.3
 	 */
@@ -102,7 +102,7 @@ public function setClassSignals(array $value)
 	 * @param   string  $name   The name of the property.
 	 * @param   mixed   $value  The value of the property.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   11.3
 	 */
diff --git a/tests/unit/suites/libraries/joomla/image/stubs/JImageInspector.php b/tests/unit/suites/libraries/joomla/image/stubs/JImageInspector.php
index 429701bb89ec7..75a174bd6ce4a 100644
--- a/tests/unit/suites/libraries/joomla/image/stubs/JImageInspector.php
+++ b/tests/unit/suites/libraries/joomla/image/stubs/JImageInspector.php
@@ -50,7 +50,7 @@ public function getClassProperty($name)
 	 * @param   string  $name   The name of the property.
 	 * @param   mixed   $value  The value of the property.
 	 *
-	 * @return  void.
+	 * @return  void
 	 *
 	 * @since   11.3
 	 * @throws  Exception
diff --git a/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php b/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
index 2e342e0b78ea9..a8c1af4ed5cdc 100644
--- a/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
+++ b/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
@@ -86,8 +86,6 @@ protected function getDataSet()
 	 *                    with indices 'code', 'msg', and
 	 *                    'info', empty, if no error occurred
 	 *
-	 * @see ... (link to where the group and error structures are
-	 *      defined)
 	 * @return array
 	 */
 	public function casesGetUserGroups()
@@ -381,7 +379,7 @@ public function testVerifyPassword()
 	 * @return  void
 	 *
 	 * @since   3.2
-	 * @see     https://github.com/joomla/joomla-cms/pull/5551
+	 * @link    https://github.com/joomla/joomla-cms/pull/5551
 	 */
 	public function testVerifyPasswordWithNoSalt()
 	{
diff --git a/tests/unit/suites/libraries/legacy/error/JErrorInspector.php b/tests/unit/suites/libraries/legacy/error/JErrorInspector.php
index 188392ad01a3f..c96e8e86dc0df 100644
--- a/tests/unit/suites/libraries/legacy/error/JErrorInspector.php
+++ b/tests/unit/suites/libraries/legacy/error/JErrorInspector.php
@@ -19,7 +19,7 @@ class JErrorInspector extends JError
 	/**
 	 * Stub method to get $levels
 	 *
-	 * @return  JError::$levels
+	 * @return  array
 	 */
 	public static function inspectLevels()
 	{
@@ -29,7 +29,7 @@ public static function inspectLevels()
 	/**
 	 * Stub method get $handlers
 	 *
-	 * @return  JError::$handlers
+	 * @return  array
 	 */
 	public static function inspectHandlers()
 	{
@@ -39,7 +39,7 @@ public static function inspectHandlers()
 	/**
 	 * Stub method to get $stack
 	 *
-	 * @return  JError::$stack
+	 * @return  array
 	 */
 	public static function inspectStack()
 	{