diff --git src/bbpress.php src/bbpress.php
index 4bf8f51..3a32244 100644
--- src/bbpress.php
+++ src/bbpress.php
@@ -32,7 +32,7 @@ if ( !class_exists( 'bbPress' ) ) :
  *
  * "How doth the little busy bee, improve each shining hour..."
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  */
 final class bbPress {
 
@@ -90,7 +90,8 @@ final class bbPress {
 	 * Insures that only one instance of bbPress exists in memory at any one
 	 * time. Also prevents needing to define globals all over the place.
 	 *
-	 * @since bbPress (r3757)
+	 * @since 2.1.0 bbPress (r3757)
+	 *
 	 * @staticvar object $instance
 	 * @uses bbPress::setup_globals() Setup the globals needed
 	 * @uses bbPress::includes() Include the required files
@@ -120,7 +121,8 @@ final class bbPress {
 	/**
 	 * A dummy constructor to prevent bbPress from being loaded more than once.
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
+	 *
 	 * @see bbPress::instance()
 	 * @see bbpress();
 	 */
@@ -129,42 +131,42 @@ final class bbPress {
 	/**
 	 * A dummy magic method to prevent bbPress from being cloned
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 */
 	public function __clone() { _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'bbpress' ), '2.1' ); }
 
 	/**
 	 * A dummy magic method to prevent bbPress from being unserialized
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 */
 	public function __wakeup() { _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'bbpress' ), '2.1' ); }
 
 	/**
 	 * Magic method for checking the existence of a certain custom field
 	 *
-	 * @since bbPress (r3951)
+	 * @since 2.1.0 bbPress (r3951)
 	 */
 	public function __isset( $key ) { return isset( $this->data[ $key ] ); }
 
 	/**
 	 * Magic method for getting bbPress variables
 	 *
-	 * @since bbPress (r3951)
+	 * @since 2.1.0 bbPress (r3951)
 	 */
 	public function __get( $key ) { return isset( $this->data[ $key ] ) ? $this->data[ $key ] : null; }
 
 	/**
 	 * Magic method for setting bbPress variables
 	 *
-	 * @since bbPress (r3951)
+	 * @since 2.1.0 bbPress (r3951)
 	 */
 	public function __set( $key , $value ) { $this->data[ $key ] = $value; }
 
 	/**
 	 * Magic method for unsetting bbPress variables
 	 *
-	 * @since bbPress (r4628)
+	 * @since 2.3.0 bbPress (r4628)
 	 */
 	public function __unset( $key ) {
 		if ( isset( $this->data[ $key ] ) ) {
@@ -175,7 +177,7 @@ final class bbPress {
 	/**
 	 * Magic method to prevent notices and errors from invalid method calls
 	 *
-	 * @since bbPress (r4252)
+	 * @since 2.2.0 bbPress (r4252)
 	 */
 	public function __call( $name = '', $args = array() ) { unset( $name, $args ); return null; }
 
@@ -185,7 +187,8 @@ final class bbPress {
 	 * Set some smart defaults to class variables. Allow some of them to be
 	 * filtered to allow for early overriding.
 	 *
-	 * @since bbPress (r2626)
+	 * @since 2.0.0 bbPress (r2626)
+	 *
 	 * @access private
 	 * @uses plugin_dir_path() To generate bbPress plugin path
 	 * @uses plugin_dir_url() To generate bbPress plugin url
@@ -286,7 +289,8 @@ final class bbPress {
 	/**
 	 * Include required files
 	 *
-	 * @since bbPress (r2626)
+	 * @since 2.0.0 bbPress (r2626)
+	 *
 	 * @access private
 	 * @uses is_admin() If in WordPress admin, load additional file
 	 */
@@ -359,7 +363,8 @@ final class bbPress {
 	/**
 	 * Setup the default hooks and actions
 	 *
-	 * @since bbPress (r2644)
+	 * @since 2.0.0 bbPress (r2644)
+	 *
 	 * @access private
 	 * @uses add_action() To add various actions
 	 */
@@ -408,7 +413,7 @@ final class bbPress {
 	 * the bbp-theme-compat folders, it's fine to hardcode these here. If at a
 	 * later date we need to automate this, and API will need to be built.
 	 *
-	 * @since bbPress (r3829)
+	 * @since 2.1.0 bbPress (r3829)
 	 */
 	public function register_theme_packages() {
 
@@ -430,7 +435,7 @@ final class bbPress {
 	/**
 	 * Setup the default bbPress theme compatibility location.
 	 *
-	 * @since bbPress (r3778)
+	 * @since 2.1.0 bbPress (r3778)
 	 */
 	public function setup_theme() {
 
@@ -452,7 +457,7 @@ final class bbPress {
 	 * will be removed on bbPress updates. If you're creating custom
 	 * translation files, please use the global language folder.
 	 *
-	 * @since bbPress (r2596)
+	 * @since 2.0.0 bbPress (r2596)
 	 *
 	 * @uses apply_filters() Calls 'plugin_locale' with {@link get_locale()} value
 	 * @uses load_textdomain() To load the textdomain
@@ -480,7 +485,8 @@ final class bbPress {
 	/**
 	 * Setup the post types for forums, topics and replies
 	 *
-	 * @since bbPress (r2597)
+	 * @since 2.0.0 bbPress (r2597)
+	 *
 	 * @uses register_post_type() To register the post types
 	 * @uses apply_filters() Calls various filters to modify the arguments
 	 *                        sent to register_post_type()
@@ -569,7 +575,8 @@ final class bbPress {
 	 * We do some manipulation of the 'trash' status so trashed topics and
 	 * replies can be viewed from within the theme.
 	 *
-	 * @since bbPress (r2727)
+	 * @since 2.0.0 bbPress (r2727)
+	 *
 	 * @uses register_post_status() To register post statuses
 	 * @uses $wp_post_statuses To modify trash and private statuses
 	 * @uses current_user_can() To check if the current user is capable &
@@ -654,8 +661,8 @@ final class bbPress {
 	/**
 	 * Register the topic tag and forum moderator taxonomies
 	 *
-	 * @since bbPress (r2464) Added bbp_get_topic_tag_tax_id() taxonomy
-	 * @since bbPress (r5834) Added bbp_get_forum_mod_tax_id() taxonomy
+	 * @since 2.0.0 bbPress (r2464) Added bbp_get_topic_tag_tax_id() taxonomy
+	 * @since 2.6.0 bbPress (r5834) Added bbp_get_forum_mod_tax_id() taxonomy
 	 *
 	 * @uses register_taxonomy() To register the taxonomy
 	 * @uses bbp_get_topic_post_type() To get the topic post type
@@ -712,7 +719,8 @@ final class bbPress {
 	/**
 	 * Register the bbPress views
 	 *
-	 * @since bbPress (r2789)
+	 * @since 2.0.0 bbPress (r2789)
+	 *
 	 * @uses bbp_register_view() To register the views
 	 */
 	public static function register_views() {
@@ -748,7 +756,7 @@ final class bbPress {
 	/**
 	 * Register the bbPress shortcodes
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @uses BBP_Shortcodes
 	 */
@@ -764,7 +772,8 @@ final class bbPress {
 	 * execution. get_currentuserinfo() is used to check for XMLRPC_REQUEST to
 	 * avoid xmlrpc errors.
 	 *
-	 * @since bbPress (r2697)
+	 * @since 2.0.0 bbPress (r2697)
+	 *
 	 * @uses wp_get_current_user()
 	 */
 	public function setup_current_user() {
@@ -776,7 +785,8 @@ final class bbPress {
 	/**
 	 * Add the bbPress-specific rewrite tags
 	 *
-	 * @since bbPress (r2753)
+	 * @since 2.0.0 bbPress (r2753)
+	 *
 	 * @uses add_rewrite_tag() To add the rewrite tags
 	 */
 	public static function add_rewrite_tags() {
@@ -797,7 +807,8 @@ final class bbPress {
 	 * - Topic views
 	 * - User profiles
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
+	 *
 	 * @todo Extract into an API
 	 */
 	public static function add_rewrite_rules() {
@@ -896,7 +907,7 @@ final class bbPress {
 	 * - Topic Views
 	 * - Search
 	 *
-	 * @since bbPress (r4930)
+	 * @since 2.4.0 bbPress (r4930)
 	 */
 	public static function add_permastructs() {
 
diff --git src/includes/admin/actions.php src/includes/admin/actions.php
index 2bd8d6c..4f62f78 100644
--- src/includes/admin/actions.php
+++ src/includes/admin/actions.php
@@ -101,7 +101,7 @@ add_filter( 'bbp_admin_replies_column_headers', 'bbp_filter_column_headers' );
  * When a new site is created in a multisite installation, run the activation
  * routine on that site
  *
- * @since bbPress (r3283)
+ * @since 2.0.0 bbPress (r3283)
  *
  * @param int $blog_id
  * @param int $user_id
@@ -130,7 +130,7 @@ function bbp_new_site( $blog_id, $user_id, $domain, $path, $site_id, $meta ) {
 /**
  * Show icons in list-table column headers instead of strings
  *
- * @since bbPress (r5833)
+ * @since 2.6.0 bbPress (r5833)
  *
  * @param  array $columns Column headers fed into list-table objects
  *
@@ -187,7 +187,8 @@ function bbp_filter_column_headers( $columns = array() ) {
 /**
  * Piggy back admin_init action
  *
- * @since bbPress (r3766)
+ * @since 2.1.0 bbPress (r3766)
+ *
  * @uses do_action() Calls 'bbp_admin_init'
  */
 function bbp_admin_init() {
@@ -197,7 +198,8 @@ function bbp_admin_init() {
 /**
  * Piggy back admin_menu action
  *
- * @since bbPress (r3766)
+ * @since 2.1.0 bbPress (r3766)
+ *
  * @uses do_action() Calls 'bbp_admin_menu'
  */
 function bbp_admin_menu() {
@@ -207,7 +209,8 @@ function bbp_admin_menu() {
 /**
  * Piggy back admin_head action
  *
- * @since bbPress (r3766)
+ * @since 2.1.0 bbPress (r3766)
+ *
  * @uses do_action() Calls 'bbp_admin_head'
  */
 function bbp_admin_head() {
@@ -217,7 +220,8 @@ function bbp_admin_head() {
 /**
  * Piggy back admin_notices action
  *
- * @since bbPress (r3766)
+ * @since 2.1.0 bbPress (r3766)
+ *
  * @uses do_action() Calls 'bbp_admin_notices'
  */
 function bbp_admin_notices() {
@@ -227,7 +231,8 @@ function bbp_admin_notices() {
 /**
  * Dedicated action to register bbPress importers
  *
- * @since bbPress (r3766)
+ * @since 2.1.0 bbPress (r3766)
+ *
  * @uses do_action() Calls 'bbp_admin_notices'
  */
 function bbp_register_importers() {
@@ -237,7 +242,8 @@ function bbp_register_importers() {
 /**
  * Dedicated action to register admin styles
  *
- * @since bbPress (r3766)
+ * @since 2.1.0 bbPress (r3766)
+ *
  * @uses do_action() Calls 'bbp_admin_notices'
  */
 function bbp_register_admin_style() {
@@ -247,7 +253,8 @@ function bbp_register_admin_style() {
 /**
  * Dedicated action to register admin settings
  *
- * @since bbPress (r3766)
+ * @since 2.1.0 bbPress (r3766)
+ *
  * @uses do_action() Calls 'bbp_register_admin_settings'
  */
 function bbp_register_admin_settings() {
diff --git src/includes/admin/admin.php src/includes/admin/admin.php
index a0e1bd8..0d67f16 100644
--- src/includes/admin/admin.php
+++ src/includes/admin/admin.php
@@ -16,7 +16,7 @@ if ( !class_exists( 'BBP_Admin' ) ) :
  *
  * @package bbPress
  * @subpackage Administration
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  */
 class BBP_Admin {
 
@@ -80,7 +80,7 @@ class BBP_Admin {
 	/**
 	 * The main bbPress admin loader
 	 *
-	 * @since bbPress (r2515)
+	 * @since 2.0.0 bbPress (r2515)
 	 *
 	 * @uses BBP_Admin::setup_globals() Setup the globals needed
 	 * @uses BBP_Admin::includes() Include the required files
@@ -95,7 +95,8 @@ class BBP_Admin {
 	/**
 	 * Admin globals
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 */
 	private function setup_globals() {
@@ -111,7 +112,8 @@ class BBP_Admin {
 	/**
 	 * Include required files
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 */
 	private function includes() {
@@ -129,7 +131,8 @@ class BBP_Admin {
 	/**
 	 * Setup the admin hooks, actions and filters
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 *
 	 * @uses add_action() To add various actions
@@ -188,7 +191,7 @@ class BBP_Admin {
 	/**
 	 * Add the admin menus
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
 	 *
 	 * @uses add_management_page() To add the Recount page in Tools section
 	 * @uses add_options_page() To add the Forums settings page in Settings
@@ -296,7 +299,8 @@ class BBP_Admin {
 	/**
 	 * Add the network admin menus
 	 *
-	 * @since bbPress (r3689)
+	 * @since 2.1.0 bbPress (r3689)
+	 *
 	 * @uses add_submenu_page() To add the Update Forums page in Updates
 	 */
 	public function network_admin_menus() {
@@ -319,7 +323,8 @@ class BBP_Admin {
 	/**
 	 * If this is a new installation, create some initial forum content.
 	 *
-	 * @since bbPress (r3767)
+	 * @since 2.1.0 bbPress (r3767)
+	 *
 	 * @return type
 	 */
 	public static function new_install() {
@@ -333,7 +338,7 @@ class BBP_Admin {
 	/**
 	 * Register the settings
 	 *
-	 * @since bbPress (r2737)
+	 * @since 2.0.0 bbPress (r2737)
 	 *
 	 * @uses add_settings_section() To add our own settings section
 	 * @uses add_settings_field() To add various settings fields
@@ -392,7 +397,7 @@ class BBP_Admin {
 	/**
 	 * Maps settings capabilities
 	 *
-	 * @since bbPress (r4242)
+	 * @since 2.2.0 bbPress (r4242)
 	 *
 	 * @param array $caps Capabilities for meta capability
 	 * @param string $cap Capability name
@@ -453,7 +458,7 @@ class BBP_Admin {
 	/**
 	 * Register the importers
 	 *
-	 * @since bbPress (r2737)
+	 * @since 2.0.0 bbPress (r2737)
 	 *
 	 * @uses apply_filters() Calls 'bbp_importer_path' filter to allow plugins
 	 *                        to customize the importer script locations.
@@ -492,7 +497,7 @@ class BBP_Admin {
 	 *
 	 * Shows a nag message in admin area about the theme not supporting bbPress
 	 *
-	 * @since bbPress (r2743)
+	 * @since 2.0.0 bbPress (r2743)
 	 *
 	 * @uses current_user_can() To check notice should be displayed.
 	 */
@@ -503,7 +508,7 @@ class BBP_Admin {
 	/**
 	 * Add Settings link to plugins area
 	 *
-	 * @since bbPress (r2737)
+	 * @since 2.0.0 bbPress (r2737)
 	 *
 	 * @param array $links Links array in which we would prepend our link
 	 * @param string $file Current plugin basename
@@ -536,7 +541,7 @@ class BBP_Admin {
 	/**
 	 * Add a link to bbPress about page to the admin bar
 	 *
-	 * @since bbPress (r5136)
+	 * @since 2.5.0 bbPress (r5136)
 	 *
 	 * @param WP_Admin_Bar $wp_admin_bar
 	 */
@@ -554,7 +559,7 @@ class BBP_Admin {
 	/**
 	 * Enqueue any admin scripts we might need
 	 *
-	 * @since bbPress (r4260)
+	 * @since 2.2.0 bbPress (r4260)
 	 */
 	public function enqueue_scripts() {
 
@@ -593,7 +598,7 @@ class BBP_Admin {
 	/**
 	 * Enqueue any admin scripts we might need
 	 *
-	 * @since bbPress (r5224)
+	 * @since 2.6.0 bbPress (r5224)
 	 */
 	public function enqueue_styles() {
 
@@ -609,7 +614,7 @@ class BBP_Admin {
 	 * Remove the individual recount and converter menus.
 	 * They are grouped together by h2 tabs
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @uses remove_submenu_page() To remove menu items with alternat navigation
 	 */
@@ -628,7 +633,7 @@ class BBP_Admin {
 	 * way to be certain what the relative path of the admin images is.
 	 * We are including the two most common configurations here, just in case.
 	 *
-	 * @since bbPress (r2521)
+	 * @since 2.0.0 bbPress (r2521)
 	 *
 	 * @uses wp_admin_css_color() To register the color scheme
 	 */
@@ -665,7 +670,7 @@ class BBP_Admin {
 	/**
 	 * Hide theme compat package selection if only 1 package is registered
 	 *
-	 * @since bbPress (r4315)
+	 * @since 2.2.0 bbPress (r4315)
 	 *
 	 * @param array $sections Forums settings sections
 	 * @return array
@@ -681,7 +686,7 @@ class BBP_Admin {
 	/**
 	 * Allow keymaster role to save Forums settings
 	 *
-	 * @since bbPress (r4678)
+	 * @since 2.3.0 bbPress (r4678)
 	 *
 	 * @param string $capability
 	 * @return string Return 'keep_gate' capability
@@ -696,7 +701,7 @@ class BBP_Admin {
 	/**
 	 * Ajax action for facilitating the forum auto-suggest
 	 *
-	 * @since bbPress (r4261)
+	 * @since 2.2.0 bbPress (r4261)
 	 *
 	 * @uses get_posts()
 	 * @uses bbp_get_topic_post_type()
@@ -736,7 +741,7 @@ class BBP_Admin {
 	/**
 	 * Ajax action for facilitating the topic and reply author auto-suggest
 	 *
-	 * @since bbPress (r5014)
+	 * @since 2.4.0 bbPress (r5014)
 	 */
 	public function suggest_user() {
 
@@ -775,7 +780,7 @@ class BBP_Admin {
 	/**
 	 * Output the about screen
 	 *
-	 * @since bbPress (r4159)
+	 * @since 2.2.0 bbPress (r4159)
 	 */
 	public function about_screen() {
 
@@ -852,7 +857,7 @@ class BBP_Admin {
 	 * Hardcoding this in here is pretty janky. It's fine for 2.2, but we'll
 	 * want to leverage api.wordpress.org eventually.
 	 *
-	 * @since bbPress (r4159)
+	 * @since 2.2.0 bbPress (r4159)
 	 */
 	public function credits_screen() {
 
@@ -955,7 +960,7 @@ class BBP_Admin {
 	/**
 	 * Update all bbPress forums across all sites
 	 *
-	 * @since bbPress (r3689)
+	 * @since 2.1.0 bbPress (r3689)
 	 *
 	 * @uses get_blog_option()
 	 * @uses wp_remote_get()
@@ -1000,7 +1005,7 @@ class BBP_Admin {
 	/**
 	 * Update all bbPress forums across all sites
 	 *
-	 * @since bbPress (r3689)
+	 * @since 2.1.0 bbPress (r3689)
 	 *
 	 * @uses get_blog_option()
 	 * @uses wp_remote_get()
@@ -1114,7 +1119,7 @@ endif; // class_exists check
 /**
  * Setup bbPress Admin
  *
- * @since bbPress (r2596)
+ * @since 2.0.0 bbPress (r2596)
  *
  * @uses BBP_Admin
  */
diff --git src/includes/admin/converter.php src/includes/admin/converter.php
index 4ae3a21..5621819 100644
--- src/includes/admin/converter.php
+++ src/includes/admin/converter.php
@@ -20,7 +20,8 @@ class BBP_Converter {
 	/**
 	 * The main bbPress Converter loader
 	 *
-	 * @since bbPress (r3813)
+	 * @since 2.1.0 bbPress (r3813)
+	 *
 	 * @uses BBP_Converter::includes() Include the required files
 	 * @uses BBP_Converter::setup_actions() Setup the actions
 	 */
@@ -58,7 +59,8 @@ class BBP_Converter {
 	/**
 	 * Setup the default actions
 	 *
-	 * @since bbPress (r3813)
+	 * @since 2.1.0 bbPress (r3813)
+	 *
 	 * @uses add_action() To add various actions
 	 */
 	private function setup_actions() {
@@ -76,7 +78,8 @@ class BBP_Converter {
 	/**
 	 * Register the settings
 	 *
-	 * @since bbPress (r3813)
+	 * @since 2.1.0 bbPress (r3813)
+	 *
 	 * @uses add_settings_section() To add our own settings section
 	 * @uses add_settings_field() To add various settings fields
 	 * @uses register_setting() To register various settings
@@ -141,7 +144,7 @@ class BBP_Converter {
 	/**
 	 * Admin scripts
 	 *
-	 * @since bbPress (r3813)
+	 * @since 2.1.0 bbPress (r3813)
 	 */
 	public function admin_head() { ?>
 
@@ -278,7 +281,7 @@ class BBP_Converter {
 	/**
 	 * Wrap the converter output in paragraph tags, so styling can be applied
 	 *
-	 * @since bbPress (r4052)
+	 * @since 2.1.0 bbPress (r4052)
 	 *
 	 * @param string $output
 	 */
@@ -299,7 +302,7 @@ class BBP_Converter {
 	/**
 	 * Callback processor
 	 *
-	 * @since bbPress (r3813)
+	 * @since 2.1.0 bbPress (r3813)
 	 */
 	public function process_callback() {
 
@@ -626,7 +629,7 @@ class BBP_Converter {
 	/**
 	 * Create Tables for fast syncing
 	 *
-	 * @since bbPress (r3813)
+	 * @since 2.1.0 bbPress (r3813)
 	 */
 	public function sync_table( $drop = false ) {
 
@@ -665,7 +668,7 @@ class BBP_Converter {
 /**
  * Base class to be extended by specific individual importers
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 abstract class BBP_Converter_Base {
 
@@ -1273,7 +1276,7 @@ abstract class BBP_Converter_Base {
 	/**
 	 * This method converts old topic stickies to new bbPress stickies.
 	 *
-	 * @since bbPress (r5170)
+	 * @since 2.5.0 bbPress (r5170)
 	 *
 	 * @uses WPDB $wpdb
 	 * @uses bbp_stick_topic() to set the imported topic as sticky
@@ -1304,7 +1307,7 @@ abstract class BBP_Converter_Base {
 	/**
 	 * This method converts old topic super stickies to new bbPress super stickies.
 	 *
-	 * @since bbPress (r5170)
+	 * @since 2.5.0 bbPress (r5170)
 	 *
 	 * @uses WPDB $wpdb
 	 * @uses bbp_stick_topic() to set the imported topic as super sticky
@@ -1336,7 +1339,7 @@ abstract class BBP_Converter_Base {
 	/**
 	 * This method converts old closed topics to bbPress closed topics.
 	 *
-	 * @since bbPress (r5425)
+	 * @since 2.6.0 bbPress (r5425)
 	 *
 	 * @uses bbp_close_topic() to close topics properly
 	 *
@@ -1366,7 +1369,7 @@ abstract class BBP_Converter_Base {
 	/**
 	 * This method converts old reply_to post id to new bbPress reply_to post id.
 	 *
-	 * @since  bbPress (r5093)
+	 * @since 2.4.0 bbPress (r5093)
 	 */
 	public function convert_reply_to_parents( $start ) {
 
@@ -1394,7 +1397,7 @@ abstract class BBP_Converter_Base {
 	/**
 	 * This method converts anonymous topics.
 	 *
-	 * @since  bbPress (r5538)
+	 * @since 2.6.0 bbPress (r5538)
 	 *
 	 * @uses add_post_meta() To add _bbp_anonymous_name topic meta key
 	 */
@@ -1440,7 +1443,7 @@ abstract class BBP_Converter_Base {
 	/**
 	 * This method converts anonymous replies.
 	 *
-	 * @since  bbPress (r5538)
+	 * @since 2.6.0 bbPress (r5538)
 	 *
 	 * @uses add_post_meta() To add _bbp_anonymous_name reply meta key
 	 */
@@ -1672,7 +1675,7 @@ abstract class BBP_Converter_Base {
 	/**
 	 * A mini cache system to reduce database calls to reply_to post id.
 	 *
-	 * @since  bbPress (r5093)
+	 * @since 2.4.0 bbPress (r5093)
 	 *
 	 * @param string $field
 	 * @return string
@@ -1724,7 +1727,7 @@ abstract class BBP_Converter_Base {
 	/**
 	 * Check if the topic or reply author is anonymous
 	 *
-	 * @since  (r5544)
+	 * @since 2.6.0 bbPress (r5544)
 	 *
 	 * @param  string $field
 	 * @return string
diff --git src/includes/admin/converters/AEF.php src/includes/admin/converters/AEF.php
index a4c5ce9..d934cf7 100644
--- src/includes/admin/converters/AEF.php
+++ src/includes/admin/converters/AEF.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of AEF Forum converter.
  *
- * @since bbPress (r5139)
+ * @since 2.5.0 bbPress (r5139)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/aef
  */
 class AEF extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Drupal7.php src/includes/admin/converters/Drupal7.php
index fdbb4ce..01ac02a 100644
--- src/includes/admin/converters/Drupal7.php
+++ src/includes/admin/converters/Drupal7.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of Drupal v7.x Forum converter.
  *
- * @since bbPress (r5138)
+ * @since 2.5.0 bbPress (r5138)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/drupal
  */
 class Drupal7 extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Example.php src/includes/admin/converters/Example.php
index 24902fd..3498a9f 100644
--- src/includes/admin/converters/Example.php
+++ src/includes/admin/converters/Example.php
@@ -10,7 +10,8 @@
 /**
  * Example converter base impoprter template for bbPress
  *
- * @since bbPress (r4689)
+ * @since 2.3.0 bbPress (r4689)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/custom-import
  */
 class Example extends BBP_Converter_Base {
diff --git src/includes/admin/converters/FluxBB.php src/includes/admin/converters/FluxBB.php
index 4beeee4..4719e95 100644
--- src/includes/admin/converters/FluxBB.php
+++ src/includes/admin/converters/FluxBB.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of FluxBB Forum converter.
  *
- * @since bbPress (r5138)
+ * @since 2.5.0 bbPress (r5138)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/fluxbb
  */
 class FluxBB extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Invision.php src/includes/admin/converters/Invision.php
index 726419e..737ff6e 100644
--- src/includes/admin/converters/Invision.php
+++ src/includes/admin/converters/Invision.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of Invision Power Board v3.x converter.
  *
- * @since bbPress (r4713)
+ * @since 2.3.0 bbPress (r4713)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/invision
  */
 class Invision extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Kunena1.php src/includes/admin/converters/Kunena1.php
index f51c283..f216033 100644
--- src/includes/admin/converters/Kunena1.php
+++ src/includes/admin/converters/Kunena1.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of Kunena v1.x Forums for Joomla Forum converter.
  *
- * @since bbPress (r5144)
+ * @since 2.5.0 bbPress (r5144)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/kunena/
  */
 class Kunena1 extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Kunena2.php src/includes/admin/converters/Kunena2.php
index 7117b09..0364550 100644
--- src/includes/admin/converters/Kunena2.php
+++ src/includes/admin/converters/Kunena2.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of Kunena v2.x Forums for Joomla Forum converter.
  *
- * @since bbPress (r5144)
+ * @since 2.5.0 bbPress (r5144)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/kunena/
  */
 class Kunena2 extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Kunena3.php src/includes/admin/converters/Kunena3.php
index 07a924d..add5afb 100644
--- src/includes/admin/converters/Kunena3.php
+++ src/includes/admin/converters/Kunena3.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of Kunena v3.x Forums for Joomla Forum converter.
  *
- * @since bbPress (r5144)
+ * @since 2.5.0 bbPress (r5144)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/kunena/
  */
 class Kunena3 extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Mingle.php src/includes/admin/converters/Mingle.php
index fadd8b9..50f1f1e 100644
--- src/includes/admin/converters/Mingle.php
+++ src/includes/admin/converters/Mingle.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of Mingle Forums converter.
  *
- * @since bbPress (r4691)
+ * @since 2.3.0 bbPress (r4691)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/mingle
  */
 class Mingle extends BBP_Converter_Base {
diff --git src/includes/admin/converters/MyBB.php src/includes/admin/converters/MyBB.php
index 55d47f9..be02c82 100644
--- src/includes/admin/converters/MyBB.php
+++ src/includes/admin/converters/MyBB.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of MyBB Forum converter.
  *
- * @since bbPress (r5140)
+ * @since 2.5.0 bbPress (r5140)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/mybb
  */
 class MyBB extends BBP_Converter_Base {
diff --git src/includes/admin/converters/PHPFox3.php src/includes/admin/converters/PHPFox3.php
index 9f70af8..c2a57da 100644
--- src/includes/admin/converters/PHPFox3.php
+++ src/includes/admin/converters/PHPFox3.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of PHPFox v3.x Forum converter.
  *
- * @since bbPress (r5146)
+ * @since 2.5.0 bbPress (r5146)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/phpfox
  */
 class PHPFox3 extends BBP_Converter_Base {
diff --git src/includes/admin/converters/PHPWind.php src/includes/admin/converters/PHPWind.php
index a584314..70f109d 100644
--- src/includes/admin/converters/PHPWind.php
+++ src/includes/admin/converters/PHPWind.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of PHPWind Forum converter.
  *
- * @since bbPress (r5142)
+ * @since 2.5.0 bbPress (r5142)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/phpwind
  */
 class PHPWind extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Phorum.php src/includes/admin/converters/Phorum.php
index 36bd6f6..8a84b2b 100644
--- src/includes/admin/converters/Phorum.php
+++ src/includes/admin/converters/Phorum.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of Phorum Forum converter.
  *
- * @since bbPress (r5141)
+ * @since 2.5.0 bbPress (r5141)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/phorum
  */
 class Phorum extends BBP_Converter_Base {
diff --git src/includes/admin/converters/PunBB.php src/includes/admin/converters/PunBB.php
index aaaf6ab..be345b5 100644
--- src/includes/admin/converters/PunBB.php
+++ src/includes/admin/converters/PunBB.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of PunBB v1.4.2 Forum converter.
  *
- * @since bbPress (r5153)
+ * @since 2.5.0 bbPress (r5153)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/punbb
  */
 class PunBB extends BBP_Converter_Base {
diff --git src/includes/admin/converters/SMF.php src/includes/admin/converters/SMF.php
index 832b15d..7305353 100644
--- src/includes/admin/converters/SMF.php
+++ src/includes/admin/converters/SMF.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of SMF Forum converter.
  *
- * @since bbPress (r5189)
+ * @since 2.5.0 bbPress (r5189)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/smf
  */
 class SMF extends BBP_Converter_Base {
diff --git src/includes/admin/converters/SimplePress5.php src/includes/admin/converters/SimplePress5.php
index eb02dba..6f638cd 100644
--- src/includes/admin/converters/SimplePress5.php
+++ src/includes/admin/converters/SimplePress5.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of SimplePress v5 converter.
  *
- * @since bbPress (r4638)
+ * @since 2.3.0 bbPress (r4638)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/simplepress/
  */
 class SimplePress5 extends BBP_Converter_Base {
diff --git src/includes/admin/converters/Vanilla.php src/includes/admin/converters/Vanilla.php
index 1e2ca08..986b240 100644
--- src/includes/admin/converters/Vanilla.php
+++ src/includes/admin/converters/Vanilla.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of Vanilla 2.0.18.1 Converter
  *
- * @since bbPress (r4717)
+ * @since 2.3.0 bbPress (r4717)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/vanilla
  */
 class Vanilla extends BBP_Converter_Base {
diff --git src/includes/admin/converters/XMB.php src/includes/admin/converters/XMB.php
index ae1e904..c7b95d3 100644
--- src/includes/admin/converters/XMB.php
+++ src/includes/admin/converters/XMB.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of XMB Forum converter.
  *
- * @since bbPress (r5143)
+ * @since 2.5.0 bbPress (r5143)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/xmb
  */
 class XMB extends BBP_Converter_Base {
diff --git src/includes/admin/converters/XenForo.php src/includes/admin/converters/XenForo.php
index 5adabec..11a5dc5 100644
--- src/includes/admin/converters/XenForo.php
+++ src/includes/admin/converters/XenForo.php
@@ -10,7 +10,8 @@
 /**
  *  Implementation of XenForo converter.
  *
- * @since bbPress (r5145)
+ * @since 2.5.0 bbPress (r5145)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/xenforo
  */
 class XenForo extends BBP_Converter_Base {
diff --git src/includes/admin/converters/bbPress1.php src/includes/admin/converters/bbPress1.php
index 309cdde..2f44854 100644
--- src/includes/admin/converters/bbPress1.php
+++ src/includes/admin/converters/bbPress1.php
@@ -10,7 +10,8 @@
 /**
  * bbPress 1.1 Converter
  *
- * @since bbPress (r3816)
+ * @since 2.1.0 bbPress (r3816)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/bbpress-1-x-buddypress-group-forums
  */
 class bbPress1 extends BBP_Converter_Base {
@@ -740,7 +741,7 @@ class bbPress1 extends BBP_Converter_Base {
 	/**
 	 * This callback strips `topic-` from topic subscriptions taxonomy
 	 *
-	 * @since (r5572)
+	 * @since 2.6.0 bbPress (r5572)
 	 *
 	 * @param string $field Topic ID
 	 * @return integer WordPress safe
diff --git src/includes/admin/converters/e107v1.php src/includes/admin/converters/e107v1.php
index 1310526..5c43281 100644
--- src/includes/admin/converters/e107v1.php
+++ src/includes/admin/converters/e107v1.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of e107 v1.x Forum converter.
  *
- * @since bbPress (r5352)
+ * @since 2.6.0 bbPress (r5352)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/e107
  */
 class e107v1 extends BBP_Converter_Base {
diff --git src/includes/admin/converters/phpBB.php src/includes/admin/converters/phpBB.php
index d6d2a75..b203a13 100644
--- src/includes/admin/converters/phpBB.php
+++ src/includes/admin/converters/phpBB.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of phpBB v3 Converter.
  *
- * @since bbPress (r4689)
+ * @since 2.3.0 bbPress (r4689)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/phpbb
  */
 class phpBB extends BBP_Converter_Base {
diff --git src/includes/admin/converters/vBulletin.php src/includes/admin/converters/vBulletin.php
index 9cd0656..0fe1f0e 100644
--- src/includes/admin/converters/vBulletin.php
+++ src/includes/admin/converters/vBulletin.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of vBulletin v4.x Converter.
  *
- * @since bbPress (r4724)
+ * @since 2.3.0 bbPress (r4724)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/vbulletin
  */
 class vBulletin extends BBP_Converter_Base {
diff --git src/includes/admin/converters/vBulletin3.php src/includes/admin/converters/vBulletin3.php
index f42162c..5556e3e 100644
--- src/includes/admin/converters/vBulletin3.php
+++ src/includes/admin/converters/vBulletin3.php
@@ -10,7 +10,8 @@
 /**
  * Implementation of vBulletin v3.x Converter.
  *
- * @since bbPress (r5151)
+ * @since 2.5.0 bbPress (r5151)
+ *
  * @link Codex Docs https://codex.bbpress.org/import-forums/vbulletin
  */
 class vBulletin3 extends BBP_Converter_Base {
diff --git src/includes/admin/forums.php src/includes/admin/forums.php
index 246e55c..e0d4b76 100644
--- src/includes/admin/forums.php
+++ src/includes/admin/forums.php
@@ -16,7 +16,7 @@ if ( !class_exists( 'BBP_Forums_Admin' ) ) :
  *
  * @package bbPress
  * @subpackage Administration
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  */
 class BBP_Forums_Admin {
 
@@ -32,7 +32,7 @@ class BBP_Forums_Admin {
 	/**
 	 * The main bbPress forums admin loader
 	 *
-	 * @since bbPress (r2515)
+	 * @since 2.0.0 bbPress (r2515)
 	 *
 	 * @uses BBP_Forums_Admin::setup_globals() Setup the globals needed
 	 * @uses BBP_Forums_Admin::setup_actions() Setup the hooks and actions
@@ -46,7 +46,8 @@ class BBP_Forums_Admin {
 	/**
 	 * Setup the admin hooks, actions and filters
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 *
 	 * @uses add_action() To add various actions
@@ -90,7 +91,8 @@ class BBP_Forums_Admin {
 	/**
 	 * Should we bail out of this method?
 	 *
-	 * @since bbPress (r4067)
+	 * @since 2.1.0 bbPress (r4067)
+	 *
 	 * @return boolean
 	 */
 	private function bail() {
@@ -104,7 +106,8 @@ class BBP_Forums_Admin {
 	/**
 	 * Admin globals
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 */
 	private function setup_globals() {
@@ -116,7 +119,8 @@ class BBP_Forums_Admin {
 	/**
 	 * Contextual help for bbPress forum edit page
 	 *
-	 * @since bbPress (r3119)
+	 * @since 2.0.0 bbPress (r3119)
+	 *
 	 * @uses get_current_screen()
 	 */
 	public function edit_help() {
@@ -179,7 +183,8 @@ class BBP_Forums_Admin {
 	/**
 	 * Contextual help for bbPress forum edit page
 	 *
-	 * @since bbPress (r3119)
+	 * @since 2.0.0 bbPress (r3119)
+	 *
 	 * @uses get_current_screen()
 	 */
 	public function new_help() {
@@ -240,7 +245,7 @@ class BBP_Forums_Admin {
 	/**
 	 * Add the forum attributes metabox
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @uses bbp_get_forum_post_type() To get the forum post type
 	 * @uses add_meta_box() To add the metabox
@@ -267,7 +272,7 @@ class BBP_Forums_Admin {
 	/**
 	 * Return user nicename suggestions instead of tag suggestions
 	 *
-	 * @since bbPress (r5834)
+	 * @since 2.6.0 bbPress (r5834)
 	 *
 	 * @uses bbp_get_forum_mod_tax_id() To get the forum moderator taxonomy id
 	 * @uses sanitize_key() To sanitize the taxonomy id
@@ -340,7 +345,7 @@ class BBP_Forums_Admin {
 	/**
 	 * Pass the forum attributes for processing
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @param int $forum_id Forum id
 	 * @uses current_user_can() To check if the current user is capable of
@@ -407,7 +412,7 @@ class BBP_Forums_Admin {
 	/**
 	 * Add some general styling to the admin area
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @uses bbp_get_forum_post_type() To get the forum post type
 	 * @uses bbp_get_topic_post_type() To get the topic post type
@@ -490,7 +495,7 @@ class BBP_Forums_Admin {
 	 *
 	 * Handles the admin-side opening/closing of forums
 	 *
-	 * @since bbPress (r5254)
+	 * @since 2.6.0 bbPress (r5254)
 	 *
 	 * @uses bbp_get_forum() To get the forum
 	 * @uses current_user_can() To check if the user is capable of editing
@@ -566,7 +571,7 @@ class BBP_Forums_Admin {
 	 * Display the success/error notices from
 	 * {@link BBP_Admin::toggle_forum()}
 	 *
-	 * @since bbPress (r5254)
+	 * @since 2.6.0 bbPress (r5254)
 	 *
 	 * @uses bbp_get_forum() To get the forum
 	 * @uses bbp_get_forum_title() To get the forum title of the forum
@@ -629,7 +634,7 @@ class BBP_Forums_Admin {
 	/**
 	 * Manage the column headers for the forums page
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param array $columns The columns
 	 * @uses apply_filters() Calls 'bbp_admin_forums_column_headers' with
@@ -665,7 +670,7 @@ class BBP_Forums_Admin {
 	/**
 	 * Print extra columns for the forums page
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param string $column Column
 	 * @param int $forum_id Forum id
@@ -732,7 +737,7 @@ class BBP_Forums_Admin {
 	 * Remove the quick-edit action link and display the description under
 	 * the forum title and add the open/close links
 	 *
-	 * @since bbPress (r2577)
+	 * @since 2.0.0 bbPress (r2577)
 	 *
 	 * @param array $actions Actions
 	 * @param array $forum Forum object
@@ -776,7 +781,7 @@ class BBP_Forums_Admin {
 	/**
 	 * Custom user feedback messages for forum post type
 	 *
-	 * @since bbPress (r3080)
+	 * @since 2.0.0 bbPress (r3080)
 	 *
 	 * @global int $post_ID
 	 * @uses bbp_get_forum_permalink()
@@ -854,7 +859,7 @@ endif; // class_exists check
  * This is currently here to make hooking and unhooking of the admin UI easy.
  * It could use dependency injection in the future, but for now this is easier.
  *
- * @since bbPress (r2596)
+ * @since 2.0.0 bbPress (r2596)
  *
  * @uses BBP_Forums_Admin
  */
diff --git src/includes/admin/functions.php src/includes/admin/functions.php
index 6e6b89e..299027e 100644
--- src/includes/admin/functions.php
+++ src/includes/admin/functions.php
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Add a separator to the WordPress admin menus
  *
- * @since bbPress (r2957)
+ * @since 2.0.0 bbPress (r2957)
  */
 function bbp_admin_separator() {
 
@@ -47,7 +47,7 @@ function bbp_admin_separator() {
 /**
  * Tell WordPress we have a custom menu order
  *
- * @since bbPress (r2957)
+ * @since 2.0.0 bbPress (r2957)
  *
  * @param bool $menu_order Menu order
  * @return mixed True if separator, false if not
@@ -63,7 +63,7 @@ function bbp_admin_custom_menu_order( $menu_order = false ) {
 /**
  * Move our custom separator above our custom post types
  *
- * @since bbPress (r2957)
+ * @since 2.0.0 bbPress (r2957)
  *
  * @param array $menu_order Menu Order
  * @uses bbp_get_forum_post_type() To get the forum post type
@@ -117,7 +117,7 @@ function bbp_admin_menu_order( $menu_order ) {
 /**
  * Filter sample permalinks so that certain languages display properly.
  *
- * @since bbPress (r3336)
+ * @since 2.0.0 bbPress (r3336)
  *
  * @param string $post_link Custom post type permalink
  * @param object $_post Post data object
@@ -143,7 +143,7 @@ function bbp_filter_sample_permalink( $post_link, $_post, $leavename = false, $s
 /**
  * Sanitize permalink slugs when saving the settings page.
  *
- * @since bbPress (r5364)
+ * @since 2.6.0 bbPress (r5364)
  *
  * @param string $slug
  * @return string
@@ -173,7 +173,8 @@ function bbp_sanitize_slug( $slug = '' ) {
 /**
  * Uninstall all bbPress options and capabilities from a specific site.
  *
- * @since bbPress (r3765)
+ * @since 2.1.0 bbPress (r3765)
+ *
  * @param type $site_id
  */
 function bbp_do_uninstall( $site_id = 0 ) {
@@ -192,7 +193,7 @@ function bbp_do_uninstall( $site_id = 0 ) {
 /**
  * Redirect user to bbPress's What's New page on activation
  *
- * @since bbPress (r4389)
+ * @since 2.2.0 bbPress (r4389)
  *
  * @internal Used internally to redirect bbPress to the about page on activation
  *
@@ -236,7 +237,8 @@ function bbp_do_activation_redirect() {
  * The conditional prevents the override when the user is viewing settings or
  * any third-party plugins.
  *
- * @since bbPress (r3888)
+ * @since 2.1.0 bbPress (r3888)
+ *
  * @global string $plugin_page
  * @global array $submenu_file
  */
@@ -252,7 +254,8 @@ function bbp_tools_modify_menu_highlight() {
 /**
  * Output the tabs in the admin area
  *
- * @since bbPress (r3872)
+ * @since 2.1.0 bbPress (r3872)
+ *
  * @param string $active_tab Name of the tab that is active
  */
 function bbp_tools_admin_tabs( $active_tab = '' ) {
@@ -262,7 +265,8 @@ function bbp_tools_admin_tabs( $active_tab = '' ) {
 	/**
 	 * Output the tabs in the admin area
 	 *
-	 * @since bbPress (r3872)
+	 * @since 2.1.0 bbPress (r3872)
+	 *
 	 * @param string $active_tab Name of the tab that is active
 	 */
 	function bbp_get_tools_admin_tabs( $active_tab = '' ) {
diff --git src/includes/admin/list-tables/topic-replies.php src/includes/admin/list-tables/topic-replies.php
index 8ba566d..33a13d6 100644
--- src/includes/admin/list-tables/topic-replies.php
+++ src/includes/admin/list-tables/topic-replies.php
@@ -23,14 +23,14 @@ if ( class_exists( 'WP_List_Table' ) ) :
  * This list table is responsible for showing the replies to a topic in a
  * metabox, similar to comments in posts and pages.
  *
- * @since bbPress (r5886)
+ * @since 2.6.0 bbPress (r5886)
  */
 class BBP_Topic_Replies_List_Table extends WP_List_Table {
 
 	/**
 	 * The main constructor method
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 */
 	public function __construct( $args = array() ) {
 		$args = array(
@@ -44,7 +44,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Setup the list-table's columns
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 *
 	 * @see WP_List_Table::::single_row_columns()
 	 *
@@ -62,7 +62,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Allow `bbp_reply_created` to be sortable
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 *
 	 * @return array An associative array containing the `bbp_reply_created` column
 	 */
@@ -75,7 +75,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Setup the bulk actions
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 *
 	 * @return array An associative array containing all the bulk actions
 	 */
@@ -93,7 +93,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Output the `cb` column for bulk actions (if we implement them)
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 */
 	public function column_cb( $item = '' ) {
 		return sprintf(
@@ -106,7 +106,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Output the contents of the `bbp_topic_reply_author` column
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 */
 	public function column_bbp_topic_reply_author( $item = '' ) {
 		bbp_reply_author_avatar( $item->ID, 50 );
@@ -120,7 +120,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Output the contents of the `bbp_reply_created` column
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 */
 	public function column_bbp_reply_created( $item = '' ) {
 		return sprintf( '%1$s <br /> %2$s',
@@ -132,7 +132,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Output the contents of the `bbp_reply_content` column
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 */
    public function column_bbp_reply_content( $item = '' ) {
 
@@ -158,7 +158,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Handle bulk action requests
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 */
 	public function process_bulk_action() {
 		switch ( $this->current_action() ) {
@@ -174,7 +174,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Prepare the list-table items for display
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 *
 	 * @uses $this->_column_headers
 	 * @uses $this->items
@@ -233,7 +233,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	/**
 	 * Message to be displayed when there are no items
 	 *
-	 * @since bbPress (r5930)
+	 * @since 2.6.0 bbPress (r5930)
 	 */
 	public function no_items() {
 		esc_html_e( 'No replies to this topic.', 'bbpress' );
@@ -245,7 +245,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	 * This custom method is necessary because the one in `WP_List_Table` comes
 	 * with a nonce and check that we do not need.
 	 *
-	 * @since bbPress (r5930)
+	 * @since 2.6.0 bbPress (r5930)
 	 */
 	public function display() {
 
@@ -282,7 +282,7 @@ class BBP_Topic_Replies_List_Table extends WP_List_Table {
 	 * This custom method is necessary because the one in `WP_List_Table` comes
 	 * with a nonce and check that we do not need.
 	 *
-	 * @since bbPress (r5930)
+	 * @since 2.6.0 bbPress (r5930)
 	 *
 	 * @param string $which
 	 */
diff --git src/includes/admin/metaboxes.php src/includes/admin/metaboxes.php
index 6fc4ff2..8303ef1 100644
--- src/includes/admin/metaboxes.php
+++ src/includes/admin/metaboxes.php
@@ -12,7 +12,7 @@
 /**
  * Filter the Dashboard "at a glance" items and append bbPress elements to it.
  *
- * @since bbPress (r5268)
+ * @since 2.6.0 bbPress (r5268)
  *
  * @param array $elements
  * @return array
@@ -59,8 +59,9 @@ function bbp_filter_dashboard_glance_items( $elements = array() ) {
  *
  * Adds a dashboard widget with forum statistics
  *
- * @since bbPress (r2770)
- * @deprecated bbPress (r5268)
+ * @since 2.0.0 bbPress (r2770)
+ *
+ * @deprecated 2.6.0 bbPress (r5268)
  *
  * @uses bbp_get_version() To get the current bbPress version
  * @uses bbp_get_statistics() To get the forum statistics
@@ -284,7 +285,7 @@ function bbp_dashboard_widget_right_now() {
  *
  * The metabox that holds all of the additional forum information
  *
- * @since bbPress (r2744)
+ * @since 2.0.0 bbPress (r2744)
  *
  * @uses bbp_is_forum_closed() To check if a forum is closed or not
  * @uses bbp_is_forum_category() To check if a forum is a category or not
@@ -382,7 +383,7 @@ function bbp_forum_metabox() {
  *
  * The metabox that holds all of the additional topic information
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses bbp_get_topic_forum_id() To get the topic forum id
  * @uses do_action() Calls 'bbp_topic_metabox'
@@ -459,7 +460,7 @@ function bbp_topic_metabox() {
  *
  * The metabox that holds all of the additional reply information
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses bbp_get_topic_post_type() To get the topic post type
  * @uses do_action() Calls 'bbp_reply_metabox'
@@ -550,7 +551,7 @@ function bbp_reply_metabox() {
 /**
  * Output the topic replies metabox
  *
- * @since bbPress (r5886)
+ * @since 2.6.0 bbPress (r5886)
  *
  * @param type $topic
  *
@@ -591,7 +592,7 @@ function bbp_topic_replies_metabox( $topic = false ) {
 /**
  * Anonymous user information metabox
  *
- * @since bbPress (r2828)
+ * @since 2.0.0 bbPress (r2828)
  *
  * @uses bbp_is_reply_anonymous() To check if reply is anonymous
  * @uses bbp_is_topic_anonymous() To check if topic is anonymous
diff --git src/includes/admin/replies.php src/includes/admin/replies.php
index 2ad892a..27284af 100644
--- src/includes/admin/replies.php
+++ src/includes/admin/replies.php
@@ -16,7 +16,7 @@ if ( !class_exists( 'BBP_Replies_Admin' ) ) :
  *
  * @package bbPress
  * @subpackage Administration
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  */
 class BBP_Replies_Admin {
 
@@ -32,7 +32,7 @@ class BBP_Replies_Admin {
 	/**
 	 * The main bbPress admin loader
 	 *
-	 * @since bbPress (r2515)
+	 * @since 2.0.0 bbPress (r2515)
 	 *
 	 * @uses BBP_Replies_Admin::setup_globals() Setup the globals needed
 	 * @uses BBP_Replies_Admin::setup_actions() Setup the hooks and actions
@@ -46,7 +46,8 @@ class BBP_Replies_Admin {
 	/**
 	 * Setup the admin hooks, actions and filters
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 *
 	 * @uses add_action() To add various actions
@@ -94,7 +95,8 @@ class BBP_Replies_Admin {
 	/**
 	 * Should we bail out of this method?
 	 *
-	 * @since bbPress (r4067)
+	 * @since 2.1.0 bbPress (r4067)
+	 *
 	 * @return boolean
 	 */
 	private function bail() {
@@ -108,7 +110,8 @@ class BBP_Replies_Admin {
 	/**
 	 * Admin globals
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 */
 	private function setup_globals() {
@@ -120,7 +123,8 @@ class BBP_Replies_Admin {
 	/**
 	 * Contextual help for bbPress reply edit page
 	 *
-	 * @since bbPress (r3119)
+	 * @since 2.0.0 bbPress (r3119)
+	 *
 	 * @uses get_current_screen()
 	 */
 	public function edit_help() {
@@ -187,7 +191,8 @@ class BBP_Replies_Admin {
 	/**
 	 * Contextual help for bbPress reply edit page
 	 *
-	 * @since bbPress (r3119)
+	 * @since 2.0.0 bbPress (r3119)
+	 *
 	 * @uses get_current_screen()
 	 */
 	public function new_help() {
@@ -246,7 +251,7 @@ class BBP_Replies_Admin {
 	/**
 	 * Add the reply attributes metabox
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @uses bbp_get_reply_post_type() To get the reply post type
 	 * @uses add_meta_box() To add the metabox
@@ -273,7 +278,7 @@ class BBP_Replies_Admin {
 	/**
 	 * Pass the reply attributes for processing
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @param int $reply_id Reply id
 	 * @uses current_user_can() To check if the current user is capable of
@@ -338,7 +343,7 @@ class BBP_Replies_Admin {
 	 *
 	 * Allows editing of information about an author
 	 *
-	 * @since bbPress (r2828)
+	 * @since 2.0.0 bbPress (r2828)
 	 *
 	 * @uses bbp_get_topic() To get the topic
 	 * @uses bbp_get_reply() To get the reply
@@ -375,7 +380,7 @@ class BBP_Replies_Admin {
 	/**
 	 * Add some general styling to the admin area
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @uses bbp_get_forum_post_type() To get the forum post type
 	 * @uses bbp_get_topic_post_type() To get the topic post type
@@ -450,7 +455,7 @@ class BBP_Replies_Admin {
 	 *
 	 * Handles the admin-side spamming/unspamming of replies
 	 *
-	 * @since bbPress (r2740)
+	 * @since 2.0.0 bbPress (r2740)
 	 *
 	 * @uses bbp_get_reply() To get the reply
 	 * @uses current_user_can() To check if the user is capable of editing
@@ -531,7 +536,7 @@ class BBP_Replies_Admin {
 	 * Display the success/error notices from
 	 * {@link BBP_Admin::toggle_reply()}
 	 *
-	 * @since bbPress (r2740)
+	 * @since 2.0.0 bbPress (r2740)
 	 *
 	 * @uses bbp_get_reply() To get the reply
 	 * @uses bbp_get_reply_title() To get the reply title of the reply
@@ -606,7 +611,7 @@ class BBP_Replies_Admin {
 	/**
 	 * Manage the column headers for the replies page
 	 *
-	 * @since bbPress (r2577)
+	 * @since 2.0.0 bbPress (r2577)
 	 *
 	 * @param array $columns The columns
 	 * @uses apply_filters() Calls 'bbp_admin_replies_column_headers' with
@@ -634,7 +639,7 @@ class BBP_Replies_Admin {
 	/**
 	 * Print extra columns for the replies page
 	 *
-	 * @since bbPress (r2577)
+	 * @since 2.0.0 bbPress (r2577)
 	 *
 	 * @param string $column Column
 	 * @param int $reply_id reply id
@@ -754,7 +759,7 @@ class BBP_Replies_Admin {
 	 * Remove the quick-edit action link under the reply title and add the
 	 * content and spam link
 	 *
-	 * @since bbPress (r2577)
+	 * @since 2.0.0 bbPress (r2577)
 	 *
 	 * @param array $actions Actions
 	 * @param array $reply Reply object
@@ -832,7 +837,7 @@ class BBP_Replies_Admin {
 	/**
 	 * Add forum dropdown to topic and reply list table filters
 	 *
-	 * @since bbPress (r2991)
+	 * @since 2.0.0 bbPress (r2991)
 	 *
 	 * @uses bbp_get_reply_post_type() To get the reply post type
 	 * @uses bbp_get_topic_post_type() To get the topic post type
@@ -865,7 +870,7 @@ class BBP_Replies_Admin {
 	/**
 	 * Adjust the request query and include the forum id
 	 *
-	 * @since bbPress (r2991)
+	 * @since 2.0.0 bbPress (r2991)
 	 *
 	 * @param array $query_vars Query variables from {@link WP_Query}
 	 * @uses is_admin() To check if it's the admin section
@@ -893,7 +898,7 @@ class BBP_Replies_Admin {
 	/**
 	 * Custom user feedback messages for reply post type
 	 *
-	 * @since bbPress (r3080)
+	 * @since 2.0.0 bbPress (r3080)
 	 *
 	 * @global int $post_ID
 	 * @uses bbp_get_topic_permalink()
@@ -971,7 +976,7 @@ endif; // class_exists check
  * This is currently here to make hooking and unhooking of the admin UI easy.
  * It could use dependency injection in the future, but for now this is easier.
  *
- * @since bbPress (r2596)
+ * @since 2.0.0 bbPress (r2596)
  *
  * @uses BBP_Replies_Admin
  */
diff --git src/includes/admin/settings.php src/includes/admin/settings.php
index 6d47bff..62f0b5a 100644
--- src/includes/admin/settings.php
+++ src/includes/admin/settings.php
@@ -15,7 +15,8 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Get the Forums settings sections.
  *
- * @since bbPress (r4001)
+ * @since 2.1.0 bbPress (r4001)
+ *
  * @return array
  */
 function bbp_admin_get_settings_sections() {
@@ -76,7 +77,8 @@ function bbp_admin_get_settings_sections() {
 /**
  * Get all of the settings fields.
  *
- * @since bbPress (r4001)
+ * @since 2.1.0 bbPress (r4001)
+ *
  * @return type
  */
 function bbp_admin_get_settings_fields() {
@@ -429,7 +431,8 @@ function bbp_admin_get_settings_fields() {
 /**
  * Get settings fields by section.
  *
- * @since bbPress (r4001)
+ * @since 2.1.0 bbPress (r4001)
+ *
  * @param string $section_id
  * @return mixed False if section is invalid, array of fields otherwise.
  */
@@ -453,7 +456,7 @@ function bbp_admin_get_settings_fields_for_section( $section_id = '' ) {
 /**
  * User settings section description for the settings page
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  */
 function bbp_admin_setting_callback_user_section() {
 ?>
@@ -467,7 +470,7 @@ function bbp_admin_setting_callback_user_section() {
 /**
  * Edit lock setting field
  *
- * @since bbPress (r2737)
+ * @since 2.0.0 bbPress (r2737)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -483,7 +486,7 @@ function bbp_admin_setting_callback_editlock() {
 /**
  * Throttle setting field
  *
- * @since bbPress (r2737)
+ * @since 2.0.0 bbPress (r2737)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -499,7 +502,7 @@ function bbp_admin_setting_callback_throttle() {
 /**
  * Allow anonymous posting setting field
  *
- * @since bbPress (r2737)
+ * @since 2.0.0 bbPress (r2737)
  *
  * @uses checked() To display the checked attribute
  */
@@ -515,7 +518,7 @@ function bbp_admin_setting_callback_anonymous() {
 /**
  * Allow global access setting field
  *
- * @since bbPress (r3378)
+ * @since 2.0.0 bbPress (r3378)
  *
  * @uses checked() To display the checked attribute
  */
@@ -552,7 +555,7 @@ function bbp_admin_setting_callback_global_access() {
 /**
  * Features settings section description for the settings page
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  */
 function bbp_admin_setting_callback_features_section() {
 ?>
@@ -565,7 +568,7 @@ function bbp_admin_setting_callback_features_section() {
 /**
  * Allow favorites setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses checked() To display the checked attribute
  */
@@ -581,7 +584,7 @@ function bbp_admin_setting_callback_favorites() {
 /**
  * Allow subscriptions setting field
  *
- * @since bbPress (r2737)
+ * @since 2.0.0 bbPress (r2737)
  *
  * @uses checked() To display the checked attribute
  */
@@ -597,7 +600,7 @@ function bbp_admin_setting_callback_subscriptions() {
 /**
  * Allow topic tags setting field
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @uses checked() To display the checked attribute
  */
@@ -613,7 +616,7 @@ function bbp_admin_setting_callback_topic_tags() {
 /**
  * Allow forum-mods setting field
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @uses checked() To display the checked attribute
  */
@@ -629,7 +632,7 @@ function bbp_admin_setting_callback_forum_mods() {
 /**
  * Allow forum wide search
  *
- * @since bbPress (r4970)
+ * @since 2.4.0 bbPress (r4970)
  *
  * @uses checked() To display the checked attribute
  */
@@ -647,7 +650,7 @@ function bbp_admin_setting_callback_search() {
  *
  * Replies will be threaded if depth is 2 or greater
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @uses apply_filters() Calls 'bbp_thread_replies_depth_max' to set a
  *                        maximum displayed level
@@ -685,7 +688,7 @@ function bbp_admin_setting_callback_thread_replies_depth() {
 /**
  * Allow topic and reply revisions
  *
- * @since bbPress (r3412)
+ * @since 2.0.0 bbPress (r3412)
  *
  * @uses checked() To display the checked attribute
  */
@@ -701,7 +704,7 @@ function bbp_admin_setting_callback_revisions() {
 /**
  * Use the WordPress editor setting field
  *
- * @since bbPress (r3586)
+ * @since 2.1.0 bbPress (r3586)
  *
  * @uses checked() To display the checked attribute
  */
@@ -717,7 +720,7 @@ function bbp_admin_setting_callback_use_wp_editor() {
 /**
  * Main subtheme section
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  */
 function bbp_admin_setting_callback_subtheme_section() {
 ?>
@@ -730,7 +733,7 @@ function bbp_admin_setting_callback_subtheme_section() {
 /**
  * Use the WordPress editor setting field
  *
- * @since bbPress (r3586)
+ * @since 2.1.0 bbPress (r3586)
  *
  * @uses checked() To display the checked attribute
  */
@@ -764,7 +767,7 @@ function bbp_admin_setting_callback_subtheme_id() {
 /**
  * Allow oEmbed in replies
  *
- * @since bbPress (r3752)
+ * @since 2.1.0 bbPress (r3752)
  *
  * @uses checked() To display the checked attribute
  */
@@ -782,7 +785,7 @@ function bbp_admin_setting_callback_use_autoembed() {
 /**
  * Per page settings section description for the settings page
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  */
 function bbp_admin_setting_callback_per_page_section() {
 ?>
@@ -795,7 +798,7 @@ function bbp_admin_setting_callback_per_page_section() {
 /**
  * Topics per page setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -811,7 +814,7 @@ function bbp_admin_setting_callback_topics_per_page() {
 /**
  * Replies per page setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -829,7 +832,7 @@ function bbp_admin_setting_callback_replies_per_page() {
 /**
  * Per page settings section description for the settings page
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  */
 function bbp_admin_setting_callback_per_rss_page_section() {
 ?>
@@ -842,7 +845,7 @@ function bbp_admin_setting_callback_per_rss_page_section() {
 /**
  * Topics per RSS page setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -858,7 +861,7 @@ function bbp_admin_setting_callback_topics_per_rss_page() {
 /**
  * Replies per RSS page setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -876,7 +879,7 @@ function bbp_admin_setting_callback_replies_per_rss_page() {
 /**
  * Slugs settings section description for the settings page
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  */
 function bbp_admin_setting_callback_root_slug_section() {
 
@@ -893,7 +896,7 @@ function bbp_admin_setting_callback_root_slug_section() {
 /**
  * Root slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -910,7 +913,7 @@ function bbp_admin_setting_callback_root_slug() {
 /**
  * Include root slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses checked() To display the checked attribute
  */
@@ -926,7 +929,7 @@ function bbp_admin_setting_callback_include_root() {
 /**
  * Include root slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses checked() To display the checked attribute
  */
@@ -963,7 +966,7 @@ function bbp_admin_setting_callback_show_on_root() {
 /**
  * Slugs settings section description for the settings page
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  */
 function bbp_admin_setting_callback_user_slug_section() {
 ?>
@@ -976,7 +979,7 @@ function bbp_admin_setting_callback_user_slug_section() {
 /**
  * User slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -993,7 +996,7 @@ function bbp_admin_setting_callback_user_slug() {
 /**
  * Topic archive slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1010,7 +1013,7 @@ function bbp_admin_setting_callback_topic_archive_slug() {
 /**
  * Reply archive slug setting field
  *
- * @since bbPress (r4932)
+ * @since 2.4.0 bbPress (r4932)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1027,7 +1030,7 @@ function bbp_admin_setting_callback_reply_archive_slug() {
 /**
  * Favorites slug setting field
  *
- * @since bbPress (r4932)
+ * @since 2.4.0 bbPress (r4932)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1044,7 +1047,7 @@ function bbp_admin_setting_callback_user_favs_slug() {
 /**
  * Favorites slug setting field
  *
- * @since bbPress (r4932)
+ * @since 2.4.0 bbPress (r4932)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1063,7 +1066,7 @@ function bbp_admin_setting_callback_user_subs_slug() {
 /**
  * Slugs settings section description for the settings page
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  */
 function bbp_admin_setting_callback_single_slug_section() {
 ?>
@@ -1076,7 +1079,7 @@ function bbp_admin_setting_callback_single_slug_section() {
 /**
  * Forum slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1093,7 +1096,7 @@ function bbp_admin_setting_callback_forum_slug() {
 /**
  * Topic slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1110,7 +1113,7 @@ function bbp_admin_setting_callback_topic_slug() {
 /**
  * Reply slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1127,7 +1130,7 @@ function bbp_admin_setting_callback_reply_slug() {
 /**
  * Topic tag slug setting field
  *
- * @since bbPress (r2786)
+ * @since 2.0.0 bbPress (r2786)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1145,7 +1148,7 @@ function bbp_admin_setting_callback_topic_tag_slug() {
 /**
  * View slug setting field
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1162,7 +1165,7 @@ function bbp_admin_setting_callback_view_slug() {
 /**
  * Search slug setting field
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1181,7 +1184,7 @@ function bbp_admin_setting_callback_search_slug() {
 /**
  * Extension settings section description for the settings page
  *
- * @since bbPress (r3575)
+ * @since 2.1.0 bbPress (r3575)
  */
 function bbp_admin_setting_callback_buddypress_section() {
 ?>
@@ -1194,7 +1197,7 @@ function bbp_admin_setting_callback_buddypress_section() {
 /**
  * Allow BuddyPress group forums setting field
  *
- * @since bbPress (r3575)
+ * @since 2.1.0 bbPress (r3575)
  *
  * @uses checked() To display the checked attribute
  */
@@ -1210,7 +1213,7 @@ function bbp_admin_setting_callback_group_forums() {
 /**
  * Replies per page setting field
  *
- * @since bbPress (r3575)
+ * @since 2.1.0 bbPress (r3575)
  *
  * @uses bbp_form_option() To output the option value
  */
@@ -1238,7 +1241,7 @@ function bbp_admin_setting_callback_group_forums_root_id() {
 /**
  * Extension settings section description for the settings page
  *
- * @since bbPress (r3575)
+ * @since 2.1.0 bbPress (r3575)
  */
 function bbp_admin_setting_callback_akismet_section() {
 ?>
@@ -1252,7 +1255,7 @@ function bbp_admin_setting_callback_akismet_section() {
 /**
  * Allow Akismet setting field
  *
- * @since bbPress (r3575)
+ * @since 2.1.0 bbPress (r3575)
  *
  * @uses checked() To display the checked attribute
  */
@@ -1270,7 +1273,7 @@ function bbp_admin_setting_callback_akismet() {
 /**
  * The main settings page
  *
- * @since bbPress (r2643)
+ * @since 2.0.0 bbPress (r2643)
  *
  * @uses settings_fields() To output the hidden fields for the form
  * @uses do_settings_sections() To output the settings sections
@@ -1303,7 +1306,7 @@ function bbp_admin_settings() {
 /**
  * Main settings section description for the settings page
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_main_section() {
 ?>
@@ -1316,7 +1319,7 @@ function bbp_converter_setting_callback_main_section() {
 /**
  * Edit Platform setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_platform() {
 
@@ -1347,7 +1350,7 @@ function bbp_converter_setting_callback_platform() {
 /**
  * Edit Database Server setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_dbserver() {
 ?>
@@ -1361,7 +1364,7 @@ function bbp_converter_setting_callback_dbserver() {
 /**
  * Edit Database Server Port setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_dbport() {
 ?>
@@ -1375,7 +1378,7 @@ function bbp_converter_setting_callback_dbport() {
 /**
  * Edit Database User setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_dbuser() {
 ?>
@@ -1389,7 +1392,7 @@ function bbp_converter_setting_callback_dbuser() {
 /**
  * Edit Database Pass setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_dbpass() {
 ?>
@@ -1403,7 +1406,7 @@ function bbp_converter_setting_callback_dbpass() {
 /**
  * Edit Database Name setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_dbname() {
 ?>
@@ -1417,7 +1420,7 @@ function bbp_converter_setting_callback_dbname() {
 /**
  * Main settings section description for the settings page
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_options_section() {
 ?>
@@ -1430,7 +1433,7 @@ function bbp_converter_setting_callback_options_section() {
 /**
  * Edit Table Prefix setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_dbprefix() {
 ?>
@@ -1444,7 +1447,7 @@ function bbp_converter_setting_callback_dbprefix() {
 /**
  * Edit Rows Limit setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_rows() {
 ?>
@@ -1459,7 +1462,7 @@ function bbp_converter_setting_callback_rows() {
 /**
  * Edit Delay Time setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_delay_time() {
 ?>
@@ -1474,7 +1477,7 @@ function bbp_converter_setting_callback_delay_time() {
 /**
  * Edit Restart setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_restart() {
 ?>
@@ -1489,7 +1492,7 @@ function bbp_converter_setting_callback_restart() {
 /**
  * Edit Clean setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_clean() {
 ?>
@@ -1504,7 +1507,7 @@ function bbp_converter_setting_callback_clean() {
 /**
  * Edit Convert Users setting field
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_converter_setting_callback_convert_users() {
 ?>
@@ -1555,7 +1558,8 @@ function bbp_converter_settings() {
 /**
  * Contextual help for Forums settings page
  *
- * @since bbPress (r3119)
+ * @since 2.0.0 bbPress (r3119)
+ *
  * @uses get_current_screen()
  */
 function bbp_admin_settings_help() {
@@ -1626,7 +1630,7 @@ function bbp_admin_settings_help() {
  * Disable a settings field if the value is forcibly set in bbPress's global
  * options array.
  *
- * @since bbPress (r4347)
+ * @since 2.2.0 bbPress (r4347)
  *
  * @param string $option_key
  */
@@ -1637,7 +1641,7 @@ function bbp_maybe_admin_setting_disabled( $option_key = '' ) {
 /**
  * Output settings API option
  *
- * @since bbPress (r3203)
+ * @since 2.0.0 bbPress (r3203)
  *
  * @uses bbp_get_bbp_form_option()
  *
@@ -1651,7 +1655,7 @@ function bbp_form_option( $option, $default = '' , $slug = false ) {
 	/**
 	 * Return settings API option
 	 *
-	 * @since bbPress (r3203)
+	 * @since 2.0.0 bbPress (r3203)
 	 *
 	 * @uses get_option()
 	 * @uses esc_attr()
@@ -1687,7 +1691,7 @@ function bbp_form_option( $option, $default = '' , $slug = false ) {
 /**
  * Used to check if a bbPress slug conflicts with an existing known slug.
  *
- * @since bbPress (r3306)
+ * @since 2.0.0 bbPress (r3306)
  *
  * @param string $slug
  * @param string $default
diff --git src/includes/admin/tools.php src/includes/admin/tools.php
index 5190542..6a22130 100644
--- src/includes/admin/tools.php
+++ src/includes/admin/tools.php
@@ -15,8 +15,8 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Admin repair page
  *
- * @since bbPress (r2613) Converted from bbPress 1.2
- * @since bbPress (r5885) Upgraded to list-table UI
+ * @since 2.0.0 bbPress (r2613) Converted from bbPress 1.2
+ * @since 2.6.0 bbPress (r5885) Upgraded to list-table UI
  *
  * @todo Use a real list table
  *
@@ -162,7 +162,7 @@ function bbp_admin_repair() {
 /**
  * Handle the processing and feedback of the admin tools page
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses bbp_admin_repair_list() To get the recount list
  * @uses check_admin_referer() To verify the nonce and the referer
@@ -222,7 +222,7 @@ function bbp_admin_repair_handler() {
 /**
  * Output the URL to run a specific repair tool
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  *
  * @param string $component
  */
@@ -233,7 +233,7 @@ function bbp_admin_repair_tool_run_url( $component = '' ) {
 /**
  * Return the URL to run a specific repair tool
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  *
  * @param string $component
  */
@@ -249,7 +249,8 @@ function bbp_get_admin_repair_tool_run_url( $component = '' ) {
 /**
  * Contextual help for Repair Forums tools page
  *
- * @since bbPress (r5314)
+ * @since 2.6.0 bbPress (r5314)
+ *
  * @uses get_current_screen()
  */
 
@@ -287,7 +288,8 @@ function bbp_admin_tools_repair_help() {
 /**
  * Contextual help for Reset Forums tools page
  *
- * @since bbPress (r5314)
+ * @since 2.6.0 bbPress (r5314)
+ *
  * @uses get_current_screen()
  */
 
@@ -318,7 +320,8 @@ function bbp_admin_tools_reset_help() {
 /**
  * Contextual help for Import Forums tools page
  *
- * @since bbPress (r5314)
+ * @since 2.6.0 bbPress (r5314)
+ *
  * @uses get_current_screen()
  */
 
@@ -377,7 +380,7 @@ function bbp_admin_tools_converter_help() {
 /**
  * Assemble the admin notices
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @param string|WP_Error $message A message to be displayed or {@link WP_Error}
  * @param string $class Optional. A class to be added to the message div
@@ -431,7 +434,7 @@ function bbp_admin_tools_feedback( $message, $class = false ) {
 /**
  * Register an admin area repair tool
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  *
  * @param array $args
  * @return
@@ -474,7 +477,7 @@ function bbp_register_repair_tool( $args = array() ) {
 /**
  * Register the default repair tools
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  */
 function bbp_register_default_repair_tools() {
 
@@ -672,7 +675,7 @@ function bbp_register_default_repair_tools() {
 /**
  * Get the array of available repair tools
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  *
  * @return array
  */
@@ -706,7 +709,7 @@ function bbp_get_admin_repair_tool_registered_components() {
 /**
  * Output the repair list search form
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  */
 function bbp_admin_repair_list_search_form() {
 	?>
@@ -747,7 +750,7 @@ function bbp_admin_repair_list_components_filter() {
 /**
  * Maybe translate a repair tool component name
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  *
  * @param string $component
  * @return string
@@ -779,7 +782,7 @@ function bbp_admin_repair_tool_translate_component( $component = '' ) {
 /**
  * Get the array of the repair list
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses apply_filters() Calls 'bbp_repair_list' with the list array
  * @return array Repair list of options
@@ -836,7 +839,7 @@ function bbp_admin_repair_list() {
 /**
  * Get filter links for components for a specific admir repair tool
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  *
  * @param array $item
  * @return array
@@ -868,7 +871,7 @@ function bbp_admin_repair_tool_overhead_filters( $args = array() ) {
 /**
  * Get filter links for components for a specific admir repair tool
  *
- * @since bbPress (r5885)
+ * @since 2.6.0 bbPress (r5885)
  *
  * @param array $args
  * @return array
@@ -951,7 +954,7 @@ function bbp_get_admin_repair_tool_overhead_filters( $args = array() ) {
 /**
  * Recount topic replies
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1006,7 +1009,7 @@ function bbp_admin_repair_topic_reply_count() {
 /**
  * Recount topic voices
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1055,7 +1058,7 @@ function bbp_admin_repair_topic_voice_count() {
 /**
  * Recount topic hidden replies (spammed/trashed)
  *
- * @since bbPress (r2747)
+ * @since 2.0.0 bbPress (r2747)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1094,7 +1097,7 @@ function bbp_admin_repair_topic_hidden_reply_count() {
 /**
  * Repair group forum ID mappings after a bbPress 1.1 to bbPress 2.2 conversion
  *
- * @since bbPress (r4395)
+ * @since 2.2.0 bbPress (r4395)
  *
  * @uses bbp_get_forum_post_type() To get the forum post type
  * @return If a wp_error() occurs and no converted forums are found
@@ -1231,7 +1234,7 @@ function bbp_admin_repair_group_forum_relationship() {
 /**
  * Recount forum topics
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1268,7 +1271,7 @@ function bbp_admin_repair_forum_topic_count() {
 /**
  * Recount forum replies
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1314,7 +1317,7 @@ function bbp_admin_repair_forum_reply_count() {
 /**
  * Recount topics by the users
  *
- * @since bbPress (r3889)
+ * @since 2.1.0 bbPress (r3889)
  *
  * @uses bbp_get_topic_post_type() To get the topic post type
  * @uses bbp_get_public_status_id() To get the public status id
@@ -1366,7 +1369,7 @@ function bbp_admin_repair_user_topic_count() {
 /**
  * Recount topic replied by the users
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses bbp_get_reply_post_type() To get the reply post type
  * @uses bbp_get_public_status_id() To get the public status id
@@ -1418,7 +1421,7 @@ function bbp_admin_repair_user_reply_count() {
 /**
  * Clean the users' favorites
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1488,7 +1491,7 @@ function bbp_admin_repair_user_favorites() {
 /**
  * Clean the users' topic subscriptions
  *
- * @since bbPress (r2668)
+ * @since 2.0.0 bbPress (r2668)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1557,7 +1560,7 @@ function bbp_admin_repair_user_topic_subscriptions() {
 /**
  * Clean the users' forum subscriptions
  *
- * @since bbPress (r5155)
+ * @since 2.5.0 bbPress (r5155)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1628,7 +1631,7 @@ function bbp_admin_repair_user_forum_subscriptions() {
  * forums role. By default, Admins will be Key Masters, and every other role
  * will be the default role defined in Settings > Forums (Participant).
  *
- * @since bbPress (r4340)
+ * @since 2.2.0 bbPress (r4340)
  *
  * @uses bbp_get_user_role_map() To get the map of user roles
  * @uses bbp_get_default_role() To get the default bbPress user role
@@ -1685,7 +1688,7 @@ function bbp_admin_repair_user_roles() {
 /**
  * Recaches the last post in every topic and forum
  *
- * @since bbPress (r3040)
+ * @since 2.0.0 bbPress (r3040)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1814,7 +1817,7 @@ function bbp_admin_repair_freshness() {
 /**
  * Repairs the relationship of sticky topics to the actual parent forum
  *
- * @since bbPress (r4695)
+ * @since 2.3.0 bbPress (r4695)
  *
  * @uses wpdb::get_col() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1884,7 +1887,7 @@ function bbp_admin_repair_sticky() {
  * had imported forums from another forum package previous to bbPress v2.6,
  * https://bbpress.trac.wordpress.org/ticket/2577
  *
- * @since bbPress (r5668)
+ * @since 2.6.0 bbPress (r5668)
  *
  * @uses wpdb::get_col() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -1933,7 +1936,7 @@ function bbp_admin_repair_closed_topics() {
 /**
  * Recaches the private and hidden forums
  *
- * @since bbPress (r4104)
+ * @since 2.2.0 bbPress (r4104)
  *
  * @uses bbp_repair_forum_visibility() To update private and hidden forum ids
  * @return array An array of the status code and the message
@@ -1954,7 +1957,7 @@ function bbp_admin_repair_forum_visibility() {
 /**
  * Recaches the parent forum meta for each topic and reply
  *
- * @since bbPress (r3876)
+ * @since 2.1.0 bbPress (r3876)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -2009,7 +2012,7 @@ function bbp_admin_repair_forum_meta() {
 /**
  * Recaches the topic for each post
  *
- * @since bbPress (r3876)
+ * @since 2.1.0 bbPress (r3876)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -2064,7 +2067,7 @@ function bbp_admin_repair_topic_meta() {
 /**
  * Recalculate reply menu order
  *
- * @since bbPress (r5367)
+ * @since 2.5.4 bbPress (r5367)
  *
  * @uses wpdb::query() To run our recount sql queries
  * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
@@ -2123,7 +2126,7 @@ function bbp_admin_repair_reply_menu_order() {
 /**
  * Admin reset page
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses check_admin_referer() To verify the nonce and the referer
  * @uses do_action() Calls 'admin_notices' to display the notices
@@ -2190,7 +2193,7 @@ function bbp_admin_reset() {
 /**
  * Handle the processing and feedback of the admin tools page
  *
- * @since bbPress (r2613)
+ * @since 2.0.0 bbPress (r2613)
  *
  * @uses check_admin_referer() To verify the nonce and the referer
  * @uses wp_cache_flush() To flush the cache
diff --git src/includes/admin/topics.php src/includes/admin/topics.php
index d515db0..d9c327c 100644
--- src/includes/admin/topics.php
+++ src/includes/admin/topics.php
@@ -16,7 +16,7 @@ if ( !class_exists( 'BBP_Topics_Admin' ) ) :
  *
  * @package bbPress
  * @subpackage Administration
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  */
 class BBP_Topics_Admin {
 
@@ -32,7 +32,7 @@ class BBP_Topics_Admin {
 	/**
 	 * The main bbPress topics admin loader
 	 *
-	 * @since bbPress (r2515)
+	 * @since 2.0.0 bbPress (r2515)
 	 *
 	 * @uses BBP_Topics_Admin::setup_globals() Setup the globals needed
 	 * @uses BBP_Topics_Admin::setup_actions() Setup the hooks and actions
@@ -46,7 +46,8 @@ class BBP_Topics_Admin {
 	/**
 	 * Setup the admin hooks, actions and filters
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 *
 	 * @uses add_action() To add various actions
@@ -95,7 +96,8 @@ class BBP_Topics_Admin {
 	/**
 	 * Should we bail out of this method?
 	 *
-	 * @since bbPress (r4067)
+	 * @since 2.1.0 bbPress (r4067)
+	 *
 	 * @return boolean
 	 */
 	private function bail() {
@@ -109,7 +111,8 @@ class BBP_Topics_Admin {
 	/**
 	 * Admin globals
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 */
 	private function setup_globals() {
@@ -121,7 +124,8 @@ class BBP_Topics_Admin {
 	/**
 	 * Contextual help for bbPress topic edit page
 	 *
-	 * @since bbPress (r3119)
+	 * @since 2.0.0 bbPress (r3119)
+	 *
 	 * @uses get_current_screen()
 	 */
 	public function edit_help() {
@@ -190,7 +194,8 @@ class BBP_Topics_Admin {
 	/**
 	 * Contextual help for bbPress topic edit page
 	 *
-	 * @since bbPress (r3119)
+	 * @since 2.0.0 bbPress (r3119)
+	 *
 	 * @uses get_current_screen()
 	 */
 	public function new_help() {
@@ -248,7 +253,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Add the topic attributes metabox
 	 *
-	 * @since bbPress (r2744)
+	 * @since 2.0.0 bbPress (r2744)
 	 *
 	 * @uses bbp_get_topic_post_type() To get the topic post type
 	 * @uses add_meta_box() To add the metabox
@@ -275,7 +280,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Pass the topic attributes for processing
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @param int $topic_id Topic id
 	 * @uses current_user_can() To check if the current user is capable of
@@ -355,7 +360,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Add the author info metabox
 	 *
-	 * @since bbPress (r2828)
+	 * @since 2.0.0 bbPress (r2828)
 	 *
 	 * @uses bbp_get_topic() To get the topic
 	 * @uses bbp_get_reply() To get the reply
@@ -395,7 +400,7 @@ class BBP_Topics_Admin {
 	 * Allows viewing & moderating of replies to a topic, based on the way
 	 * comments are visible on a blog post.
 	 *
-	 * @since bbPress (r5886)
+	 * @since 2.6.0 bbPress (r5886)
 	 *
 	 * @uses bbp_get_topic() To get the topic
 	 * @uses bbp_get_reply() To get the reply
@@ -432,7 +437,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Add some general styling to the admin area
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @uses bbp_get_forum_post_type() To get the forum post type
 	 * @uses bbp_get_topic_post_type() To get the topic post type
@@ -519,7 +524,7 @@ class BBP_Topics_Admin {
 	 * Handles the admin-side opening/closing, sticking/unsticking and
 	 * spamming/unspamming of topics
 	 *
-	 * @since bbPress (r2727)
+	 * @since 2.0.0 bbPress (r2727)
 	 *
 	 * @uses bbp_get_topic() To get the topic
 	 * @uses current_user_can() To check if the user is capable of editing
@@ -647,7 +652,7 @@ class BBP_Topics_Admin {
 	 * Display the success/error notices from
 	 * {@link BBP_Admin::toggle_topic()}
 	 *
-	 * @since bbPress (r2727)
+	 * @since 2.0.0 bbPress (r2727)
 	 *
 	 * @uses bbp_get_topic() To get the topic
 	 * @uses bbp_get_topic_title() To get the topic title of the topic
@@ -752,7 +757,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Manage the column headers for the topics page
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param array $columns The columns
 	 * @uses apply_filters() Calls 'bbp_admin_topics_column_headers' with
@@ -782,7 +787,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Print extra columns for the topics page
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param string $column Column
 	 * @param int $topic_id Topic id
@@ -884,7 +889,7 @@ class BBP_Topics_Admin {
 	 * Remove the quick-edit action link under the topic title and add the
 	 * content and close/stick/spam links
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param array $actions Actions
 	 * @param array $topic Topic object
@@ -985,7 +990,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Add forum dropdown to topic and reply list table filters
 	 *
-	 * @since bbPress (r2991)
+	 * @since 2.0.0 bbPress (r2991)
 	 *
 	 * @uses bbp_get_reply_post_type() To get the reply post type
 	 * @uses bbp_get_topic_post_type() To get the topic post type
@@ -1018,7 +1023,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Adjust the request query and include the forum id
 	 *
-	 * @since bbPress (r2991)
+	 * @since 2.0.0 bbPress (r2991)
 	 *
 	 * @param array $query_vars Query variables from {@link WP_Query}
 	 * @uses is_admin() To check if it's the admin section
@@ -1046,7 +1051,7 @@ class BBP_Topics_Admin {
 	/**
 	 * Custom user feedback messages for topic post type
 	 *
-	 * @since bbPress (r3080)
+	 * @since 2.0.0 bbPress (r3080)
 	 *
 	 * @global int $post_ID
 	 * @uses bbp_get_topic_permalink()
@@ -1124,7 +1129,7 @@ endif; // class_exists check
  * This is currently here to make hooking and unhooking of the admin UI easy.
  * It could use dependency injection in the future, but for now this is easier.
  *
- * @since bbPress (r2596)
+ * @since 2.0.0 bbPress (r2596)
  *
  * @uses BBP_Forums_Admin
  */
diff --git src/includes/admin/users.php src/includes/admin/users.php
index f060018..817f3fe 100644
--- src/includes/admin/users.php
+++ src/includes/admin/users.php
@@ -16,14 +16,14 @@ if ( !class_exists( 'BBP_Users_Admin' ) ) :
  *
  * @package bbPress
  * @subpackage Administration
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  */
 class BBP_Users_Admin {
 
 	/**
 	 * The bbPress users admin loader
 	 *
-	 * @since bbPress (r2515)
+	 * @since 2.0.0 bbPress (r2515)
 	 *
 	 * @uses BBP_Users_Admin::setup_globals() Setup the globals needed
 	 * @uses BBP_Users_Admin::setup_actions() Setup the hooks and actions
@@ -35,7 +35,8 @@ class BBP_Users_Admin {
 	/**
 	 * Setup the admin hooks, actions and filters
 	 *
-	 * @since bbPress (r2646)
+	 * @since 2.0.0 bbPress (r2646)
+	 *
 	 * @access private
 	 *
 	 * @uses add_action() To add various actions
@@ -62,7 +63,7 @@ class BBP_Users_Admin {
 	/**
 	 * Default interface for setting a forum role
 	 *
-	 * @since bbPress (r4285)
+	 * @since 2.2.0 bbPress (r4285)
 	 *
 	 * @param WP_User $profileuser User data
 	 * @return bool Always false
@@ -123,7 +124,7 @@ class BBP_Users_Admin {
 	/**
 	 * Add bulk forums role dropdown to the WordPress users table
 	 *
-	 * @since bbPress (r4360)
+	 * @since 2.2.0 bbPress (r4360)
 	 */
 	public static function user_role_bulk_dropdown() {
 
@@ -219,7 +220,7 @@ class BBP_Users_Admin {
 	 * Add Forum Role column to the WordPress Users table, and change the
 	 * core role title to "Site Role"
 	 *
-	 * @since bbPress (r4337)
+	 * @since 2.2.0 bbPress (r4337)
 	 *
 	 * @param array $columns Users table columns
 	 * @return array $columns
@@ -234,7 +235,7 @@ class BBP_Users_Admin {
 	/**
 	 * Return user's forums role for display in the WordPress Users list table
 	 *
-	 * @since bbPress (r4337)
+	 * @since 2.2.0 bbPress (r4337)
 	 *
 	 * @param string $retval
 	 * @param string $column_name
diff --git src/includes/common/ajax.php src/includes/common/ajax.php
index 03fe163..f8eb3e6 100644
--- src/includes/common/ajax.php
+++ src/includes/common/ajax.php
@@ -16,7 +16,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Output the URL to use for theme-side bbPress AJAX requests
  *
- * @since bbPress (r4543)
+ * @since 2.3.0 bbPress (r4543)
  *
  * @uses bbp_get_ajax_url() To get the URL to use for AJAX requests
  */
@@ -26,7 +26,7 @@ function bbp_ajax_url() {
 	/**
 	 * Return the URL to use for theme-side bbPress AJAX requests
 	 *
-	 * @since bbPress (r4543)
+	 * @since 2.3.0 bbPress (r4543)
 	 *
 	 * @global WP $wp
 	 * @return string
@@ -43,7 +43,7 @@ function bbp_ajax_url() {
 /**
  * Is this a bbPress AJAX request?
  *
- * @since bbPress (r4543)
+ * @since 2.3.0 bbPress (r4543)
  *
  * @return bool Looking for bbp-ajax
  */
@@ -55,7 +55,7 @@ function bbp_is_ajax() {
  * Hooked to the 'bbp_template_redirect' action, this is bbPress's custom
  * theme-side ajax handler.
  *
- * @since bbPress (r4543)
+ * @since 2.3.0 bbPress (r4543)
  *
  * @return If not a bbPress ajax request
  */
@@ -85,7 +85,7 @@ function bbp_do_ajax() {
 /**
  * Helper method to return JSON response for the ajax calls
  *
- * @since bbPress (r4542)
+ * @since 2.3.0 bbPress (r4542)
  *
  * @param bool $success
  * @param string $content
diff --git src/includes/common/classes.php src/includes/common/classes.php
index 6ce3d50..85f4c17 100644
--- src/includes/common/classes.php
+++ src/includes/common/classes.php
@@ -22,7 +22,7 @@ if ( !class_exists( 'BBP_Component' ) ) :
  * @package bbPress
  * @subpackage Classes
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  */
 class BBP_Component {
 
@@ -58,7 +58,7 @@ class BBP_Component {
 	/**
 	 * bbPress Component loader
 	 *
-	 * @since bbPress (r2700)
+	 * @since 2.0.0 bbPress (r2700)
 	 *
 	 * @param array $args Required. Supports these args:
 	 *  - name: Unique name (for internal identification)
@@ -83,7 +83,8 @@ class BBP_Component {
 	/**
 	 * Component global variables
 	 *
-	 * @since bbPress (r2700)
+	 * @since 2.0.0 bbPress (r2700)
+	 *
 	 * @access private
 	 *
 	 * @uses apply_filters() Calls 'bbp_{@link BBP_Component::name}_id'
@@ -98,7 +99,8 @@ class BBP_Component {
 	/**
 	 * Include required files
 	 *
-	 * @since bbPress (r2700)
+	 * @since 2.0.0 bbPress (r2700)
+	 *
 	 * @access private
 	 *
 	 * @uses do_action() Calls 'bbp_{@link BBP_Component::name}includes'
@@ -110,7 +112,8 @@ class BBP_Component {
 	/**
 	 * Setup the actions
 	 *
-	 * @since bbPress (r2700)
+	 * @since 2.0.0 bbPress (r2700)
+	 *
 	 * @access private
 	 *
 	 * @uses add_action() To add various actions
@@ -130,7 +133,7 @@ class BBP_Component {
 	/**
 	 * Setup the component post types
 	 *
-	 * @since bbPress (r2700)
+	 * @since 2.0.0 bbPress (r2700)
 	 *
 	 * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_register_post_types'
 	 */
@@ -141,7 +144,7 @@ class BBP_Component {
 	/**
 	 * Register component specific taxonomies
 	 *
-	 * @since bbPress (r2700)
+	 * @since 2.0.0 bbPress (r2700)
 	 *
 	 * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_register_taxonomies'
 	 */
@@ -152,7 +155,7 @@ class BBP_Component {
 	/**
 	 * Add any additional rewrite tags
 	 *
-	 * @since bbPress (r2700)
+	 * @since 2.0.0 bbPress (r2700)
 	 *
 	 * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_add_rewrite_tags'
 	 */
@@ -163,7 +166,7 @@ class BBP_Component {
 	/**
 	 * Generate any additional rewrite rules
 	 *
-	 * @since bbPress (r2700)
+	 * @since 2.0.0 bbPress (r2700)
 	 *
 	 * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_generate_rewrite_rules'
 	 */
@@ -180,7 +183,8 @@ if ( class_exists( 'Walker' ) ) :
  * @package bbPress
  * @subpackage Classes
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
+ *
  * @uses Walker
  */
 class BBP_Walker_Dropdown extends Walker {
@@ -188,7 +192,7 @@ class BBP_Walker_Dropdown extends Walker {
 	/**
 	 * @see Walker::$tree_type
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @var string
 	 */
@@ -197,7 +201,7 @@ class BBP_Walker_Dropdown extends Walker {
 	/**
 	 * @see Walker::$db_fields
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @var array
 	 */
@@ -211,7 +215,7 @@ class BBP_Walker_Dropdown extends Walker {
 	/**
 	 * Set the tree_type
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 */
 	public function __construct() {
 		$this->tree_type = bbp_get_forum_post_type();
@@ -220,7 +224,7 @@ class BBP_Walker_Dropdown extends Walker {
 	/**
 	 * @see Walker::start_el()
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @param string $output Passed by reference. Used to append additional
 	 *                       content.
@@ -271,14 +275,14 @@ class BBP_Walker_Dropdown extends Walker {
  * @package bbPress
  * @subpackage Classes
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  */
 class BBP_Walker_Reply extends Walker {
 
 	/**
 	 * @see Walker::$tree_type
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @var string
 	 */
@@ -287,7 +291,7 @@ class BBP_Walker_Reply extends Walker {
 	/**
 	 * @see Walker::$db_fields
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @var array
 	 */
@@ -299,7 +303,7 @@ class BBP_Walker_Reply extends Walker {
 	/**
 	 * Confirm the tree_type
 	 *
-	 * @since bbPress (r5389)
+	 * @since 2.6.0 bbPress (r5389)
 	 */
 	public function __construct() {
 		$this->tree_type = bbp_get_reply_post_type();
@@ -308,7 +312,7 @@ class BBP_Walker_Reply extends Walker {
 	/**
 	 * @see Walker::start_lvl()
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @param string $output Passed by reference. Used to append additional content
 	 * @param int $depth Depth of reply
@@ -333,7 +337,7 @@ class BBP_Walker_Reply extends Walker {
 	/**
 	 * @see Walker::end_lvl()
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @param string $output Passed by reference. Used to append additional content
 	 * @param int $depth Depth of reply
@@ -356,7 +360,7 @@ class BBP_Walker_Reply extends Walker {
 	}
 
 	/**
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 */
 	public function display_element( $element = false, &$children_elements = array(), $max_depth = 0, $depth = 0, $args = array(), &$output = '' ) {
 
@@ -384,7 +388,7 @@ class BBP_Walker_Reply extends Walker {
 	/**
 	 * @see Walker:start_el()
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 */
 	public function start_el( &$output, $object, $depth = 0, $args = array(), $current_object_id = 0 ) {
 
@@ -411,7 +415,7 @@ class BBP_Walker_Reply extends Walker {
 	}
 
 	/**
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 */
 	public function end_el( &$output = '', $object = false, $depth = 0, $args = array() ) {
 
@@ -436,7 +440,8 @@ class BBP_Walker_Reply extends Walker {
  * @package bbPress
  * @subpackage Classes
  *
- * @since bbPress (r5389)
+ * @since 2.6.0 bbPress (r5389)
+ *
  * @uses Walker
  */
 class BBP_Walker_Reply_Dropdown extends Walker {
@@ -444,7 +449,7 @@ class BBP_Walker_Reply_Dropdown extends Walker {
 	/**
 	 * @see Walker::$tree_type
 	 *
-	 * @since bbPress (r5389)
+	 * @since 2.6.0 bbPress (r5389)
 	 *
 	 * @var string
 	 */
@@ -453,7 +458,7 @@ class BBP_Walker_Reply_Dropdown extends Walker {
 	/**
 	 * @see Walker::$db_fields
 	 *
-	 * @since bbPress (r5389)
+	 * @since 2.6.0 bbPress (r5389)
 	 *
 	 * @var array
 	 */
@@ -467,7 +472,7 @@ class BBP_Walker_Reply_Dropdown extends Walker {
 	/**
 	 * Confirm the tree_type
 	 *
-	 * @since bbPress (r5389)
+	 * @since 2.6.0 bbPress (r5389)
 	 */
 	public function __construct() {
 		$this->tree_type = bbp_get_reply_post_type();
@@ -476,7 +481,7 @@ class BBP_Walker_Reply_Dropdown extends Walker {
 	/**
 	 * @see Walker::start_el()
 	 *
-	 * @since bbPress (r5389)
+	 * @since 2.6.0 bbPress (r5389)
 	 *
 	 * @param string $output Passed by reference. Used to append additional
 	 *                       content.
diff --git src/includes/common/formatting.php src/includes/common/formatting.php
index 851ecc7..34d51fb 100644
--- src/includes/common/formatting.php
+++ src/includes/common/formatting.php
@@ -17,7 +17,7 @@ defined( 'ABSPATH' ) || exit;
  *
  * Allows all users to post links, quotes, code, formatting, lists, and images
  *
- * @since bbPress (r4603)
+ * @since 2.3.0 bbPress (r4603)
  *
  * @return array Associative array of allowed tags and attributes
  */
@@ -76,7 +76,7 @@ function bbp_kses_allowed_tags() {
 /**
  * Custom kses filter for forum topics and replies, for filtering incoming data
  *
- * @since bbPress (r4603)
+ * @since 2.3.0 bbPress (r4603)
  *
  * @param string $data Content to filter, expected to be escaped with slashes
  * @return string Filtered content
@@ -88,7 +88,7 @@ function bbp_filter_kses( $data = '' ) {
 /**
  * Custom kses filter for forum topics and replies, for raw data
  *
- * @since bbPress (r4603)
+ * @since 2.3.0 bbPress (r4603)
  *
  * @param string $data Content to filter, expected to not be escaped
  * @return string Filtered content
@@ -102,7 +102,7 @@ function bbp_kses_data( $data = '' ) {
 /**
  * Filter the topic or reply content and output code and pre tags
  *
- * @since bbPress (r4641)
+ * @since 2.3.0 bbPress (r4641)
  *
  * @param string $content Topic and reply content
  * @return string Partially encodedd content
@@ -119,7 +119,7 @@ function bbp_code_trick( $content = '' ) {
  * When editing a topic or reply, reverse the code trick so the textarea
  * contains the correct editable content.
  *
- * @since bbPress (r4641)
+ * @since 2.3.0 bbPress (r4641)
  *
  * @param string $content Topic and reply content
  * @return string Partially encodedd content
@@ -143,7 +143,7 @@ function bbp_code_trick_reverse( $content = '' ) {
 /**
  * Filter the content and encode any bad HTML tags
  *
- * @since bbPress (r4641)
+ * @since 2.3.0 bbPress (r4641)
  *
  * @param string $content Topic and reply content
  * @return string Partially encodedd content
@@ -186,7 +186,7 @@ function bbp_encode_bad( $content = '' ) {
 /**
  * Callback to encode the tags in topic or reply content
  *
- * @since bbPress (r4641)
+ * @since 2.3.0 bbPress (r4641)
  *
  * @param array $matches
  * @return string
@@ -222,7 +222,7 @@ function bbp_encode_callback( $matches = array() ) {
 /**
  * Callback to decode the tags in topic or reply content
  *
- * @since bbPress (r4641)
+ * @since 2.3.0 bbPress (r4641)
  *
  * @param array $matches
  * @todo Experiment with _wp_specialchars()
@@ -251,7 +251,7 @@ function bbp_decode_callback( $matches = array() ) {
 /**
  * Callback to replace empty HTML tags in a content string
  *
- * @since bbPress (r4641)
+ * @since 2.3.0 bbPress (r4641)
  *
  * @internal Used by bbp_encode_bad()
  * @param string $content
@@ -267,7 +267,7 @@ function bbp_encode_empty_callback( &$content = '', $key = '', $preg = '' ) {
 /**
  * Callback to replace normal HTML tags in a content string
  *
- * @since bbPress (r4641)
+ * @since 2.3.0 bbPress (r4641)
  *
  * @internal Used by bbp_encode_bad()
  * @param type $content
@@ -285,7 +285,8 @@ function bbp_encode_normal_callback( &$content = '', $key = '', $preg = '') {
 /**
  * Catches links so rel=nofollow can be added (on output, not save)
  *
- * @since bbPress (r4865)
+ * @since 2.3.0 bbPress (r4865)
+ *
  * @param string $text Post text
  * @return string $text Text with rel=nofollow added to any links
  */
@@ -296,7 +297,8 @@ function bbp_rel_nofollow( $text = '' ) {
 /**
  * Adds rel=nofollow to a link
  *
- * @since bbPress (r4865)
+ * @since 2.3.0 bbPress (r4865)
+ *
  * @param array $matches
  * @return string $text Link with rel=nofollow added
  */
@@ -317,7 +319,7 @@ function bbp_rel_nofollow_callback( $matches = array() ) {
  * This custom version of WordPress's make_clickable() skips links inside of
  * pre and code tags.
  *
- * @since bbPress (r4941)
+ * @since 2.4.0 bbPress (r4941)
  *
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
diff --git src/includes/common/functions.php src/includes/common/functions.php
index 67af13c..7101e96 100644
--- src/includes/common/functions.php
+++ src/includes/common/functions.php
@@ -18,7 +18,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * A bbPress specific method of formatting numeric values
  *
- * @since bbPress (r2486)
+ * @since 2.0.0 bbPress (r2486)
  *
  * @param string $number Number to format
  * @param string $decimals Optional. Display decimals
@@ -39,7 +39,7 @@ function bbp_number_format( $number = 0, $decimals = false, $dec_point = '.', $t
 /**
  * A bbPress specific method of formatting numeric values
  *
- * @since bbPress (r3857)
+ * @since 2.1.0 bbPress (r3857)
  *
  * @param string $number Number to format
  * @param string $decimals Optional. Display decimals
@@ -60,7 +60,7 @@ function bbp_number_format_i18n( $number = 0, $decimals = false ) {
 /**
  * Convert time supplied from database query into specified date format.
  *
- * @since bbPress (r2455)
+ * @since 2.0.0 bbPress (r2544)
  *
  * @param string $time Time to convert
  * @param string $d Optional. Default is 'U'. Either 'G', 'U', or php date
@@ -81,7 +81,7 @@ function bbp_convert_date( $time, $d = 'U', $translate = false ) {
 /**
  * Output formatted time to display human readable time difference.
  *
- * @since bbPress (r2544)
+ * @since 2.0.0 bbPress (r2544)
  *
  * @param string $older_date Unix timestamp from which the difference begins.
  * @param string $newer_date Optional. Unix timestamp from which the
@@ -95,7 +95,7 @@ function bbp_time_since( $older_date, $newer_date = false, $gmt = false ) {
 	/**
 	 * Return formatted time to display human readable time difference.
 	 *
-	 * @since bbPress (r2544)
+	 * @since 2.0.0 bbPress (r2544)
 	 *
 	 * @param string $older_date Unix timestamp from which the difference begins.
 	 * @param string $newer_date Optional. Unix timestamp from which the
@@ -204,7 +204,7 @@ function bbp_time_since( $older_date, $newer_date = false, $gmt = false ) {
  *  - Removing periods from the end of the string
  *  - Trimming again
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param string $reason Optional. User submitted reason for editing.
  * @return string Status of topic
@@ -249,7 +249,7 @@ function bbp_get_redirect_to() {
 /**
  * Append 'view=all' to query string if it's already there from referer
  *
- * @since bbPress (r3325)
+ * @since 2.0.0 bbPress (r3325)
  *
  * @param string $original_link Original Link to be modified
  * @param bool $force Override bbp_get_view_all() check
@@ -273,7 +273,7 @@ function bbp_add_view_all( $original_link = '', $force = false ) {
 /**
  * Remove 'view=all' from query string
  *
- * @since bbPress (r3325)
+ * @since 2.0.0 bbPress (r3325)
  *
  * @param string $original_link Original Link to be modified
  * @uses current_user_can() To check if the current user can moderate
@@ -288,7 +288,7 @@ function bbp_remove_view_all( $original_link = '' ) {
 /**
  * If current user can and is vewing all topics/replies
  *
- * @since bbPress (r3325)
+ * @since 2.0.0 bbPress (r3325)
  *
  * @uses current_user_can() To check if the current user can moderate
  * @uses apply_filters() Calls 'bbp_get_view_all' with the link and original link
@@ -302,7 +302,7 @@ function bbp_get_view_all( $cap = 'moderate' ) {
 /**
  * Assist pagination by returning correct page number
  *
- * @since bbPress (r2628)
+ * @since 2.0.0 bbPress (r2628)
  *
  * @uses get_query_var() To get the 'paged' value
  * @return int Current page number
@@ -335,7 +335,7 @@ function bbp_get_paged() {
  * edits it, the post_author field is set to the logged in user's id. This
  * function fixes that.
  *
- * @since bbPress (r2734)
+ * @since 2.0.0 bbPress (r2734)
  *
  * @param array $data Post data
  * @param array $postarr Original post array (includes post id)
@@ -373,7 +373,7 @@ function bbp_fix_post_author( $data = array(), $postarr = array() ) {
 /**
  * Check the date against the _bbp_edit_lock setting.
  *
- * @since bbPress (r3133)
+ * @since 2.0.0 bbPress (r3133)
  *
  * @param string $post_date_gmt
  *
@@ -415,7 +415,7 @@ function bbp_past_edit_lock( $post_date_gmt ) {
 /**
  * Get the forum statistics
  *
- * @since bbPress (r2769)
+ * @since 2.0.0 bbPress (r2769)
  *
  * @param array $args Optional. The function supports these arguments (all
  *                     default to true):
@@ -604,7 +604,7 @@ function bbp_get_statistics( $args = array() ) {
  *
  * If there are any errors, those are directly added to {@link bbPress:errors}
  *
- * @since bbPress (r2734)
+ * @since 2.0.0 bbPress (r2734)
  *
  * @param array $args Optional. If no args are there, then $_POST values are
  *                     used.
@@ -651,7 +651,7 @@ function bbp_filter_anonymous_post_data( $args = array() ) {
  *
  * Check to make sure that a user is not making a duplicate post
  *
- * @since bbPress (r2763)
+ * @since 2.0.0 bbPress (r2763)
  *
  * @param array $post_data Contains information about the comment
  * @uses current_user_can() To check if the current user can throttle
@@ -723,7 +723,7 @@ function bbp_check_for_duplicate( $post_data = array() ) {
  * Check to make sure that a user is not making too many posts in a short amount
  * of time.
  *
- * @since bbPress (r2734)
+ * @since 2.0.0 bbPress (r2734)
  *
  * @param false|array $anonymous_data Optional - if it's an anonymous post. Do
  *                                     not supply if supplying $author_id.
@@ -773,7 +773,7 @@ function bbp_check_for_flood( $anonymous_data = false, $author_id = 0 ) {
 /**
  * Checks topics and replies against the discussion moderation of blocked keys
  *
- * @since bbPress (r3581)
+ * @since 2.1.0 bbPress (r3581)
  *
  * @param array $anonymous_data Anonymous user data
  * @param int $author_id Topic or reply author ID
@@ -897,7 +897,7 @@ function bbp_check_for_moderation( $anonymous_data = false, $author_id = 0, $tit
 /**
  * Checks topics and replies against the discussion blacklist of blocked keys
  *
- * @since bbPress (r3446)
+ * @since 2.0.0 bbPress (r3446)
  *
  * @param array $anonymous_data Anonymous user data
  * @param int $author_id Topic or reply author ID
@@ -1011,7 +1011,7 @@ function bbp_check_for_blacklist( $anonymous_data = false, $author_id = 0, $titl
  * WordPress core. Previously, we used `get_home_url()` to use already validated
  * user input, but it was causing issues in some installations.
  *
- * @since bbPress (r5409)
+ * @since 2.6.0 bbPress (r5409)
  *
  * @see  wp_mail
  * @see  wp_notify_postauthor
@@ -1039,7 +1039,7 @@ function bbp_get_do_not_reply_address() {
  * those cases, we recommend unhooking this function and creating your own
  * custom emailer script.
  *
- * @since bbPress (r5413)
+ * @since 2.6.0 bbPress (r5413)
  *
  * @param int $reply_id ID of the newly made reply
  * @param int $topic_id ID of the topic of the reply
@@ -1203,7 +1203,7 @@ Login and visit the topic to unsubscribe from these emails.', 'bbpress' ),
  * those cases, we recommend unhooking this function and creating your own
  * custom emailer script.
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $topic_id ID of the newly made reply
  * @param int $forum_id ID of the forum for the topic
@@ -1353,8 +1353,9 @@ Login and visit the topic to unsubscribe from these emails.', 'bbpress' ),
  *
  * This function is deprecated. Please use: bbp_notify_topic_subscribers()
  *
- * @since bbPress (r2668)
- * @deprecated bbPress (r5412)
+ * @since 2.0.0 bbPress (r2668)
+ *
+ * @deprecated 2.6.0 bbPress (r5412)
  *
  * @param int $reply_id ID of the newly made reply
  * @param int $topic_id ID of the topic of the reply
@@ -1410,7 +1411,7 @@ function bbp_logout_url( $url = '', $redirect_to = '' ) {
  * it allows for arguments to be passively or aggressively filtered using the
  * optional $filter_key parameter.
  *
- * @since bbPress (r3839)
+ * @since 2.1.0 bbPress (r3839)
  *
  * @param string|array $args Value to merge with $defaults
  * @param array $defaults Array that serves as the defaults.
@@ -1450,8 +1451,9 @@ function bbp_parse_args( $args, $defaults = array(), $filter_key = '' ) {
 /**
  * Adds ability to include or exclude specific post_parent ID's
  *
- * @since bbPress (r2996)
- * @deprecated bbPress (r5814)
+ * @since 2.0.0 bbPress (r2996)
+ *
+ * @deprecated 2.5.8 bbPress (r5814)
  *
  * @global WP $wp
  * @param string $where
@@ -1546,7 +1548,7 @@ function bbp_get_public_child_last_id( $parent_id = 0, $post_type = 'post' ) {
 /**
  * Query the DB and get a count of public children
  *
- * @since bbPress (r2868)
+ * @since 2.0.0 bbPress (r2868)
  *
  * @param int $parent_id Parent id
  * @param string $post_type Post type. Defaults to 'post'
@@ -1597,7 +1599,7 @@ function bbp_get_public_child_count( $parent_id = 0, $post_type = 'post' ) {
 /**
  * Query the DB and get a the child id's of public children
  *
- * @since bbPress (r2868)
+ * @since 2.0.0 bbPress (r2868)
  *
  * @param int $parent_id Parent id
  * @param string $post_type Post type. Defaults to 'post'
@@ -1650,7 +1652,7 @@ function bbp_get_public_child_ids( $parent_id = 0, $post_type = 'post' ) {
 /**
  * Query the DB and get a the child id's of all children
  *
- * @since bbPress (r3325)
+ * @since 2.0.0 bbPress (r3325)
  *
  * @param int $  parent_id  Parent id
  * @param string $post_type Post type. Defaults to 'post'
@@ -1734,7 +1736,7 @@ function bbp_get_all_child_ids( $parent_id = 0, $post_type = 'post' ) {
  *
  * Used most frequently when editing a forum/topic/reply
  *
- * @since bbPress (r3694)
+ * @since 2.1.0 bbPress (r3694)
  *
  * @global WP_Query $post
  * @param string $field Name of the key
@@ -1757,7 +1759,7 @@ function bbp_get_global_post_field( $field = 'ID', $context = 'edit' ) {
  *
  * To avoid security exploits within the theme.
  *
- * @since bbPress (r4022)
+ * @since 2.1.0 bbPress (r4022)
  *
  * @uses do_action() Calls 'bbp_check_referer' on $action.
  * @param string $action Action nonce
@@ -1801,7 +1803,7 @@ function bbp_verify_nonce_request( $action = '', $query_arg = '_wpnonce' ) {
 	 *
 	 * Useful for configurations like reverse proxying.
 	 *
-	 * @since bbPress (2.5.0)
+	 * @since 2.2.0 bbPress (r4361)
 	 *
 	 * @param string $requested_url The requested URL.
 	 */
@@ -1818,7 +1820,7 @@ function bbp_verify_nonce_request( $action = '', $query_arg = '_wpnonce' ) {
 	/**
 	 * Fires at the end of the nonce verification check.
 	 *
-	 * @since bbPress (2.2.0)
+	 * @since 2.1.0 bbPress (r4023)
 	 *
 	 * @param string $action Action nonce.
 	 * @param bool   $result Boolean result of nonce verification.
@@ -1835,7 +1837,7 @@ function bbp_verify_nonce_request( $action = '', $query_arg = '_wpnonce' ) {
  * responsible for sniffing out the query vars and serving up RSS2 feeds if
  * the stars align and the user has requested a feed of any bbPress type.
  *
- * @since bbPress (r3171)
+ * @since 2.0.0 bbPress (r3171)
  *
  * @param array $query_vars
  * @return array
@@ -2058,7 +2060,7 @@ function bbp_request_feed_trap( $query_vars = array() ) {
 /**
  * Used to guess if page exists at requested path
  *
- * @since bbPress (r3304)
+ * @since 2.0.0 bbPress (r3304)
  *
  * @uses get_option() To see if pretty permalinks are enabled
  * @uses get_page_by_path() To see if page exists at path
@@ -2088,7 +2090,7 @@ function bbp_get_page_by_path( $path = '' ) {
  *
  * Used primarily with topics/replies inside hidden forums.
  *
- * @since bbPress (r3051)
+ * @since 2.0.0 bbPress (r3051)
  *
  * @global WP_Query $wp_query
  * @uses WP_Query::set_404()
diff --git src/includes/common/shortcodes.php src/includes/common/shortcodes.php
index a2d44d7..ce1bcee 100644
--- src/includes/common/shortcodes.php
+++ src/includes/common/shortcodes.php
@@ -14,7 +14,7 @@ if ( !class_exists( 'BBP_Shortcodes' ) ) :
 /**
  * bbPress Shortcode Class
  *
- * @since bbPress (r3031)
+ * @since 2.0.0 bbPress (r3031)
  */
 class BBP_Shortcodes {
 
@@ -30,7 +30,7 @@ class BBP_Shortcodes {
 	/**
 	 * Add the register_shortcodes action to bbp_init
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @uses setup_globals()
 	 * @uses add_shortcodes()
@@ -43,7 +43,8 @@ class BBP_Shortcodes {
 	/**
 	 * Shortcode globals
 	 *
-	 * @since bbPress (r3143)
+	 * @since 2.0.0 bbPress (r3143)
+	 *
 	 * @access private
 	 *
 	 * @uses apply_filters()
@@ -99,7 +100,7 @@ class BBP_Shortcodes {
 	/**
 	 * Register the bbPress shortcodes
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @uses add_shortcode()
 	 * @uses do_action()
@@ -113,7 +114,7 @@ class BBP_Shortcodes {
 	/**
 	 * Unset some globals in the $bbp object that hold query related info
 	 *
-	 * @since bbPress (r3034)
+	 * @since 2.0.0 bbPress (r3034)
 	 */
 	private function unset_globals() {
 		$bbp = bbpress();
@@ -144,7 +145,7 @@ class BBP_Shortcodes {
 	 * than outputting the HTML at run-time. This allows shortcodes to appear
 	 * in the correct location in the_content() instead of when it's created.
 	 *
-	 * @since bbPress (r3079)
+	 * @since 2.0.0 bbPress (r3079)
 	 *
 	 * @param string $query_name
 	 *
@@ -163,7 +164,7 @@ class BBP_Shortcodes {
 	/**
 	 * Return the contents of the output buffer and flush its contents.
 	 *
-	 * @since bbPress( r3079)
+	 * @since 2.0.0 bbPress (r3079)
 	 *
 	 * @uses BBP_Shortcodes::unset_globals() Cleans up global values
 	 * @return string Contents of output buffer.
@@ -186,7 +187,7 @@ class BBP_Shortcodes {
 	 * Display an index of all visible root level forums in an output buffer
 	 * and return to ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -212,7 +213,7 @@ class BBP_Shortcodes {
 	 * Display the contents of a specific forum ID in an output buffer
 	 * and return to ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -255,7 +256,7 @@ class BBP_Shortcodes {
 	 * Display the forum form in an output buffer and return to ensure
 	 * post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3566)
+	 * @since 2.1.0 bbPress (r3566)
 	 *
 	 * @uses get_template_part()
 	 */
@@ -277,7 +278,7 @@ class BBP_Shortcodes {
 	 * Display an index of all visible root level topics in an output buffer
 	 * and return to ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -309,7 +310,7 @@ class BBP_Shortcodes {
 	 * Display the contents of a specific topic ID in an output buffer
 	 * and return to ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -375,7 +376,7 @@ class BBP_Shortcodes {
 	 * forum. This currently has styling issues from not being wrapped in
 	 * <div id="bbpress-forums"></div> which will need to be sorted out later.
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -430,7 +431,7 @@ class BBP_Shortcodes {
 	 * Display the contents of a specific reply ID in an output buffer
 	 * and return to ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -492,7 +493,7 @@ class BBP_Shortcodes {
 	 * Display the reply form in an output buffer and return to ensure
 	 * post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @uses get_template_part()
 	 */
@@ -514,7 +515,7 @@ class BBP_Shortcodes {
 	 * Display a tag cloud of all topic tags in an output buffer and return to
 	 * ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3110)
+	 * @since 2.0.0 bbPress (r3110)
 	 *
 	 * @return string
 	 */
@@ -542,7 +543,7 @@ class BBP_Shortcodes {
 	 * Display the contents of a specific topic tag in an output buffer
 	 * and return to ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3110)
+	 * @since 2.0.0 bbPress (r3110)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -581,7 +582,7 @@ class BBP_Shortcodes {
 	 * Display the contents of a specific topic tag in an output buffer
 	 * and return to ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3346)
+	 * @since 2.0.0 bbPress (r3346)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -609,7 +610,7 @@ class BBP_Shortcodes {
 	 * Display the contents of a specific view in an output buffer and return to
 	 * ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r3031)
+	 * @since 2.0.0 bbPress (r3031)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -652,7 +653,7 @@ class BBP_Shortcodes {
 	 * Display the search form in an output buffer and return to ensure
 	 * post/page contents are displayed first.
 	 *
-	 * @since bbPress (r4585)
+	 * @since 2.3.0 bbPress (r4585)
 	 *
 	 * @uses get_template_part()
 	 */
@@ -677,7 +678,7 @@ class BBP_Shortcodes {
 	 * Display the contents of search results in an output buffer and return to
 	 * ensure that post/page contents are displayed first.
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @param array $attr
 	 * @param string $content
@@ -725,7 +726,7 @@ class BBP_Shortcodes {
 	/**
 	 * Display a login form
 	 *
-	 * @since bbPress (r3302)
+	 * @since 2.0.0 bbPress (r3302)
 	 *
 	 * @return string
 	 */
@@ -751,7 +752,7 @@ class BBP_Shortcodes {
 	/**
 	 * Display a register form
 	 *
-	 * @since bbPress (r3302)
+	 * @since 2.0.0 bbPress (r3302)
 	 *
 	 * @return string
 	 */
@@ -777,7 +778,7 @@ class BBP_Shortcodes {
 	/**
 	 * Display a lost password form
 	 *
-	 * @since bbPress (r3302)
+	 * @since 2.0.0 bbPress (r3302)
 	 *
 	 * @return string
 	 */
@@ -805,7 +806,7 @@ class BBP_Shortcodes {
 	/**
 	 * Display forum statistics
 	 *
-	 * @since bbPress (r4509)
+	 * @since 2.3.0 bbPress (r4509)
 	 *
 	 * @return shring
 	 */
@@ -827,7 +828,7 @@ class BBP_Shortcodes {
 	/**
 	 * Display a breadcrumb
 	 *
-	 * @since bbPress (r3302)
+	 * @since 2.0.0 bbPress (r3302)
 	 *
 	 * @return string
 	 */
@@ -851,7 +852,7 @@ class BBP_Shortcodes {
 	/**
 	 * Filter the query for the topic index
 	 *
-	 * @since bbPress (r3637)
+	 * @since 2.1.0 bbPress (r3637)
 	 *
 	 * @param array $args
 	 * @return array
@@ -866,7 +867,7 @@ class BBP_Shortcodes {
 	/**
 	 * Filter the query for topic tags
 	 *
-	 * @since bbPress (r3637)
+	 * @since 2.1.0 bbPress (r3637)
 	 *
 	 * @param array $args
 	 * @return array
diff --git src/includes/common/template.php src/includes/common/template.php
index 49486f2..5e938e2 100644
--- src/includes/common/template.php
+++ src/includes/common/template.php
@@ -18,7 +18,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Ouput the forum URL
  *
- * @since bbPress (r3979)
+ * @since 2.1.0 bbPress (r3979)
  *
  * @uses bbp_get_forums_url() To get the forums URL
  * @param string $path Additional path with leading slash
@@ -29,7 +29,7 @@ function bbp_forums_url( $path = '/' ) {
 	/**
 	 * Return the forum URL
 	 *
-	 * @since bbPress (r3979)
+	 * @since 2.1.0 bbPress (r3979)
 	 *
 	 * @uses home_url() To get the home URL
 	 * @uses bbp_get_root_slug() To get the forum root location
@@ -42,7 +42,7 @@ function bbp_forums_url( $path = '/' ) {
 /**
  * Ouput the forum URL
  *
- * @since bbPress (r3979)
+ * @since 2.1.0 bbPress (r3979)
  *
  * @uses bbp_get_topics_url() To get the topics URL
  * @param string $path Additional path with leading slash
@@ -53,7 +53,7 @@ function bbp_topics_url( $path = '/' ) {
 	/**
 	 * Return the forum URL
 	 *
-	 * @since bbPress (r3979)
+	 * @since 2.1.0 bbPress (r3979)
 	 *
 	 * @uses home_url() To get the home URL
 	 * @uses bbp_get_topic_archive_slug() To get the topics archive location
@@ -69,7 +69,7 @@ function bbp_topics_url( $path = '/' ) {
 /**
  * Add our custom head action to wp_head
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses do_action() Calls 'bbp_head'
 */
@@ -80,7 +80,7 @@ function bbp_head() {
 /**
  * Add our custom head action to wp_head
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses do_action() Calls 'bbp_footer'
  */
@@ -93,7 +93,7 @@ function bbp_footer() {
 /**
  * Check if current site is public
  *
- * @since bbPress (r3398)
+ * @since 2.0.0 bbPress (r3398)
  *
  * @param int $site_id
  * @uses get_current_blog_id()
@@ -117,7 +117,7 @@ function bbp_is_site_public( $site_id = 0 ) {
 /**
  * Check if current page is a bbPress forum
  *
- * @since bbPress (r2549)
+ * @since 2.0.0 bbPress (r2549)
  *
  * @param int $post_id Possible post_id to check
  * @uses bbp_get_forum_post_type() To get the forum post type
@@ -139,7 +139,7 @@ function bbp_is_forum( $post_id = 0 ) {
 /**
  * Check if we are viewing a forum archive.
  *
- * @since bbPress (r3251)
+ * @since 2.0.0 bbPress (r3251)
  *
  * @uses is_post_type_archive() To check if we are looking at the forum archive
  * @uses bbp_get_forum_post_type() To get the forum post type ID
@@ -163,7 +163,7 @@ function bbp_is_forum_archive() {
 /**
  * Viewing a single forum
  *
- * @since bbPress (r3338)
+ * @since 2.0.0 bbPress (r3338)
  *
  * @uses is_single()
  * @uses bbp_get_forum_post_type()
@@ -193,7 +193,7 @@ function bbp_is_single_forum() {
 /**
  * Check if current page is a forum edit page
  *
- * @since bbPress (r3553)
+ * @since 2.1.0 bbPress (r3553)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_forum_edit is true
  * @return bool True if it's the forum edit page, false if not
@@ -219,7 +219,7 @@ function bbp_is_forum_edit() {
 /**
  * Check if current page is a bbPress topic
  *
- * @since bbPress (r2549)
+ * @since 2.0.0 bbPress (r2549)
  *
  * @param int $post_id Possible post_id to check
  * @uses bbp_get_topic_post_type() To get the topic post type
@@ -242,7 +242,7 @@ function bbp_is_topic( $post_id = 0 ) {
 /**
  * Viewing a single topic
  *
- * @since bbPress (r3338)
+ * @since 2.0.0 bbPress (r3338)
  *
  * @uses is_single()
  * @uses bbp_get_topic_post_type()
@@ -272,7 +272,7 @@ function bbp_is_single_topic() {
 /**
  * Check if we are viewing a topic archive.
  *
- * @since bbPress (r3251)
+ * @since 2.0.0 bbPress (r3251)
  *
  * @uses is_post_type_archive() To check if we are looking at the topic archive
  * @uses bbp_get_topic_post_type() To get the topic post type ID
@@ -295,7 +295,7 @@ function bbp_is_topic_archive() {
 /**
  * Check if current page is a topic edit page
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_topic_edit is true
  * @return bool True if it's the topic edit page, false if not
@@ -321,7 +321,7 @@ function bbp_is_topic_edit() {
 /**
  * Check if current page is a topic merge page
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @uses bbp_is_topic_edit() To check if it's a topic edit page
  * @return bool True if it's the topic merge page, false if not
@@ -342,7 +342,7 @@ function bbp_is_topic_merge() {
 /**
  * Check if current page is a topic split page
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @uses bbp_is_topic_edit() To check if it's a topic edit page
  * @return bool True if it's the topic split page, false if not
@@ -363,7 +363,7 @@ function bbp_is_topic_split() {
 /**
  * Check if the current page is a topic tag
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @return bool True if it's a topic tag, false if not
  */
@@ -393,7 +393,7 @@ function bbp_is_topic_tag() {
 /**
  * Check if the current page is editing a topic tag
  *
- * @since bbPress (r3346)
+ * @since 2.0.0 bbPress (r3346)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_topic_tag_edit is true
  * @return bool True if editing a topic tag, false if not
@@ -424,7 +424,7 @@ function bbp_is_topic_tag_edit() {
 /**
  * Check if the current post type is one of bbPress's
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @param mixed $the_post Optional. Post object or post ID.
  * @uses get_post_type()
@@ -454,7 +454,7 @@ function bbp_is_custom_post_type( $the_post = false ) {
 /**
  * Check if current page is a bbPress reply
  *
- * @since bbPress (r2549)
+ * @since 2.0.0 bbPress (r2549)
  *
  * @param int $post_id Possible post_id to check
  * @uses bbp_get_reply_post_type() To get the reply post type
@@ -477,7 +477,7 @@ function bbp_is_reply( $post_id = 0 ) {
 /**
  * Check if current page is a reply edit page
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_reply_edit is true
  * @return bool True if it's the reply edit page, false if not
@@ -522,7 +522,7 @@ function bbp_is_reply_move() {
 /**
  * Viewing a single reply
  *
- * @since bbPress (r3344)
+ * @since 2.0.0 bbPress (r3344)
  *
  * @uses is_single()
  * @uses bbp_get_reply_post_type()
@@ -552,7 +552,7 @@ function bbp_is_single_reply() {
 /**
  * Check if current page is a bbPress user's favorites page (profile page)
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @return bool True if it's the favorites page, false if not
  */
@@ -573,7 +573,7 @@ function bbp_is_favorites() {
 /**
  * Check if current page is a bbPress user's subscriptions page (profile page)
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @return bool True if it's the subscriptions page, false if not
  */
@@ -595,7 +595,7 @@ function bbp_is_subscriptions() {
  * Check if current page shows the topics created by a bbPress user (profile
  * page)
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @return bool True if it's the topics created page, false if not
  */
@@ -617,7 +617,7 @@ function bbp_is_topics_created() {
  * Check if current page shows the topics created by a bbPress user (profile
  * page)
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @return bool True if it's the topics created page, false if not
  */
@@ -638,7 +638,8 @@ function bbp_is_replies_created() {
 /**
  * Check if current page is the currently logged in users author page
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
+ *
  * @uses bbp_is_single_user() Check query variable
  * @uses is_user_logged_in() Must be logged in to be home
  * @uses bbp_get_displayed_user_id()
@@ -662,7 +663,8 @@ function bbp_is_user_home() {
 /**
  * Check if current page is the currently logged in users author edit page
  *
- * @since bbPress (r3918)
+ * @since 2.1.0 bbPress (r3918)
+ *
  * @uses bbp_is_single_user_edit() Check query variable
  * @uses is_user_logged_in() Must be logged in to be home
  * @uses bbp_get_displayed_user_id()
@@ -684,7 +686,7 @@ function bbp_is_user_home_edit() {
 /**
  * Check if current page is a user profile page
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_single_user is set to true
  * @return bool True if it's a user's profile page, false if not
@@ -706,7 +708,7 @@ function bbp_is_single_user() {
 /**
  * Check if current page is a user profile edit page
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_single_user_edit is set to true
  * @return bool True if it's a user's profile edit page, false if not
@@ -728,7 +730,7 @@ function bbp_is_single_user_edit() {
 /**
  * Check if current page is a user profile page
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_single_user_profile is set to true
  * @return bool True if it's a user's profile page, false if not
@@ -750,7 +752,7 @@ function bbp_is_single_user_profile() {
 /**
  * Check if current page is a user topics created page
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_single_user_topics is set to true
  * @return bool True if it's a user's topics page, false if not
@@ -772,7 +774,7 @@ function bbp_is_single_user_topics() {
 /**
  * Check if current page is a user replies created page
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_single_user_replies is set to true
  * @return bool True if it's a user's replies page, false if not
@@ -794,7 +796,7 @@ function bbp_is_single_user_replies() {
 /**
  * Check if current page is a view page
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @global WP_Query $wp_query To check if WP_Query::bbp_is_view is true
  * @uses bbp_is_query_name() To get the query name
@@ -822,7 +824,7 @@ function bbp_is_single_view() {
 /**
  * Check if current page is a search page
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @global WP_Query $wp_query To check if WP_Query::bbp_is_search is true
  * @uses bbp_is_query_name() To get the query name
@@ -860,7 +862,7 @@ function bbp_is_search() {
 /**
  * Check if current page is a search results page
  *
- * @since bbPress (r4919)
+ * @since 2.4.0 bbPress (r4919)
  *
  * @global WP_Query $wp_query To check if WP_Query::bbp_is_search is true
  * @uses bbp_is_query_name() To get the query name
@@ -898,7 +900,7 @@ function bbp_is_search_results() {
 /**
  * Check if current page is an edit page
  *
- * @since bbPress (r3585)
+ * @since 2.1.0 bbPress (r3585)
  *
  * @uses WP_Query Checks if WP_Query::bbp_is_edit is true
  * @return bool True if it's the edit page, false if not
@@ -920,7 +922,7 @@ function bbp_is_edit() {
 /**
  * Use the above is_() functions to output a body class for each scenario
  *
- * @since bbPress (r2926)
+ * @since 2.0.0 bbPress (r2926)
  *
  * @param array $wp_classes
  * @param array $custom_classes
@@ -1073,7 +1075,7 @@ function bbp_body_class( $wp_classes, $custom_classes = false ) {
 /**
  * Use the above is_() functions to return if in any bbPress page
  *
- * @since bbPress (r3344)
+ * @since 2.0.0 bbPress (r3344)
  *
  * @uses bbp_is_single_forum()
  * @uses bbp_is_single_topic()
@@ -1188,7 +1190,7 @@ function is_bbpress() {
 /**
  * Output the login form action url
  *
- * @since bbPress (r2815)
+ * @since 2.0.0 bbPress (r2815)
  *
  * @param array $args This function supports these arguments:
  *  - action: The action being taken
@@ -1204,7 +1206,7 @@ function bbp_wp_login_action( $args = array() ) {
 	/**
 	 * Return the login form action url
 	 *
-	 * @since bbPress (r5684)
+	 * @since 2.6.0 bbPress (r5684)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - action: The action being taken
@@ -1242,7 +1244,7 @@ function bbp_wp_login_action( $args = array() ) {
  * The referer link is the current Request URI from the server super global. To
  * check the field manually, use bbp_get_redirect_to().
  *
- * @since bbPress (r2815)
+ * @since 2.0.0 bbPress (r2815)
  *
  * @param string $redirect_to Pass a URL to redirect to
  *
@@ -1274,7 +1276,7 @@ function bbp_redirect_to_field( $redirect_to = '' ) {
  * Use the $input_type parameter to properly process the value. This
  * ensures correct sanitization of the value for the receiving input.
  *
- * @since bbPress (r2815)
+ * @since 2.0.0 bbPress (r2815)
  *
  * @param string $request Name of $_REQUEST to look for
  * @param string $input_type Type of input. Default: text. Accepts:
@@ -1290,7 +1292,7 @@ function bbp_sanitize_val( $request = '', $input_type = 'text' ) {
 	 * Use the $input_type parameter to properly process the value. This
 	 * ensures correct sanitization of the value for the receiving input.
 	 *
-	 * @since bbPress (r2815)
+	 * @since 2.0.0 bbPress (r2815)
 	 *
 	 * @param string $request Name of $_REQUEST to look for
 	 * @param string $input_type Type of input. Default: text. Accepts:
@@ -1336,8 +1338,10 @@ function bbp_sanitize_val( $request = '', $input_type = 'text' ) {
  * template file. Calling this function will automatically increment the global
  * tab index by default.
  *
- * @since bbPress (r2810)
- * @deprecated since version 2.6
+ * @since 2.0.0 bbPress (r2810)
+ *
+ * @deprecated 2.6.0 bbPress (r5561)
+ *
  * @link https://bbpress.trac.wordpress.org/attachment/ticket/2714 Trac Ticket
  * @param int $auto_increment Optional. Default true. Set to false to prevent
  *                             increment
@@ -1353,8 +1357,10 @@ function bbp_tab_index( $auto_increment = true ) {
 	 * within a template file. Calling this function will automatically
 	 * increment the global tab index by default.
 	 *
-	 * @since bbPress (r2810)
-	 * @deprecated bbPress (r5560)
+	 * @since 2.0.0 bbPress (r2810)
+	 *
+	 * @deprecated 2.6.0 bbPress (r5561)
+	 *
 	 * @link https://bbpress.trac.wordpress.org/attachment/ticket/2714 Trac Ticket
 	 * @uses apply_filters Allows return value to be filtered
 	 * @param int $auto_increment Optional. Default true. Set to false to
@@ -1377,7 +1383,7 @@ function bbp_tab_index( $auto_increment = true ) {
  *
  * Can be used for any post type, but is mostly used for topics and forums.
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param array $args See {@link bbp_get_dropdown()} for arguments
  */
@@ -1388,7 +1394,7 @@ function bbp_dropdown( $args = array() ) {
 	 * Return a select box allowing to pick which forum/topic a new
 	 * topic/reply belongs in.
 	 *
-	 * @since bbPress (r2746)
+	 * @since 2.0.0 bbPress (r2746)
 	 *
 	 * @param array $args The function supports these args:
 	 *  - post_type: Post type, defaults to bbp_get_forum_post_type() (bbp_forum)
@@ -1561,7 +1567,7 @@ function bbp_dropdown( $args = array() ) {
 /**
  * Output the required hidden fields when creating/editing a forum
  *
- * @since bbPress (r3553)
+ * @since 2.1.0 bbPress (r3553)
  *
  * @uses bbp_is_forum_edit() To check if it's the forum edit page
  * @uses wp_nonce_field() To generate hidden nonce fields
@@ -1604,7 +1610,7 @@ function bbp_forum_form_fields() {
 /**
  * Output the required hidden fields when creating/editing a topic
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
  *
  * @uses bbp_is_topic_edit() To check if it's the topic edit page
  * @uses wp_nonce_field() To generate hidden nonce fields
@@ -1647,7 +1653,7 @@ function bbp_topic_form_fields() {
 /**
  * Output the required hidden fields when creating/editing a reply
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
  *
  * @uses bbp_is_reply_edit() To check if it's the reply edit page
  * @uses wp_nonce_field() To generate hidden nonce fields
@@ -1690,7 +1696,7 @@ function bbp_reply_form_fields() {
 /**
  * Output the required hidden fields when editing a user
  *
- * @since bbPress (r2690)
+ * @since 2.0.0 bbPress (r2690)
  *
  * @uses bbp_displayed_user_id() To output the displayed user id
  * @uses wp_nonce_field() To generate a hidden referer field
@@ -1709,7 +1715,7 @@ function bbp_edit_user_form_fields() {
  *
  * Output the required hidden fields when merging a topic
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @uses wp_nonce_field() To generate a hidden nonce field
  * @uses bbp_topic_id() To output the topic id
@@ -1728,7 +1734,7 @@ function bbp_merge_topic_form_fields() {
  *
  * Output the required hidden fields when splitting a topic
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @uses wp_nonce_field() To generate a hidden nonce field
  */
@@ -1760,7 +1766,7 @@ function bbp_move_reply_form_fields() {
 /**
  * Output a textarea or TinyMCE if enabled
  *
- * @since bbPress (r3586)
+ * @since 2.1.0 bbPress (r3586)
  *
  * @param array $args
  * @uses bbp_get_the_content() To return the content to output
@@ -1771,7 +1777,7 @@ function bbp_the_content( $args = array() ) {
 	/**
 	 * Return a textarea or TinyMCE if enabled
 	 *
-	 * @since bbPress (r3586)
+	 * @since 2.1.0 bbPress (r3586)
 	 *
 	 * @param array $args
 	 *
@@ -1878,7 +1884,7 @@ function bbp_the_content( $args = array() ) {
 /**
  * Edit TinyMCE plugins to match core behaviour
  *
- * @since bbPress (r4574)
+ * @since 2.3.0 bbPress (r4574)
  *
  * @param array $plugins
  * @see tiny_mce_plugins, teeny_mce_plugins
@@ -1903,7 +1909,7 @@ function bbp_get_tiny_mce_plugins( $plugins = array() ) {
 /**
  * Edit TeenyMCE buttons to match allowedtags
  *
- * @since bbPress (r4605)
+ * @since 2.3.0 bbPress (r4605)
  *
  * @param array $buttons
  * @see teeny_mce_buttons
@@ -1928,7 +1934,7 @@ function bbp_get_teeny_mce_buttons( $buttons = array() ) {
 /**
  * Edit TinyMCE quicktags buttons to match allowedtags
  *
- * @since bbPress (r4606)
+ * @since 2.3.0 bbPress (r4606)
  *
  * @param array $settings
  * @see quicktags_settings
@@ -1957,7 +1963,7 @@ function bbp_get_quicktags_settings( $settings = array() ) {
 /**
  * Output the view id
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @param string $view Optional. View id
  * @uses bbp_get_view_id() To get the view id
@@ -1971,7 +1977,7 @@ function bbp_view_id( $view = '' ) {
 	 *
 	 * Use view id if supplied, otherwise bbp_get_view_rewrite_id() query var.
 	 *
-	 * @since bbPress (r2789)
+	 * @since 2.0.0 bbPress (r2789)
 	 *
 	 * @param string $view Optional. View id.
 	 * @uses sanitize_title() To sanitize the view id
@@ -2000,7 +2006,7 @@ function bbp_view_id( $view = '' ) {
 /**
  * Output the view name aka title
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @param string $view Optional. View id
  * @uses bbp_get_view_title() To get the view title
@@ -2015,7 +2021,7 @@ function bbp_view_title( $view = '' ) {
 	 * If a view id is supplied, that is used. Otherwise the bbp_view
 	 * query var is checked for.
 	 *
-	 * @since bbPress (r2789)
+	 * @since 2.0.0 bbPress (r2789)
 	 *
 	 * @param string $view Optional. View id
 	 * @uses bbp_get_view_id() To get the view id
@@ -2035,7 +2041,7 @@ function bbp_view_title( $view = '' ) {
 /**
  * Output the view url
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @param string $view Optional. View id
  * @uses bbp_get_view_url() To get the view url
@@ -2046,7 +2052,7 @@ function bbp_view_url( $view = false ) {
 	/**
 	 * Return the view url
 	 *
-	 * @since bbPress (r2789)
+	 * @since 2.0.0 bbPress (r2789)
 	 *
 	 * @param string $view Optional. View id
 	 * @uses sanitize_title() To sanitize the view id
@@ -2084,7 +2090,7 @@ function bbp_view_url( $view = false ) {
 /**
  * Check the passed parameter against the current _bbp_query_name
  *
- * @since bbPress (r2980)
+ * @since 2.0.0 bbPress (r2980)
  *
  * @uses bbp_get_query_name() Get the query var '_bbp_query_name'
  * @return bool True if match, false if not
@@ -2096,7 +2102,7 @@ function bbp_is_query_name( $name = '' )  {
 /**
  * Get the '_bbp_query_name' setting
  *
- * @since bbPress (r2695)
+ * @since 2.0.0 bbPress (r2695)
  *
  * @uses get_query_var() To get the query var '_bbp_query_name'
  * @return string To return the query var value
@@ -2108,7 +2114,7 @@ function bbp_get_query_name()  {
 /**
  * Set the '_bbp_query_name' setting to $name
  *
- * @since bbPress (r2692)
+ * @since 2.0.0 bbPress (r2692)
  *
  * @param string $name What to set the query var to
  * @uses set_query_var() To set the query var '_bbp_query_name'
@@ -2120,7 +2126,7 @@ function bbp_set_query_name( $name = '' )  {
 /**
  * Used to clear the '_bbp_query_name' setting
  *
- * @since bbPress (r2692)
+ * @since 2.0.0 bbPress (r2692)
  *
  * @uses bbp_set_query_name() To set the query var '_bbp_query_name' value to ''
  */
@@ -2133,7 +2139,7 @@ function bbp_reset_query_name() {
 /**
  * Output the page title as a breadcrumb
  *
- * @since bbPress (r2589)
+ * @since 2.0.0 bbPress (r2589)
  *
  * @param string $sep Separator. Defaults to '&larr;'
  * @param bool $current_page Include the current item
@@ -2147,7 +2153,7 @@ function bbp_title_breadcrumb( $args = array() ) {
 /**
  * Output a breadcrumb
  *
- * @since bbPress (r2589)
+ * @since 2.0.0 bbPress (r2589)
  *
  * @param string $sep Separator. Defaults to '&larr;'
  * @param bool $current_page Include the current item
@@ -2160,7 +2166,7 @@ function bbp_breadcrumb( $args = array() ) {
 	/**
 	 * Return a breadcrumb ( forum -> topic -> reply )
 	 *
-	 * @since bbPress (r2589)
+	 * @since 2.0.0 bbPress (r2589)
 	 *
 	 * @param string $sep Separator. Defaults to '&larr;'
 	 * @param bool $current_page Include the current item
@@ -2448,7 +2454,7 @@ function bbp_breadcrumb( $args = array() ) {
  * This is useful for displaying in the post area, which elements and
  * attributes are supported. As well as any plugins which want to display it.
  *
- * @since bbPress (r2780)
+ * @since 2.0.0 bbPress (r2780)
  *
  * @uses bbp_get_allowed_tags()
  */
@@ -2461,7 +2467,7 @@ function bbp_allowed_tags() {
 	 * This is useful for displaying in the post area, which elements and
 	 * attributes are supported. As well as any plugins which want to display it.
 	 *
-	 * @since bbPress (r2780)
+	 * @since 2.0.0 bbPress (r2780)
 	 *
 	 * @uses bbp_kses_allowed_tags() To get the allowed tags
 	 * @uses apply_filters() Calls 'bbp_allowed_tags' with the tags
@@ -2489,7 +2495,7 @@ function bbp_allowed_tags() {
 /**
  * Display possible errors & messages inside a template file
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @uses WP_Error bbPress::errors::get_error_codes() To get the error codes
  * @uses WP_Error bbPress::errors::get_error_data() To get the error data
@@ -2554,7 +2560,7 @@ function bbp_template_notices() {
 /**
  * Output the logout link
  *
- * @since bbPress (r2827)
+ * @since 2.0.0 bbPress (r2827)
  *
  * @param string $redirect_to Redirect to url
  * @uses bbp_get_logout_link() To get the logout link
@@ -2565,7 +2571,7 @@ function bbp_logout_link( $redirect_to = '' ) {
 	/**
 	 * Return the logout link
 	 *
-	 * @since bbPress (r2827)
+	 * @since 2.0.0 bbPress (r2827)
 	 *
 	 * @param string $redirect_to Redirect to url
 	 * @uses wp_logout_url() To get the logout url
@@ -2582,7 +2588,7 @@ function bbp_logout_link( $redirect_to = '' ) {
 /**
  * Custom page title for bbPress pages
  *
- * @since bbPress (r2788)
+ * @since 2.0.0 bbPress (r2788)
  *
  * @param string $title Optional. The title (not used).
  * @param string $sep Optional, default is '&raquo;'. How to separate the
diff --git src/includes/common/widgets.php src/includes/common/widgets.php
index b3e0546..c644885 100644
--- src/includes/common/widgets.php
+++ src/includes/common/widgets.php
@@ -17,7 +17,7 @@ defined( 'ABSPATH' ) || exit;
  *
  * Adds a widget which displays the login form
  *
- * @since bbPress (r2827)
+ * @since 2.0.0 bbPress (r2827)
  *
  * @uses WP_Widget
  */
@@ -28,7 +28,7 @@ class BBP_Login_Widget extends WP_Widget {
 	 *
 	 * Registers the login widget
 	 *
-	 * @since bbPress (r2827)
+	 * @since 2.0.0 bbPress (r2827)
 	 *
 	 * @uses apply_filters() Calls 'bbp_login_widget_options' with the
 	 *                        widget options
@@ -45,7 +45,7 @@ class BBP_Login_Widget extends WP_Widget {
 	/**
 	 * Register the widget
 	 *
-	 * @since bbPress (r3389)
+	 * @since 2.0.0 bbPress (r3389)
 	 *
 	 * @uses register_widget()
 	 */
@@ -56,7 +56,7 @@ class BBP_Login_Widget extends WP_Widget {
 	/**
 	 * Displays the output, the login form
 	 *
-	 * @since bbPress (r2827)
+	 * @since 2.0.0 bbPress (r2827)
 	 *
 	 * @param array $args Arguments
 	 * @param array $instance Instance
@@ -153,7 +153,7 @@ class BBP_Login_Widget extends WP_Widget {
 	/**
 	 * Update the login widget options
 	 *
-	 * @since bbPress (r2827)
+	 * @since 2.0.0 bbPress (r2827)
 	 *
 	 * @param array $new_instance The new instance options
 	 * @param array $old_instance The old instance options
@@ -170,7 +170,7 @@ class BBP_Login_Widget extends WP_Widget {
 	/**
 	 * Output the login widget options form
 	 *
-	 * @since bbPress (r2827)
+	 * @since 2.0.0 bbPress (r2827)
 	 *
 	 * @param $instance Instance
 	 * @uses BBP_Login_Widget::get_field_id() To output the field id
@@ -202,7 +202,7 @@ class BBP_Login_Widget extends WP_Widget {
 	/**
 	 * Merge the widget settings into defaults array.
 	 *
-	 * @since bbPress (r4802)
+	 * @since 2.3.0 bbPress (r4802)
 	 *
 	 * @param $instance Instance
 	 * @uses bbp_parse_args() To merge widget settings into defaults
@@ -221,7 +221,7 @@ class BBP_Login_Widget extends WP_Widget {
  *
  * Adds a widget which displays the view list
  *
- * @since bbPress (r3020)
+ * @since 2.0.0 bbPress (r3020)
  *
  * @uses WP_Widget
  */
@@ -232,7 +232,7 @@ class BBP_Views_Widget extends WP_Widget {
 	 *
 	 * Registers the view widget
 	 *
-	 * @since bbPress (r3020)
+	 * @since 2.0.0 bbPress (r3020)
 	 *
 	 * @uses apply_filters() Calls 'bbp_views_widget_options' with the
 	 *                        widget options
@@ -249,7 +249,7 @@ class BBP_Views_Widget extends WP_Widget {
 	/**
 	 * Register the widget
 	 *
-	 * @since bbPress (r3389)
+	 * @since 2.0.0 bbPress (r3389)
 	 *
 	 * @uses register_widget()
 	 */
@@ -260,7 +260,7 @@ class BBP_Views_Widget extends WP_Widget {
 	/**
 	 * Displays the output, the view list
 	 *
-	 * @since bbPress (r3020)
+	 * @since 2.0.0 bbPress (r3020)
 	 *
 	 * @param array $args Arguments
 	 * @param array $instance Instance
@@ -307,7 +307,7 @@ class BBP_Views_Widget extends WP_Widget {
 	/**
 	 * Update the view widget options
 	 *
-	 * @since bbPress (r3020)
+	 * @since 2.0.0 bbPress (r3020)
 	 *
 	 * @param array $new_instance The new instance options
 	 * @param array $old_instance The old instance options
@@ -322,7 +322,7 @@ class BBP_Views_Widget extends WP_Widget {
 	/**
 	 * Output the view widget options form
 	 *
-	 * @since bbPress (r3020)
+	 * @since 2.0.0 bbPress (r3020)
 	 *
 	 * @param $instance Instance
 	 * @uses BBP_Views_Widget::get_field_id() To output the field id
@@ -345,7 +345,7 @@ class BBP_Views_Widget extends WP_Widget {
 	/**
 	 * Merge the widget settings into defaults array.
 	 *
-	 * @since bbPress (r4802)
+	 * @since 2.3.0 bbPress (r4802)
 	 *
 	 * @param $instance Instance
 	 * @uses bbp_parse_args() To merge widget settings into defaults
@@ -362,7 +362,7 @@ class BBP_Views_Widget extends WP_Widget {
  *
  * Adds a widget which displays the forum search form
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses WP_Widget
  */
@@ -373,7 +373,7 @@ class BBP_Search_Widget extends WP_Widget {
 	 *
 	 * Registers the search widget
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @uses apply_filters() Calls 'bbp_search_widget_options' with the
 	 *                        widget options
@@ -390,7 +390,7 @@ class BBP_Search_Widget extends WP_Widget {
 	/**
 	 * Register the widget
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @uses register_widget()
 	 */
@@ -401,7 +401,7 @@ class BBP_Search_Widget extends WP_Widget {
 	/**
 	 * Displays the output, the search form
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @uses apply_filters() Calls 'bbp_search_widget_title' with the title
 	 * @uses get_template_part() To get the search form
@@ -436,7 +436,7 @@ class BBP_Search_Widget extends WP_Widget {
 	/**
 	 * Update the widget options
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @param array $new_instance The new instance options
 	 * @param array $old_instance The old instance options
@@ -451,7 +451,7 @@ class BBP_Search_Widget extends WP_Widget {
 	/**
 	 * Output the search widget options form
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @param $instance Instance
 	 * @uses BBP_Search_Widget::get_field_id() To output the field id
@@ -474,7 +474,7 @@ class BBP_Search_Widget extends WP_Widget {
 	/**
 	 * Merge the widget settings into defaults array.
 	 *
-	 * @since bbPress (r4802)
+	 * @since 2.3.0 bbPress (r4802)
 	 *
 	 * @param $instance Instance
 	 * @uses bbp_parse_args() To merge widget settings into defaults
@@ -491,7 +491,7 @@ class BBP_Search_Widget extends WP_Widget {
  *
  * Adds a widget which displays the forum list
  *
- * @since bbPress (r2653)
+ * @since 2.0.0 bbPress (r2653)
  *
  * @uses WP_Widget
  */
@@ -502,7 +502,7 @@ class BBP_Forums_Widget extends WP_Widget {
 	 *
 	 * Registers the forum widget
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @uses apply_filters() Calls 'bbp_forums_widget_options' with the
 	 *                        widget options
@@ -519,7 +519,7 @@ class BBP_Forums_Widget extends WP_Widget {
 	/**
 	 * Register the widget
 	 *
-	 * @since bbPress (r3389)
+	 * @since 2.0.0 bbPress (r3389)
 	 *
 	 * @uses register_widget()
 	 */
@@ -530,7 +530,7 @@ class BBP_Forums_Widget extends WP_Widget {
 	/**
 	 * Displays the output, the forum list
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param array $args Arguments
 	 * @param array $instance Instance
@@ -603,7 +603,7 @@ class BBP_Forums_Widget extends WP_Widget {
 	/**
 	 * Update the forum widget options
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param array $new_instance The new instance options
 	 * @param array $old_instance The old instance options
@@ -624,7 +624,7 @@ class BBP_Forums_Widget extends WP_Widget {
 	/**
 	 * Output the forum widget options form
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param $instance Instance
 	 * @uses BBP_Forums_Widget::get_field_id() To output the field id
@@ -657,7 +657,7 @@ class BBP_Forums_Widget extends WP_Widget {
 	/**
 	 * Merge the widget settings into defaults array.
 	 *
-	 * @since bbPress (r4802)
+	 * @since 2.3.0 bbPress (r4802)
 	 *
 	 * @param $instance Instance
 	 * @uses bbp_parse_args() To merge widget settings into defaults
@@ -675,7 +675,7 @@ class BBP_Forums_Widget extends WP_Widget {
  *
  * Adds a widget which displays the topic list
  *
- * @since bbPress (r2653)
+ * @since 2.0.0 bbPress (r2653)
  *
  * @uses WP_Widget
  */
@@ -686,7 +686,7 @@ class BBP_Topics_Widget extends WP_Widget {
 	 *
 	 * Registers the topic widget
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @uses apply_filters() Calls 'bbp_topics_widget_options' with the
 	 *                        widget options
@@ -703,7 +703,7 @@ class BBP_Topics_Widget extends WP_Widget {
 	/**
 	 * Register the widget
 	 *
-	 * @since bbPress (r3389)
+	 * @since 2.0.0 bbPress (r3389)
 	 *
 	 * @uses register_widget()
 	 */
@@ -714,7 +714,7 @@ class BBP_Topics_Widget extends WP_Widget {
 	/**
 	 * Displays the output, the topic list
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param array $args
 	 * @param array $instance
@@ -844,7 +844,7 @@ class BBP_Topics_Widget extends WP_Widget {
 	/**
 	 * Update the topic widget options
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param array $new_instance The new instance options
 	 * @param array $old_instance The old instance options
@@ -869,7 +869,7 @@ class BBP_Topics_Widget extends WP_Widget {
 	/**
 	 * Output the topic widget options form
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param $instance Instance
 	 * @uses BBP_Topics_Widget::get_field_id() To output the field id
@@ -911,7 +911,7 @@ class BBP_Topics_Widget extends WP_Widget {
 	/**
 	 * Merge the widget settings into defaults array.
 	 *
-	 * @since bbPress (r4802)
+	 * @since 2.3.0 bbPress (r4802)
 	 *
 	 * @param $instance Instance
 	 * @uses bbp_parse_args() To merge widget options into defaults
@@ -933,7 +933,7 @@ class BBP_Topics_Widget extends WP_Widget {
  *
  * Adds a widget which displays the forum statistics
  *
- * @since bbPress (r4509)
+ * @since 2.3.0 bbPress (r4509)
  *
  * @uses WP_Widget
  */
@@ -944,7 +944,7 @@ class BBP_Stats_Widget extends WP_Widget {
 	 *
 	 * Registers the stats widget
 	 *
-	 * @since bbPress (r4509)
+	 * @since 2.3.0 bbPress (r4509)
 	 *
 	 * @uses  apply_filters() Calls 'bbp_stats_widget_options' with the
 	 *        widget options
@@ -961,7 +961,7 @@ class BBP_Stats_Widget extends WP_Widget {
 	/**
 	 * Register the widget
 	 *
-	 * @since bbPress (r4509)
+	 * @since 2.3.0 bbPress (r4509)
 	 *
 	 * @uses register_widget()
 	 */
@@ -972,7 +972,7 @@ class BBP_Stats_Widget extends WP_Widget {
 	/**
 	 * Displays the output, the statistics
 	 *
-	 * @since bbPress (r4509)
+	 * @since 2.3.0 bbPress (r4509)
 	 *
 	 * @param array $args     Arguments
 	 * @param array $instance Instance
@@ -1005,7 +1005,7 @@ class BBP_Stats_Widget extends WP_Widget {
 	/**
 	 * Update the stats widget options
 	 *
-	 * @since bbPress (r4509)
+	 * @since 2.3.0 bbPress (r4509)
 	 *
 	 * @param array $new_instance The new instance options
 	 * @param array $old_instance The old instance options
@@ -1022,7 +1022,7 @@ class BBP_Stats_Widget extends WP_Widget {
 	/**
 	 * Output the stats widget options form
 	 *
-	 * @since bbPress (r4509)
+	 * @since 2.3.0 bbPress (r4509)
 	 *
 	 * @param $instance
 	 *
@@ -1045,7 +1045,7 @@ class BBP_Stats_Widget extends WP_Widget {
 	/**
 	 * Merge the widget settings into defaults array.
 	 *
-	 * @since bbPress (r4802)
+	 * @since 2.3.0 bbPress (r4802)
 	 *
 	 * @param $instance Instance
 	 * @uses bbp_parse_args() To merge widget settings into defaults
@@ -1063,7 +1063,7 @@ class BBP_Stats_Widget extends WP_Widget {
  *
  * Adds a widget which displays the replies list
  *
- * @since bbPress (r2653)
+ * @since 2.0.0 bbPress (r2653)
  *
  * @uses WP_Widget
  */
@@ -1074,7 +1074,7 @@ class BBP_Replies_Widget extends WP_Widget {
 	 *
 	 * Registers the replies widget
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @uses apply_filters() Calls 'bbp_replies_widget_options' with the
 	 *                        widget options
@@ -1091,7 +1091,7 @@ class BBP_Replies_Widget extends WP_Widget {
 	/**
 	 * Register the widget
 	 *
-	 * @since bbPress (r3389)
+	 * @since 2.0.0 bbPress (r3389)
 	 *
 	 * @uses register_widget()
 	 */
@@ -1102,7 +1102,7 @@ class BBP_Replies_Widget extends WP_Widget {
 	/**
 	 * Displays the output, the replies list
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param array $args
 	 * @param array $instance
@@ -1209,7 +1209,7 @@ class BBP_Replies_Widget extends WP_Widget {
 	/**
 	 * Update the reply widget options
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param array $new_instance The new instance options
 	 * @param array $old_instance The old instance options
@@ -1227,7 +1227,7 @@ class BBP_Replies_Widget extends WP_Widget {
 	/**
 	 * Output the reply widget options form
 	 *
-	 * @since bbPress (r2653)
+	 * @since 2.0.0 bbPress (r2653)
 	 *
 	 * @param $instance Instance
 	 * @uses BBP_Replies_Widget::get_field_id() To output the field id
@@ -1249,7 +1249,7 @@ class BBP_Replies_Widget extends WP_Widget {
 	/**
 	 * Merge the widget settings into defaults array.
 	 *
-	 * @since bbPress (r4802)
+	 * @since 2.3.0 bbPress (r4802)
 	 *
 	 * @param $instance Instance
 	 * @uses bbp_parse_args() To merge widget settings into defaults
diff --git src/includes/core/abstraction.php src/includes/core/abstraction.php
index 4d233fc..4ec2b99 100644
--- src/includes/core/abstraction.php
+++ src/includes/core/abstraction.php
@@ -19,7 +19,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Lookup and return a global variable
  *
- * @since bbPress (r5814)
+ * @since 2.5.8 bbPress (r5814)
  *
  * @param  string  $name     Name of global variable
  * @param  string  $type     Type of variable to check with `is_a()`
@@ -57,7 +57,7 @@ function bbp_get_global_object( $name = '', $type = '', $default = null ) {
  * class. bbPress supports WordPress's `$wpdb` global by default, and can be
  * filtered to support other configurations if needed.
  *
- * @since bbPress (r5814)
+ * @since 2.5.8 bbPress (r5814)
  *
  * @return object
  */
@@ -72,7 +72,7 @@ function bbp_db() {
  * rules class. bbPress supports WordPress's `$wp_rewrite` by default, but can
  * be filtered to support other configurations if needed.
  *
- * @since bbPress (r5814)
+ * @since 2.5.8 bbPress (r5814)
  *
  * @return object
  */
@@ -86,7 +86,7 @@ function bbp_rewrite() {
 /**
  * Get the root URL
  *
- * @since bbPress (r5814)
+ * @since 2.5.8 bbPress (r5814)
  *
  * @return string
  */
@@ -97,7 +97,7 @@ function bbp_get_root_url() {
 /**
  * Get the slug used for paginated requests
  *
- * @since bbPress (r4926)
+ * @since 2.4.0 bbPress (r4926)
  *
  * @return string
  */
@@ -108,7 +108,7 @@ function bbp_get_paged_slug() {
 /**
  * Is the environment using pretty URLs?
  *
- * @since bbPress (r5814)
+ * @since 2.5.8 bbPress (r5814)
  *
  * @global object $wp_rewrite The WP_Rewrite object
  *
diff --git src/includes/core/cache.php src/includes/core/cache.php
index 4734d13..3f4d6c6 100644
--- src/includes/core/cache.php
+++ src/includes/core/cache.php
@@ -25,7 +25,7 @@ defined( 'ABSPATH' ) || exit;
  * child posts whenever a parent post is modified. This can cause thousands of
  * cache invalidations to occur on a single edit, which is no good for anyone.
  *
- * @since bbPress (r4011)
+ * @since 2.1.0 bbPress (r4011)
  *
  * @package bbPress
  * @subpackage Cache
@@ -47,7 +47,7 @@ class BBP_Skip_Children {
 	/**
 	 * Hook into the 'pre_post_update' action.
 	 *
-	 * @since bbPress (r4011)
+	 * @since 2.1.0 bbPress (r4011)
 	 */
 	public function __construct() {
 		add_action( 'pre_post_update', array( $this, 'pre_post_update' ) );
@@ -60,7 +60,7 @@ class BBP_Skip_Children {
 	 * post ID to be used later, and adds an action to 'clean_post_cache' that
 	 * prevents child post caches from being cleared.
 	 *
-	 * @since bbPress (r4011)
+	 * @since 2.1.0 bbPress (r4011)
 	 *
 	 * @param int $post_id The post ID being updated
 	 * @return If invalid post data
@@ -84,7 +84,7 @@ class BBP_Skip_Children {
 	 * Skip cache invalidation of related posts if the post ID being invalidated
 	 * is not the one that was just updated.
 	 *
-	 * @since bbPress (r4011)
+	 * @since 2.1.0 bbPress (r4011)
 	 *
 	 * @param int $post_id The post ID of the cache being invalidated
 	 * @return If invalid post data
@@ -112,7 +112,8 @@ class BBP_Skip_Children {
 	/**
 	 * Restore the cache invalidation to its previous value.
 	 *
-	 * @since bbPress (r4011)
+	 * @since 2.1.0 bbPress (r4011)
+	 *
 	 * @uses wp_suspend_cache_invalidation()
 	 */
 	public function restore_cache_invalidation() {
@@ -128,7 +129,7 @@ new BBP_Skip_Children();
  *
  * Will call to clean the term object cache associated with the post ID.
  *
- * @since bbPress (r4040)
+ * @since 2.1.0 bbPress (r4040)
  *
  * @uses do_action() Calls 'bbp_clean_post_cache' on $id
  * @param object|int $_post The post object or ID to remove from the cache
diff --git src/includes/core/capabilities.php src/includes/core/capabilities.php
index 54e698f..a04e036 100644
--- src/includes/core/capabilities.php
+++ src/includes/core/capabilities.php
@@ -19,7 +19,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Returns an array of capabilities based on the role that is being requested.
  *
- * @since bbPress (r2994)
+ * @since 2.0.0 bbPress (r2994)
  *
  * @todo Map all of these and deprecate
  *
@@ -211,7 +211,7 @@ function bbp_get_caps_for_role( $role = '' ) {
 /**
  * Adds capabilities to WordPress user roles.
  *
- * @since bbPress (r2608)
+ * @since 2.0.0 bbPress (r2608)
  */
 function bbp_add_caps() {
 
@@ -228,7 +228,7 @@ function bbp_add_caps() {
 /**
  * Removes capabilities from WordPress user roles.
  *
- * @since bbPress (r2608)
+ * @since 2.0.0 bbPress (r2608)
  */
 function bbp_remove_caps() {
 
@@ -245,7 +245,7 @@ function bbp_remove_caps() {
 /**
  * Get the `$wp_roles` global without needing to declare it everywhere
  *
- * @since bbPress (r4293)
+ * @since 2.2.0 bbPress (r4293)
  *
  * @return WP_Roles
  */
@@ -265,7 +265,7 @@ function bbp_get_wp_roles() {
 /**
  * Get the available roles minus bbPress's dynamic roles
  *
- * @since bbPress (r5064)
+ * @since 2.4.0 bbPress (r5064)
  *
  * @uses bbp_get_wp_roles() To load and get the $wp_roles global
  * @return array
@@ -292,7 +292,7 @@ function bbp_get_blog_roles() {
  *
  * We do this to avoid adding these values to the database.
  *
- * @since bbPress (r4290)
+ * @since 2.2.0 bbPress (r4290)
  *
  * @uses bbp_get_wp_roles() To load and get the $wp_roles global
  * @uses bbp_get_dynamic_roles() To get and add bbPress's roles to $wp_roles
@@ -313,7 +313,7 @@ function bbp_add_forums_roles() {
 /**
  * Helper function to add filter to option_wp_user_roles
  *
- * @since bbPress (r4363)
+ * @since 2.2.0 bbPress (r4363)
  *
  * @see _bbp_reinit_dynamic_roles()
  */
@@ -339,7 +339,7 @@ function bbp_filter_user_roles_option() {
  * @see restore_current_blog()
  * @see WP_Roles::_init()
  *
- * @since bbPress (r4363)
+ * @since 2.2.0 bbPress (r4363)
  *
  * @internal Used by bbPress to reinitialize dynamic roles on blog switch
  *
@@ -366,7 +366,7 @@ function _bbp_reinit_dynamic_roles( $roles = array() ) {
  * only editors or authors. This filter allows admins to delegate
  * user management.
  *
- * @since bbPress (r4284)
+ * @since 2.2.0 bbPress (r4284)
  *
  * @return array
  */
@@ -408,7 +408,7 @@ function bbp_get_dynamic_roles() {
 /**
  * Gets a translated role name from a role ID
  *
- * @since bbPress (r4792)
+ * @since 2.3.0 bbPress (r4792)
  *
  * @param string $role_id
  * @return string Translated role name
@@ -426,7 +426,7 @@ function bbp_get_dynamic_role_name( $role_id = '' ) {
  * This used to use array_diff_assoc() but it randomly broke before 2.2 release.
  * Need to research what happened, and if there's a way to speed this up.
  *
- * @since bbPress (r4303)
+ * @since 2.2.0 bbPress (r4303)
  *
  * @param array $all_roles All registered roles
  * @return array 
@@ -452,7 +452,7 @@ function bbp_filter_blog_editable_roles( $all_roles = array() ) {
 /**
  * The keymaster role for bbPress users
  *
- * @since bbPress (r4284)
+ * @since 2.2.0 bbPress (r4284)
  *
  * @uses apply_filters() Allow override of hardcoded keymaster role
  * @return string
@@ -464,7 +464,7 @@ function bbp_get_keymaster_role() {
 /**
  * The moderator role for bbPress users
  *
- * @since bbPress (r3410)
+ * @since 2.0.0 bbPress (r3410)
  *
  * @uses apply_filters() Allow override of hardcoded moderator role
  * @return string
@@ -476,7 +476,7 @@ function bbp_get_moderator_role() {
 /**
  * The participant role for registered user that can participate in forums
  *
- * @since bbPress (r3410)
+ * @since 2.0.0 bbPress (r3410)
  *
  * @uses apply_filters() Allow override of hardcoded participant role
  * @return string
@@ -488,7 +488,7 @@ function bbp_get_participant_role() {
 /**
  * The spectator role is for registered users without any capabilities
  *
- * @since bbPress (r3860)
+ * @since 2.1.0 bbPress (r3860)
  *
  * @uses apply_filters() Allow override of hardcoded spectator role
  * @return string
@@ -500,7 +500,7 @@ function bbp_get_spectator_role() {
 /**
  * The blocked role is for registered users that cannot spectate or participate
  *
- * @since bbPress (r4284)
+ * @since 2.2.0 bbPress (r4284)
  *
  * @uses apply_filters() Allow override of hardcoded blocked role
  * @return string
@@ -512,8 +512,9 @@ function bbp_get_blocked_role() {
 /**
  * Adds bbPress-specific user roles.
  *
- * @since bbPress (r2741)
- * @deprecated since version 2.2
+ * @since 2.0.0 bbPress (r2741)
+ *
+ * @deprecated 2.2.0 bbPress (r4164)
  */
 function bbp_add_roles() {
 	_doing_it_wrong( 'bbp_add_roles', __( 'Editable forum roles no longer exist.', 'bbpress' ), '2.2' );
@@ -528,7 +529,7 @@ function bbp_add_roles() {
  * @see bbp_do_uninstall()
  * @see bbp_version_updater()
  *
- * @since bbPress (r2741)
+ * @since 2.0.0 bbPress (r2741)
  */
 function bbp_remove_roles() {
 
diff --git src/includes/core/extend.php src/includes/core/extend.php
index f19d0b1..bf94800 100644
--- src/includes/core/extend.php
+++ src/includes/core/extend.php
@@ -16,7 +16,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Loads Akismet inside the bbPress global class
  *
- * @since bbPress (r3277)
+ * @since 2.0.0 bbPress (r3277)
  *
  * @return If bbPress is not active
  */
@@ -43,7 +43,8 @@ function bbp_setup_akismet() {
  * Requires and creates the BuddyPress extension, and adds component creation
  * action to bp_init hook. @see bbp_setup_buddypress_component()
  *
- * @since bbPress (r3395)
+ * @since 2.0.0 bbPress (r3395)
+ *
  * @return If BuddyPress is not active
  */
 function bbp_setup_buddypress() {
@@ -53,7 +54,8 @@ function bbp_setup_buddypress() {
 		/**
 		 * Helper for BuddyPress 1.6 and earlier
 		 *
-		 * @since bbPress (r4395)
+		 * @since 2.2.0 bbPress (r4395)
+		 *
 		 * @return BuddyPress
 		 */
 		function buddypress() {
diff --git src/includes/core/filters.php src/includes/core/filters.php
index 28b2dcd..1289968 100644
--- src/includes/core/filters.php
+++ src/includes/core/filters.php
@@ -273,7 +273,7 @@ add_filter( 'bbp_map_meta_caps', 'bbp_map_reply_meta_caps',     10, 4 ); // Repl
 /**
  * Deprecated locale filter
  *
- * @since bbPress (r4213)
+ * @since 2.2.0 bbPress (r4213)
  *
  * @param string $locale
  * @return string  $domain
@@ -292,7 +292,8 @@ add_filter( 'bbp_plugin_locale', '_bbp_filter_locale', 10, 1 );
 /**
  * Deprecated forums query filter
  *
- * @since bbPress (r3961)
+ * @since 2.1.0 bbPress (r3961)
+ *
  * @param array $args
  * @return array
  */
@@ -304,7 +305,8 @@ add_filter( 'bbp_after_has_forums_parse_args', '_bbp_has_forums_query' );
 /**
  * Deprecated topics query filter
  *
- * @since bbPress (r3961)
+ * @since 2.1.0 bbPress (r3961)
+ *
  * @param array $args
  * @return array
  */
@@ -316,7 +318,8 @@ add_filter( 'bbp_after_has_topics_parse_args', '_bbp_has_topics_query' );
 /**
  * Deprecated replies query filter
  *
- * @since bbPress (r3961)
+ * @since 2.1.0 bbPress (r3961)
+ *
  * @param array $args
  * @return array
  */
diff --git src/includes/core/functions.php src/includes/core/functions.php
index b871317..585a9fa 100644
--- src/includes/core/functions.php
+++ src/includes/core/functions.php
@@ -15,7 +15,8 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Output the bbPress version
  *
- * @since bbPress (r3468)
+ * @since 2.0.0 bbPress (r3468)
+ *
  * @uses bbp_get_version() To get the bbPress version
  */
 function bbp_version() {
@@ -24,7 +25,8 @@ function bbp_version() {
 	/**
 	 * Return the bbPress version
 	 *
-	 * @since bbPress (r3468)
+	 * @since 2.0.0 bbPress (r3468)
+	 *
 	 * @retrun string The bbPress version
 	 */
 	function bbp_get_version() {
@@ -34,7 +36,8 @@ function bbp_version() {
 /**
  * Output the bbPress database version
  *
- * @since bbPress (r3468)
+ * @since 2.0.0 bbPress (r3468)
+ *
  * @uses bbp_get_version() To get the bbPress version
  */
 function bbp_db_version() {
@@ -43,7 +46,8 @@ function bbp_db_version() {
 	/**
 	 * Return the bbPress database version
 	 *
-	 * @since bbPress (r3468)
+	 * @since 2.0.0 bbPress (r3468)
+	 *
 	 * @retrun string The bbPress version
 	 */
 	function bbp_get_db_version() {
@@ -53,7 +57,8 @@ function bbp_db_version() {
 /**
  * Output the bbPress database version directly from the database
  *
- * @since bbPress (r3468)
+ * @since 2.0.0 bbPress (r3468)
+ *
  * @uses bbp_get_version() To get the current bbPress version
  */
 function bbp_db_version_raw() {
@@ -62,7 +67,8 @@ function bbp_db_version_raw() {
 	/**
 	 * Return the bbPress database version directly from the database
 	 *
-	 * @since bbPress (r3468)
+	 * @since 2.0.0 bbPress (r3468)
+	 *
 	 * @retrun string The current bbPress version
 	 */
 	function bbp_get_db_version_raw() {
@@ -74,7 +80,7 @@ function bbp_db_version_raw() {
 /**
  * Update a posts' forum meta ID
  *
- * @since bbPress (r3181)
+ * @since 2.0.0 bbPress (r3181)
  *
  * @param int $post_id  The post to update
  * @param int $forum_id The forum
@@ -93,7 +99,7 @@ function bbp_update_forum_id( $post_id, $forum_id ) {
 /**
  * Update a posts' topic meta ID
  *
- * @since bbPress (r3181)
+ * @since 2.0.0 bbPress (r3181)
  *
  * @param int $post_id  The post to update
  * @param int $topic_id The topic
@@ -112,7 +118,7 @@ function bbp_update_topic_id( $post_id, $topic_id ) {
 /**
  * Update a posts' reply meta ID
  *
- * @since bbPress (r3181)
+ * @since 2.0.0 bbPress (r3181)
  *
  * @param int $post_id  The post to update
  * @param int $reply_id The reply
@@ -131,7 +137,7 @@ function bbp_update_reply_id( $post_id, $reply_id ) {
 /**
  * Update a posts' reply-to meta ID
  *
- * @since bbPress (r5735)
+ * @since 2.6.0 bbPress (r5735)
  *
  * @param int $post_id  The post to update
  * @param int $reply_id The reply ID
@@ -154,7 +160,7 @@ function bbp_update_reply_to_id( $post_id, $reply_id ) {
  *
  * Does nothing much other than return the {@link $bbp->views} variable
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @return array Views
  */
@@ -165,7 +171,7 @@ function bbp_get_views() {
 /**
  * Register a bbPress view
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @param string $view View name
  * @param string $title View title
@@ -211,7 +217,7 @@ function bbp_register_view( $view, $title, $query_args = '', $feed = true, $capa
 /**
  * Deregister a bbPress view
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @param string $view View name
  * @uses sanitize_title() To sanitize the view name
@@ -233,7 +239,7 @@ function bbp_deregister_view( $view ) {
 /**
  * Run the view's query
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @param string $view Optional. View id
  * @param mixed $new_args New arguments. See {@link bbp_has_topics()}
@@ -263,7 +269,7 @@ function bbp_view_query( $view = '', $new_args = '' ) {
 /**
  * Return the view's query arguments
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
  *
  * @param string $view View name
  * @uses bbp_get_view_id() To get the view id
@@ -283,7 +289,7 @@ function bbp_get_view_query_args( $view ) {
 /**
  * Adds an error message to later be output in the theme
  *
- * @since bbPress (r3381)
+ * @since 2.0.0 bbPress (r3381)
  *
  * @see WP_Error()
  * @uses WP_Error::add();
@@ -299,7 +305,7 @@ function bbp_add_error( $code = '', $message = '', $data = '' ) {
 /**
  * Check if error messages exist in queue
  *
- * @since bbPress (r3381)
+ * @since 2.0.0 bbPress (r3381)
  *
  * @see WP_Error()
  *
@@ -320,7 +326,8 @@ function bbp_has_errors() {
  * Moved into its own function to allow filtering of the regex pattern
  * anywhere mentions might be used.
  *
- * @since bbPress (r4997)
+ * @since 2.4.0 bbPress (r4997)
+ *
  * @return string Pattern to match usernames with
  */
 function bbp_find_mentions_pattern() {
@@ -330,7 +337,7 @@ function bbp_find_mentions_pattern() {
 /**
  * Searches through the content to locate usernames, designated by an @ sign.
  *
- * @since bbPress (r4323)
+ * @since 2.2.0 bbPress (r4323)
  *
  * @param string $content The content
  * @return bool|array $usernames Existing usernames. False if no matches.
@@ -351,7 +358,7 @@ function bbp_find_mentions( $content = '' ) {
 /**
  * Finds and links @-mentioned users in the content
  *
- * @since bbPress (r4323)
+ * @since 2.2.0 bbPress (r4323)
  *
  * @uses bbp_find_mentions() To get usernames in content areas
  * @return string $content Content filtered for mentions
@@ -386,7 +393,7 @@ function bbp_mention_filter( $content = '' ) {
 /**
  * Return the public post status ID
  *
- * @since bbPress (r3504)
+ * @since 2.0.0 bbPress (r3504)
  *
  * @return string
  */
@@ -397,7 +404,7 @@ function bbp_get_public_status_id() {
 /**
  * Return the pending post status ID
  *
- * @since bbPress (r3581)
+ * @since 2.1.0 bbPress (r3581)
  *
  * @return string
  */
@@ -408,7 +415,7 @@ function bbp_get_pending_status_id() {
 /**
  * Return the private post status ID
  *
- * @since bbPress (r3504)
+ * @since 2.0.0 bbPress (r3504)
  *
  * @return string
  */
@@ -419,7 +426,7 @@ function bbp_get_private_status_id() {
 /**
  * Return the hidden post status ID
  *
- * @since bbPress (r3504)
+ * @since 2.0.0 bbPress (r3504)
  *
  * @return string
  */
@@ -430,7 +437,7 @@ function bbp_get_hidden_status_id() {
 /**
  * Return the closed post status ID
  *
- * @since bbPress (r3504)
+ * @since 2.0.0 bbPress (r3504)
  *
  * @return string
  */
@@ -441,7 +448,7 @@ function bbp_get_closed_status_id() {
 /**
  * Return the spam post status ID
  *
- * @since bbPress (r3504)
+ * @since 2.0.0 bbPress (r3504)
  *
  * @return string
  */
@@ -452,7 +459,7 @@ function bbp_get_spam_status_id() {
 /**
  * Return the trash post status ID
  *
- * @since bbPress (r3504)
+ * @since 2.0.0 bbPress (r3504)
  *
  * @return string
  */
@@ -463,7 +470,7 @@ function bbp_get_trash_status_id() {
 /**
  * Return the orphan post status ID
  *
- * @since bbPress (r3504)
+ * @since 2.0.0 bbPress (r3504)
  *
  * @return string
  */
@@ -476,7 +483,8 @@ function bbp_get_orphan_status_id() {
 /**
  * Return the unique ID for user profile rewrite rules
  *
- * @since bbPress (r3762)
+ * @since 2.1.0 bbPress (r3762)
+ *
  * @return string
  */
 function bbp_get_user_rewrite_id() {
@@ -486,7 +494,8 @@ function bbp_get_user_rewrite_id() {
 /**
  * Return the unique ID for all edit rewrite rules (forum|topic|reply|tag|user)
  *
- * @since bbPress (r3762)
+ * @since 2.1.0 bbPress (r3762)
+ *
  * @return string
  */
 function bbp_get_edit_rewrite_id() {
@@ -496,7 +505,7 @@ function bbp_get_edit_rewrite_id() {
 /**
  * Return the unique ID for all search rewrite rules
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @return string
  */
@@ -507,7 +516,8 @@ function bbp_get_search_rewrite_id() {
 /**
  * Return the unique ID for user topics rewrite rules
  *
- * @since bbPress (r4321)
+ * @since 2.2.0 bbPress (r4321)
+ *
  * @return string
  */
 function bbp_get_user_topics_rewrite_id() {
@@ -517,7 +527,8 @@ function bbp_get_user_topics_rewrite_id() {
 /**
  * Return the unique ID for user replies rewrite rules
  *
- * @since bbPress (r4321)
+ * @since 2.2.0 bbPress (r4321)
+ *
  * @return string
  */
 function bbp_get_user_replies_rewrite_id() {
@@ -527,7 +538,8 @@ function bbp_get_user_replies_rewrite_id() {
 /**
  * Return the unique ID for user caps rewrite rules
  *
- * @since bbPress (r4181)
+ * @since 2.2.0 bbPress (r4181)
+ *
  * @return string
  */
 function bbp_get_user_favorites_rewrite_id() {
@@ -537,7 +549,8 @@ function bbp_get_user_favorites_rewrite_id() {
 /**
  * Return the unique ID for user caps rewrite rules
  *
- * @since bbPress (r4181)
+ * @since 2.2.0 bbPress (r4181)
+ *
  * @return string
  */
 function bbp_get_user_subscriptions_rewrite_id() {
@@ -547,7 +560,8 @@ function bbp_get_user_subscriptions_rewrite_id() {
 /**
  * Return the unique ID for topic view rewrite rules
  *
- * @since bbPress (r3762)
+ * @since 2.1.0 bbPress (r3762)
+ *
  * @return string
  */
 function bbp_get_view_rewrite_id() {
@@ -559,7 +573,8 @@ function bbp_get_view_rewrite_id() {
 /**
  * Get the id used for paginated requests
  *
- * @since bbPress (r4926)
+ * @since 2.4.0 bbPress (r4926)
+ *
  * @return string
  */
 function bbp_get_paged_rewrite_id() {
@@ -570,7 +585,7 @@ function bbp_get_paged_rewrite_id() {
  * Delete a blogs rewrite rules, so that they are automatically rebuilt on
  * the subsequent page load.
  *
- * @since bbPress (r4198)
+ * @since 2.2.0 bbPress (r4198)
  */
 function bbp_delete_rewrite_rules() {
 	delete_option( 'rewrite_rules' );
@@ -581,7 +596,8 @@ function bbp_delete_rewrite_rules() {
 /**
  * Return true|false if this is a POST request
  *
- * @since bbPress (r4790)
+ * @since 2.3.0 bbPress (r4790)
+ *
  * @return bool
  */
 function bbp_is_post_request() {
@@ -591,7 +607,8 @@ function bbp_is_post_request() {
 /**
  * Return true|false if this is a GET request
  *
- * @since bbPress (r4790)
+ * @since 2.3.0 bbPress (r4790)
+ *
  * @return bool
  */
 function bbp_is_get_request() {
@@ -608,7 +625,7 @@ function bbp_is_get_request() {
  * is empty, we can safely redirect back to the forum root. This might change
  * in a future version, possibly to the site root.
  *
- * @since bbPress (r5658)
+ * @since 2.6.0 bbPress (r5658)
  *
  * @uses wp_safe_redirect()
  * @uses bbp_get_forums_url()
diff --git src/includes/core/options.php src/includes/core/options.php
index 9cb9a0c..01c6562 100644
--- src/includes/core/options.php
+++ src/includes/core/options.php
@@ -15,7 +15,8 @@ defined( 'ABSPATH' ) || exit;
  *
  * These option
  *
- * @since bbPress (r3421)
+ * @since 2.0.0 bbPress (r3421)
+ *
  * @return array Filtered option names and values
  */
 function bbp_get_default_options() {
@@ -117,7 +118,8 @@ function bbp_get_default_options() {
  * Hooked to bbp_activate, it is only called once when bbPress is activated.
  * This is non-destructive, so existing settings will not be overridden.
  *
- * @since bbPress (r3421)
+ * @since 2.0.0 bbPress (r3421)
+ *
  * @uses bbp_get_default_options() To get default options
  * @uses add_option() Adds default options
  * @uses do_action() Calls 'bbp_add_options'
@@ -139,7 +141,8 @@ function bbp_add_options() {
  * Hooked to bbp_uninstall, it is only called once when bbPress is uninstalled.
  * This is destructive, so existing settings will be destroyed.
  *
- * @since bbPress (r3421)
+ * @since 2.0.0 bbPress (r3421)
+ *
  * @uses bbp_get_default_options() To get default options
  * @uses delete_option() Removes default options
  * @uses do_action() Calls 'bbp_delete_options'
@@ -159,7 +162,8 @@ function bbp_delete_options() {
  * Add filters to each bbPress option and allow them to be overloaded from
  * inside the $bbp->options array.
  *
- * @since bbPress (r3451)
+ * @since 2.0.0 bbPress (r3451)
+ *
  * @uses bbp_get_default_options() To get default options
  * @uses add_filter() To add filters to 'pre_option_{$key}'
  * @uses do_action() Calls 'bbp_add_option_filters'
@@ -179,7 +183,8 @@ function bbp_setup_option_filters() {
  * Filter default options and allow them to be overloaded from inside the
  * $bbp->options array.
  *
- * @since bbPress (r3451)
+ * @since 2.0.0 bbPress (r3451)
+ *
  * @param bool $value Optional. Default value false
  * @return mixed false if not overloaded, mixed if set
  */
@@ -202,7 +207,8 @@ function bbp_pre_get_option( $value = '' ) {
 /**
  * Checks if favorites feature is enabled.
  *
- * @since bbPress (r2658)
+ * @since 2.0.0 bbPress (r2658)
+ *
  * @param $default bool Optional.Default value true
  * @uses get_option() To get the favorites option
  * @return bool Is favorites enabled or not
@@ -214,7 +220,8 @@ function bbp_is_favorites_active( $default = 1 ) {
 /**
  * Checks if subscription feature is enabled.
  *
- * @since bbPress (r2658)
+ * @since 2.0.0 bbPress (r2658)
+ *
  * @param $default bool Optional.Default value true
  * @uses get_option() To get the subscriptions option
  * @return bool Is subscription enabled or not
@@ -226,7 +233,8 @@ function bbp_is_subscriptions_active( $default = 1 ) {
 /**
  * Are topic tags allowed
  *
- * @since bbPress (r4097)
+ * @since 2.2.0 bbPress (r4097)
+ *
  * @param $default bool Optional. Default value true
  * @uses get_option() To get the allow tags
  * @return bool Are tags allowed?
@@ -238,7 +246,7 @@ function bbp_allow_topic_tags( $default = 1 ) {
 /**
  * Are per-forum moderators allowed
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @param bool $default Optional. Default value true.
  * @uses get_option() To get the allow per-forum moderators
@@ -252,7 +260,8 @@ function bbp_allow_forum_mods( $default = 1 ) {
 /**
  * Is forum-wide searching allowed
  *
- * @since bbPress (r4970)
+ * @since 2.4.0 bbPress (r4970)
+ *
  * @param $default bool Optional. Default value true
  * @uses get_option() To get the forum-wide search setting
  * @return bool Is forum-wide searching allowed?
@@ -264,7 +273,7 @@ function bbp_allow_search( $default = 1 ) {
 /**
  * Are replies threaded
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @param bool $default Optional. Default value true
  * @uses apply_filters() Calls 'bbp_thread_replies' with the calculated value and
@@ -283,7 +292,8 @@ function bbp_thread_replies() {
 /**
  * Are threaded replies allowed
  *
- * @since bbPress (r4964)
+ * @since 2.4.0 bbPress (r4964)
+ *
  * @param $default bool Optional. Default value false
  * @uses get_option() To get the threaded replies setting
  * @return bool Are threaded replies allowed?
@@ -295,7 +305,7 @@ function bbp_allow_threaded_replies( $default = 0 ) {
 /**
  * Maximum reply thread depth
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @param int $default Thread replies depth
  * @uses apply_filters() Calls 'bbp_thread_replies_depth' with the option value and
@@ -310,7 +320,8 @@ function bbp_thread_replies_depth( $default = 2 ) {
 /**
  * Are topic and reply revisions allowed
  *
- * @since bbPress (r3412)
+ * @since 2.0.0 bbPress (r3412)
+ *
  * @param $default bool Optional. Default value true
  * @uses get_option() To get the allow revisions
  * @return bool Are revisions allowed?
@@ -322,7 +333,8 @@ function bbp_allow_revisions( $default = 1 ) {
 /**
  * Is the anonymous posting allowed?
  *
- * @since bbPress (r2659)
+ * @since 2.0.0 bbPress (r2659)
+ *
  * @param $default bool Optional. Default value
  * @uses get_option() To get the allow anonymous option
  * @return bool Is anonymous posting allowed?
@@ -334,7 +346,8 @@ function bbp_allow_anonymous( $default = 0 ) {
 /**
  * Is this forum available to all users on all sites in this installation?
  *
- * @since bbPress (r3378)
+ * @since 2.0.0 bbPress (r3378)
+ *
  * @param $default bool Optional. Default value false
  * @uses get_option() To get the global access option
  * @return bool Is global access allowed?
@@ -346,7 +359,8 @@ function bbp_allow_global_access( $default = 1 ) {
 /**
  * Is this forum available to all users on all sites in this installation?
  *
- * @since bbPress (r4294)
+ * @since 2.2.0 bbPress (r4294)
+ *
  * @param $default string Optional. Default value empty
  * @uses get_option() To get the default forums role option
  * @return string The default forums user role
@@ -358,7 +372,8 @@ function bbp_get_default_role( $default = 'bbp_participant' ) {
 /**
  * Use the WordPress editor if available
  *
- * @since bbPress (r3386)
+ * @since 2.0.0 bbPress (r3386)
+ *
  * @param $default bool Optional. Default value true
  * @uses get_option() To get the WP editor option
  * @return bool Use WP editor?
@@ -370,7 +385,8 @@ function bbp_use_wp_editor( $default = 1 ) {
 /**
  * Use WordPress's oEmbed API
  *
- * @since bbPress (r3752)
+ * @since 2.1.0 bbPress (r3752)
+ *
  * @param $default bool Optional. Default value true
  * @uses get_option() To get the oEmbed option
  * @return bool Use oEmbed?
@@ -382,7 +398,8 @@ function bbp_use_autoembed( $default = 1 ) {
 /**
  * Get the current theme package ID
  *
- * @since bbPress (r3829)
+ * @since 2.1.0 bbPress (r3829)
+ *
  * @param $default string Optional. Default value 'default'
  * @uses get_option() To get the subtheme option
  * @return string ID of the subtheme
@@ -394,7 +411,8 @@ function bbp_get_theme_package_id( $default = 'default' ) {
 /**
  * Output the maximum length of a title
  *
- * @since bbPress (r3246)
+ * @since 2.0.0 bbPress (r3246)
+ *
  * @param $default bool Optional. Default value 80
  */
 function bbp_title_max_length( $default = 80 ) {
@@ -403,7 +421,8 @@ function bbp_title_max_length( $default = 80 ) {
 	/**
 	 * Return the maximum length of a title
 	 *
-	 * @since bbPress (r3246)
+	 * @since 2.0.0 bbPress (r3246)
+	 *
 	 * @param $default bool Optional. Default value 80
 	 * @uses get_option() To get the maximum title length
 	 * @return int Is anonymous posting allowed?
@@ -415,7 +434,8 @@ function bbp_title_max_length( $default = 80 ) {
 /**
  * Output the grop forums root parent forum id
  *
- * @since bbPress (r3575)
+ * @since 2.1.0 bbPress (r3575)
+ *
  * @param $default int Optional. Default value
  */
 function bbp_group_forums_root_id( $default = 0 ) {
@@ -424,7 +444,8 @@ function bbp_group_forums_root_id( $default = 0 ) {
 	/**
 	 * Return the grop forums root parent forum id
 	 *
-	 * @since bbPress (r3575)
+	 * @since 2.1.0 bbPress (r3575)
+	 *
 	 * @param $default bool Optional. Default value 0
 	 * @uses get_option() To get the root group forum ID
 	 * @return int The post ID for the root forum
@@ -436,7 +457,8 @@ function bbp_group_forums_root_id( $default = 0 ) {
 /**
  * Checks if BuddyPress Group Forums are enabled
  *
- * @since bbPress (r3575)
+ * @since 2.1.0 bbPress (r3575)
+ *
  * @param $default bool Optional. Default value true
  * @uses get_option() To get the group forums option
  * @return bool Is group forums enabled or not
@@ -448,7 +470,8 @@ function bbp_is_group_forums_active( $default = 1 ) {
 /**
  * Checks if Akismet is enabled
  *
- * @since bbPress (r3575)
+ * @since 2.1.0 bbPress (r3575)
+ *
  * @param $default bool Optional. Default value true
  * @uses get_option() To get the Akismet option
  * @return bool Is Akismet enabled or not
@@ -460,7 +483,8 @@ function bbp_is_akismet_active( $default = 1 ) {
 /**
  * Integrate settings into existing WordPress pages
  *
- * @since bbPress (r4932)
+ * @since 2.4.0 bbPress (r4932)
+ *
  * @param $default bool Optional. Default value false
  * @uses get_option() To get the admin integration setting
  * @return bool To deeply integrate settings, or not
@@ -474,7 +498,8 @@ function bbp_settings_integration( $default = 0 ) {
 /**
  * Return the root slug
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_get_root_slug( $default = 'forums' ) {
@@ -484,7 +509,8 @@ function bbp_get_root_slug( $default = 'forums' ) {
 /**
  * Are we including the root slug in front of forum pages?
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return bool
  */
 function bbp_include_root_slug( $default = 1 ) {
@@ -494,7 +520,7 @@ function bbp_include_root_slug( $default = 1 ) {
 /**
  * Return the search slug
  *
- * @since bbPress (r4932)
+ * @since 2.4.0 bbPress (r4932)
  *
  * @return string
  */
@@ -505,7 +531,8 @@ function bbp_show_on_root( $default = 'forums' ) {
 /**
  * Maybe return the root slug, based on whether or not it's included in the url
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_maybe_get_root_slug() {
@@ -521,7 +548,8 @@ function bbp_maybe_get_root_slug() {
 /**
  * Return the single forum slug
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_get_forum_slug( $default = 'forum' ) {
@@ -531,7 +559,8 @@ function bbp_get_forum_slug( $default = 'forum' ) {
 /**
  * Return the topic archive slug
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_get_topic_archive_slug( $default = 'topics' ) {
@@ -541,7 +570,8 @@ function bbp_get_topic_archive_slug( $default = 'topics' ) {
 /**
  * Return the reply archive slug
  *
- * @since bbPress (r4925)
+ * @since 2.4.0 bbPress (r4925)
+ *
  * @return string
  */
 function bbp_get_reply_archive_slug( $default = 'replies' ) {
@@ -551,7 +581,8 @@ function bbp_get_reply_archive_slug( $default = 'replies' ) {
 /**
  * Return the single topic slug
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_get_topic_slug( $default = 'topic' ) {
@@ -561,7 +592,8 @@ function bbp_get_topic_slug( $default = 'topic' ) {
 /**
  * Return the topic-tag taxonomy slug
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_get_topic_tag_tax_slug( $default = 'topic-tag' ) {
@@ -571,7 +603,8 @@ function bbp_get_topic_tag_tax_slug( $default = 'topic-tag' ) {
 /**
  * Return the single reply slug (used mostly for editing)
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_get_reply_slug( $default = 'reply' ) {
@@ -581,7 +614,8 @@ function bbp_get_reply_slug( $default = 'reply' ) {
 /**
  * Return the single user slug
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_get_user_slug( $default = 'user' ) {
@@ -591,7 +625,8 @@ function bbp_get_user_slug( $default = 'user' ) {
 /**
  * Return the single user favorites slug
  *
- * @since bbPress (r4187)
+ * @since 2.2.0 bbPress (r4187)
+ *
  * @return string
  */
 function bbp_get_user_favorites_slug( $default = 'favorites' ) {
@@ -601,7 +636,8 @@ function bbp_get_user_favorites_slug( $default = 'favorites' ) {
 /**
  * Return the single user subscriptions slug
  *
- * @since bbPress (r4187)
+ * @since 2.2.0 bbPress (r4187)
+ *
  * @return string
  */
 function bbp_get_user_subscriptions_slug( $default = 'subscriptions' ) {
@@ -611,7 +647,8 @@ function bbp_get_user_subscriptions_slug( $default = 'subscriptions' ) {
 /**
  * Return the topic view slug
  *
- * @since bbPress (r3759)
+ * @since 2.1.0 bbPress (r3759)
+ *
  * @return string
  */
 function bbp_get_view_slug( $default = 'view' ) {
@@ -621,7 +658,7 @@ function bbp_get_view_slug( $default = 'view' ) {
 /**
  * Return the search slug
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @return string
  */
@@ -634,7 +671,8 @@ function bbp_get_search_slug( $default = 'search' ) {
 /**
  * Checks if there is a previous BuddyPress Forum configuration
  *
- * @since bbPress (r3790)
+ * @since 2.1.0 bbPress (r3790)
+ *
  * @param $default string Optional. Default empty string
  * @uses get_option() To get the old bb-config.php location
  * @return string The location of the bb-config.php file, if any
diff --git src/includes/core/sub-actions.php src/includes/core/sub-actions.php
index f87bdb5..a50d70a 100644
--- src/includes/core/sub-actions.php
+++ src/includes/core/sub-actions.php
@@ -25,7 +25,8 @@
 /**
  * Runs on bbPress activation
  *
- * @since bbPress (r2509)
+ * @since 2.0.0 bbPress (r2509)
+ *
  * @uses register_uninstall_hook() To register our own uninstall hook
  * @uses do_action() Calls 'bbp_activation' hook
  */
@@ -36,7 +37,8 @@ function bbp_activation() {
 /**
  * Runs on bbPress deactivation
  *
- * @since bbPress (r2509)
+ * @since 2.0.0 bbPress (r2509)
+ *
  * @uses do_action() Calls 'bbp_deactivation' hook
  */
 function bbp_deactivation() {
@@ -46,7 +48,8 @@ function bbp_deactivation() {
 /**
  * Runs when uninstalling bbPress
  *
- * @since bbPress (r2509)
+ * @since 2.0.0 bbPress (r2509)
+ *
  * @uses do_action() Calls 'bbp_uninstall' hook
  */
 function bbp_uninstall() {
@@ -58,7 +61,8 @@ function bbp_uninstall() {
 /**
  * Main action responsible for constants, globals, and includes
  *
- * @since bbPress (r2599)
+ * @since 2.0.0 bbPress (r2599)
+ *
  * @uses do_action() Calls 'bbp_loaded'
  */
 function bbp_loaded() {
@@ -68,7 +72,8 @@ function bbp_loaded() {
 /**
  * Setup constants
  *
- * @since bbPress (r2599)
+ * @since 2.0.0 bbPress (r2599)
+ *
  * @uses do_action() Calls 'bbp_constants'
  */
 function bbp_constants() {
@@ -78,7 +83,8 @@ function bbp_constants() {
 /**
  * Setup globals BEFORE includes
  *
- * @since bbPress (r2599)
+ * @since 2.0.0 bbPress (r2599)
+ *
  * @uses do_action() Calls 'bbp_boot_strap_globals'
  */
 function bbp_boot_strap_globals() {
@@ -88,7 +94,8 @@ function bbp_boot_strap_globals() {
 /**
  * Include files
  *
- * @since bbPress (r2599)
+ * @since 2.0.0 bbPress (r2599)
+ *
  * @uses do_action() Calls 'bbp_includes'
  */
 function bbp_includes() {
@@ -98,7 +105,8 @@ function bbp_includes() {
 /**
  * Setup globals AFTER includes
  *
- * @since bbPress (r2599)
+ * @since 2.0.0 bbPress (r2599)
+ *
  * @uses do_action() Calls 'bbp_setup_globals'
  */
 function bbp_setup_globals() {
@@ -108,7 +116,8 @@ function bbp_setup_globals() {
 /**
  * Register any objects before anything is initialized
  *
- * @since bbPress (r4180)
+ * @since 2.2.0 bbPress (r4180)
+ *
  * @uses do_action() Calls 'bbp_register'
  */
 function bbp_register() {
@@ -118,7 +127,8 @@ function bbp_register() {
 /**
  * Initialize any code after everything has been loaded
  *
- * @since bbPress (r2599)
+ * @since 2.0.0 bbPress (r2599)
+ *
  * @uses do_action() Calls 'bbp_init'
  */
 function bbp_init() {
@@ -128,7 +138,8 @@ function bbp_init() {
 /**
  * Initialize widgets
  *
- * @since bbPress (r3389)
+ * @since 2.0.0 bbPress (r3389)
+ *
  * @uses do_action() Calls 'bbp_widgets_init'
  */
 function bbp_widgets_init() {
@@ -143,7 +154,8 @@ function bbp_widgets_init() {
  * @link https://bbpress.trac.wordpress.org/ticket/2309
  * @link https://core.trac.wordpress.org/ticket/24169
  *
- * @since bbPress (r2695)
+ * @since 2.0.0 bbPress (r2695)
+ *
  * @uses did_action() To make sure the user isn't loaded out of order
  * @uses do_action() Calls 'bbp_setup_current_user'
  */
@@ -163,7 +175,8 @@ function bbp_setup_current_user() {
 /**
  * Load translations for current language
  *
- * @since bbPress (r2599)
+ * @since 2.0.0 bbPress (r2599)
+ *
  * @uses do_action() Calls 'bbp_load_textdomain'
  */
 function bbp_load_textdomain() {
@@ -173,7 +186,8 @@ function bbp_load_textdomain() {
 /**
  * Setup the post types
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
+ *
  * @uses do_action() Calls 'bbp_register_post_type'
  */
 function bbp_register_post_types() {
@@ -183,7 +197,8 @@ function bbp_register_post_types() {
 /**
  * Setup the post statuses
  *
- * @since bbPress (r2727)
+ * @since 2.0.0 bbPress (r2727)
+ *
  * @uses do_action() Calls 'bbp_register_post_statuses'
  */
 function bbp_register_post_statuses() {
@@ -193,7 +208,8 @@ function bbp_register_post_statuses() {
 /**
  * Register the built in bbPress taxonomies
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
+ *
  * @uses do_action() Calls 'bbp_register_taxonomies'
  */
 function bbp_register_taxonomies() {
@@ -203,7 +219,8 @@ function bbp_register_taxonomies() {
 /**
  * Register the default bbPress views
  *
- * @since bbPress (r2789)
+ * @since 2.0.0 bbPress (r2789)
+ *
  * @uses do_action() Calls 'bbp_register_views'
  */
 function bbp_register_views() {
@@ -213,7 +230,8 @@ function bbp_register_views() {
 /**
  * Register the default bbPress shortcodes
  *
- * @since bbPress (r4211)
+ * @since 2.2.0 bbPress (r4211)
+ *
  * @uses do_action() Calls 'bbp_register_shortcodes'
  */
 function bbp_register_shortcodes() {
@@ -223,7 +241,8 @@ function bbp_register_shortcodes() {
 /**
  * Enqueue bbPress specific CSS and JS
  *
- * @since bbPress (r3373)
+ * @since 2.0.0 bbPress (r3373)
+ *
  * @uses do_action() Calls 'bbp_enqueue_scripts'
  */
 function bbp_enqueue_scripts() {
@@ -233,7 +252,8 @@ function bbp_enqueue_scripts() {
 /**
  * Add the bbPress-specific rewrite tags
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
+ *
  * @uses do_action() Calls 'bbp_add_rewrite_tags'
  */
 function bbp_add_rewrite_tags() {
@@ -243,7 +263,8 @@ function bbp_add_rewrite_tags() {
 /**
  * Add the bbPress-specific rewrite rules
  *
- * @since bbPress (r4918)
+ * @since 2.4.0 bbPress (r4918)
+ *
  * @uses do_action() Calls 'bbp_add_rewrite_rules'
  */
 function bbp_add_rewrite_rules() {
@@ -253,7 +274,8 @@ function bbp_add_rewrite_rules() {
 /**
  * Add the bbPress-specific permalink structures
  *
- * @since bbPress (r4918)
+ * @since 2.4.0 bbPress (r4918)
+ *
  * @uses do_action() Calls 'bbp_add_permastructs'
  */
 function bbp_add_permastructs() {
@@ -263,7 +285,8 @@ function bbp_add_permastructs() {
 /**
  * Add the bbPress-specific login forum action
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
+ *
  * @uses do_action() Calls 'bbp_login_form_login'
  */
 function bbp_login_form_login() {
@@ -275,7 +298,7 @@ function bbp_login_form_login() {
 /**
  * The main action for hooking into when a user account is updated
  *
- * @since bbPress (r4304)
+ * @since 2.2.0 bbPress (r4304)
  *
  * @param int $user_id ID of user being edited
  * @param array $old_user_data The old, unmodified user data
@@ -288,7 +311,8 @@ function bbp_profile_update( $user_id = 0, $old_user_data = array() ) {
 /**
  * The main action for hooking into a user being registered
  *
- * @since bbPress (r4304)
+ * @since 2.2.0 bbPress (r4304)
+ *
  * @param int $user_id ID of user being edited
  * @uses do_action() Calls 'bbp_user_register'
  */
@@ -301,7 +325,8 @@ function bbp_user_register( $user_id = 0 ) {
 /**
  * bbPress has loaded and initialized everything, and is okay to go
  *
- * @since bbPress (r2618)
+ * @since 2.0.0 bbPress (r2618)
+ *
  * @uses do_action() Calls 'bbp_ready'
  */
 function bbp_ready() {
@@ -314,7 +339,8 @@ function bbp_ready() {
  * The main action used for redirecting bbPress theme actions that are not
  * permitted by the current_user
  *
- * @since bbPress (r3605)
+ * @since 2.1.0 bbPress (r3605)
+ *
  * @uses do_action()
  */
 function bbp_template_redirect() {
@@ -326,7 +352,8 @@ function bbp_template_redirect() {
 /**
  * The main action used for executing code before the theme has been setup
  *
- * @since bbPress (r3829)
+ * @since 2.1.0 bbPress (r3829)
+ *
  * @uses do_action()
  */
 function bbp_register_theme_packages() {
@@ -336,7 +363,8 @@ function bbp_register_theme_packages() {
 /**
  * The main action used for executing code before the theme has been setup
  *
- * @since bbPress (r3732)
+ * @since 2.1.0 bbPress (r3732)
+ *
  * @uses do_action()
  */
 function bbp_setup_theme() {
@@ -346,7 +374,8 @@ function bbp_setup_theme() {
 /**
  * The main action used for executing code after the theme has been setup
  *
- * @since bbPress (r3732)
+ * @since 2.1.0 bbPress (r3732)
+ *
  * @uses do_action()
  */
 function bbp_after_setup_theme() {
@@ -356,7 +385,8 @@ function bbp_after_setup_theme() {
 /**
  * The main action used for handling theme-side POST requests
  *
- * @since bbPress (r4550)
+ * @since 2.3.0 bbPress (r4550)
+ *
  * @uses do_action()
  */
 function bbp_post_request() {
@@ -385,7 +415,8 @@ function bbp_post_request() {
 /**
  * The main action used for handling theme-side GET requests
  *
- * @since bbPress (r4550)
+ * @since 2.3.0 bbPress (r4550)
+ *
  * @uses do_action()
  */
 function bbp_get_request() {
@@ -416,7 +447,7 @@ function bbp_get_request() {
 /**
  * Filter the plugin locale and domain.
  *
- * @since bbPress (r4213)
+ * @since 2.2.0 bbPress (r4213)
  *
  * @param string $locale
  * @param string $domain
@@ -428,7 +459,8 @@ function bbp_plugin_locale( $locale = '', $domain = '' ) {
 /**
  * Piggy back filter for WordPress's 'request' filter
  *
- * @since bbPress (r3758)
+ * @since 2.1.0 bbPress (r3758)
+ *
  * @param array $query_vars
  * @return array
  */
@@ -440,7 +472,8 @@ function bbp_request( $query_vars = array() ) {
  * The main filter used for theme compatibility and displaying custom bbPress
  * theme files.
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
+ *
  * @uses apply_filters()
  * @param string $template
  * @return string Template file to use
@@ -452,8 +485,10 @@ function bbp_template_include( $template = '' ) {
 /**
  * Generate bbPress-specific rewrite rules
  *
- * @since bbPress (r2688)
- * @deprecated since bbPress (r4918)
+ * @since 2.0.0 bbPress (r2688)
+ *
+ * @deprecated 2.4.0 bbPress (r4918)
+ *
  * @param WP_Rewrite $wp_rewrite
  * @uses do_action() Calls 'bbp_generate_rewrite_rules' with {@link WP_Rewrite}
  */
@@ -464,7 +499,8 @@ function bbp_generate_rewrite_rules( $wp_rewrite ) {
 /**
  * Filter the allowed themes list for bbPress specific themes
  *
- * @since bbPress (r2944)
+ * @since 2.0.0 bbPress (r2944)
+ *
  * @uses apply_filters() Calls 'bbp_allowed_themes' with the allowed themes list
  */
 function bbp_allowed_themes( $themes ) {
@@ -474,7 +510,7 @@ function bbp_allowed_themes( $themes ) {
 /**
  * Maps forum/topic/reply caps to built in WordPress caps
  *
- * @since bbPress (r2593)
+ * @since 2.0.0 bbPress (r2593)
  *
  * @param array $caps Capabilities for meta capability
  * @param string $cap Capability name
diff --git src/includes/core/template-functions.php src/includes/core/template-functions.php
index f295f67..1b46c40 100644
--- src/includes/core/template-functions.php
+++ src/includes/core/template-functions.php
@@ -17,7 +17,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Adds bbPress theme support to any active WordPress theme
  *
- * @since bbPress (r3032)
+ * @since 2.0.0 bbPress (r3032)
  *
  * @param string $slug
  * @param string $name Optional. Default null
@@ -51,7 +51,7 @@ function bbp_get_template_part( $slug, $name = null ) {
  * inherit from a parent theme can just overload one file. If the template is
  * not found in either of those, it looks in the theme-compat folder last.
  *
- * @since bbPress (r3618)
+ * @since 2.1.0 bbPress (r3618)
  *
  * @param string|array $template_names Template file(s) to search for, in order.
  * @param bool $load If true the template file will be loaded if it is found.
@@ -114,7 +114,7 @@ function bbp_locate_template( $template_names, $load = false, $require_once = tr
  *
  * Registers the style if file provided (does NOT overwrite) and enqueues.
  *
- * @since bbPress (r5180)
+ * @since 2.5.0 bbPress (r5180)
  *
  * @param string      $handle Name of the stylesheet.
  * @param string|bool $file   Relative path to stylesheet. Example: '/css/mystyle.css'.
@@ -183,7 +183,7 @@ function bbp_enqueue_style( $handle = '', $file = '', $deps = array(), $ver = fa
  *
  * Registers the style if file provided (does NOT overwrite) and enqueues.
  *
- * @since bbPress (r5180)
+ * @since 2.5.0 bbPress (r5180)
  *
  * @param string      $handle    Name of the script.
  * @param string|bool $file      Relative path to the script. Example: '/js/myscript.js'.
@@ -254,7 +254,7 @@ function bbp_enqueue_script( $handle = '', $file = '', $deps = array(), $ver = f
  * relationship, to allow for custom template locations. Used in conjunction
  * with bbp_locate_template(), this allows for easy template overrides.
  *
- * @since bbPress (r4323)
+ * @since 2.2.0 bbPress (r4323)
  *
  * @param string $location_callback Callback function that returns the
  * @param int $priority
@@ -273,7 +273,7 @@ function bbp_register_template_stack( $location_callback = '', $priority = 10 )
 /**
  * Deregisters a previously registered template stack location.
  *
- * @since bbPress (r4652)
+ * @since 2.3.0 bbPress (r4652)
  *
  * @param string $location_callback Callback function that returns the
  * @param int $priority
@@ -296,7 +296,7 @@ function bbp_deregister_template_stack( $location_callback = '', $priority = 10
  *
  * @see bbp_register_template_stack()
  *
- * @since bbPress (r4323)
+ * @since 2.2.0 bbPress (r4323)
  *
  * @global array $wp_filter Stores all of the filters
  * @global array $merged_filters Merges the filter hooks using this function.
@@ -350,7 +350,7 @@ function bbp_get_template_stack() {
 /**
  * Get a template part in an output buffer, and return it
  *
- * @since bbPress (r5043)
+ * @since 2.4.0 bbPress (r5043)
  *
  * @param string $slug
  * @param string $name
@@ -380,7 +380,7 @@ function bbp_buffer_template_part( $slug, $name = null, $echo = true ) {
  * the use of {@link bbp_locate_template()}. Allows for more generic template
  * locations without the use of the other get_*_template() functions.
  *
- * @since bbPress (r3629)
+ * @since 2.1.0 bbPress (r3629)
  *
  * @param string $type Filename without extension.
  * @param array $templates An optional list of template candidates
@@ -409,7 +409,8 @@ function bbp_get_query_template( $type, $templates = array() ) {
 /**
  * Get the possible subdirectories to check for templates in
  *
- * @since bbPress (r3738)
+ * @since 2.1.0 bbPress (r3738)
+ *
  * @param array $templates Templates we are looking for
  * @return array Possible subfolders to look in
  */
@@ -425,7 +426,7 @@ function bbp_get_template_locations( $templates = array() ) {
 /**
  * Add template locations to template files being searched for
  *
- * @since bbPress (r3738)
+ * @since 2.1.0 bbPress (r3738)
  *
  * @param array $stacks
  * @return array()
@@ -463,7 +464,7 @@ function bbp_add_template_stack_locations( $stacks = array() ) {
  * If it's a view page, WP_Query::bbp_is_view is set to true
  * If it's a search page, WP_Query::bbp_is_search is set to true
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @param WP_Query $posts_query
  *
diff --git src/includes/core/template-loader.php src/includes/core/template-loader.php
index 12b8ce6..7dedb2e 100644
--- src/includes/core/template-loader.php
+++ src/includes/core/template-loader.php
@@ -20,7 +20,7 @@ defined( 'ABSPATH' ) || exit;
  * Note that the _edit() checks are ahead of their counterparts, to prevent them
  * from being stomped on accident.
  *
- * @since bbPress (r3032)
+ * @since 2.0.0 bbPress (r3032)
  *
  * @param string $template
  *
@@ -120,7 +120,8 @@ function bbp_template_include_theme_supports( $template = '' ) {
 /**
  * Set the included template
  *
- * @since bbPress (r4975)
+ * @since 2.4.0 bbPress (r4975)
+ *
  * @param mixed $template Default false
  * @return mixed False if empty. Template name if template included
  */
@@ -133,7 +134,8 @@ function bbp_set_template_included( $template = false ) {
 /**
  * Is a bbPress template being included?
  *
- * @since bbPress (r4975)
+ * @since 2.4.0 bbPress (r4975)
+ *
  * @return bool True if yes, false if no
  */
 function bbp_is_template_included() {
@@ -146,7 +148,7 @@ function bbp_is_template_included() {
  * Attempt to load a custom bbPress functions file, similar to each themes
  * functions.php file.
  *
- * @since bbPress (r3732)
+ * @since 2.1.0 bbPress (r3732)
  *
  * @global string $pagenow
  * @uses bbp_locate_template()
@@ -169,7 +171,7 @@ function bbp_load_theme_functions() {
 /**
  * Get the user profile template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_displayed_user_id()
  * @uses bbp_get_query_template()
@@ -190,7 +192,7 @@ function bbp_get_single_user_template() {
 /**
  * Get the user profile edit template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_displayed_user_id()
  * @uses bbp_get_query_template()
@@ -212,7 +214,7 @@ function bbp_get_single_user_edit_template() {
 /**
  * Get the user favorites template
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @uses bbp_get_displayed_user_id()
  * @uses bbp_get_query_template()
@@ -235,7 +237,7 @@ function bbp_get_favorites_template() {
 /**
  * Get the user subscriptions template
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @uses bbp_get_displayed_user_id()
  * @uses bbp_get_query_template()
@@ -258,7 +260,7 @@ function bbp_get_subscriptions_template() {
 /**
  * Get the view template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_view_id()
  * @uses bbp_get_query_template()
@@ -278,7 +280,7 @@ function bbp_get_single_view_template() {
 /**
  * Get the search template
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses bbp_get_query_template()
  * @return string Path to template file
@@ -294,7 +296,7 @@ function bbp_get_search_template() {
 /**
  * Get the single forum template
  *
- * @since bbPress (r3922)
+ * @since 2.1.0 bbPress (r3922)
  *
  * @uses bbp_get_forum_post_type()
  * @uses bbp_get_query_template()
@@ -310,7 +312,7 @@ function bbp_get_single_forum_template() {
 /**
  * Get the forum archive template
  *
- * @since bbPress (r3922)
+ * @since 2.1.0 bbPress (r3922)
  *
  * @uses bbp_get_forum_post_type()
  * @uses bbp_get_query_template()
@@ -326,7 +328,7 @@ function bbp_get_forum_archive_template() {
 /**
  * Get the forum edit template
  *
- * @since bbPress (r3566)
+ * @since 2.1.0 bbPress (r3566)
  *
  * @uses bbp_get_topic_post_type()
  * @uses bbp_get_query_template()
@@ -342,7 +344,7 @@ function bbp_get_forum_edit_template() {
 /**
  * Get the single topic template
  *
- * @since bbPress (r3922)
+ * @since 2.1.0 bbPress (r3922)
  *
  * @uses bbp_get_topic_post_type()
  * @uses bbp_get_query_template()
@@ -358,7 +360,7 @@ function bbp_get_single_topic_template() {
 /**
  * Get the topic archive template
  *
- * @since bbPress (r3922)
+ * @since 2.1.0 bbPress (r3922)
  *
  * @uses bbp_get_topic_post_type()
  * @uses bbp_get_query_template()
@@ -374,7 +376,7 @@ function bbp_get_topic_archive_template() {
 /**
  * Get the topic edit template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_topic_post_type()
  * @uses bbp_get_query_template()
@@ -390,7 +392,7 @@ function bbp_get_topic_edit_template() {
 /**
  * Get the topic split template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_topic_post_type()
  * @uses bbp_get_query_template()
@@ -406,7 +408,7 @@ function bbp_get_topic_split_template() {
 /**
  * Get the topic merge template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_topic_post_type()
  * @uses bbp_get_query_template()
@@ -422,7 +424,7 @@ function bbp_get_topic_merge_template() {
 /**
  * Get the single reply template
  *
- * @since bbPress (r3922)
+ * @since 2.1.0 bbPress (r3922)
  *
  * @uses bbp_get_reply_post_type()
  * @uses bbp_get_query_template()
@@ -438,7 +440,7 @@ function bbp_get_single_reply_template() {
 /**
  * Get the reply edit template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_reply_post_type()
  * @uses bbp_get_query_template()
@@ -454,7 +456,7 @@ function bbp_get_reply_edit_template() {
 /**
  * Get the reply move template
  *
- * @since bbPress (r4521)
+ * @since 2.3.0 bbPress (r4521)
  *
  * @uses bbp_get_reply_post_type()
  * @uses bbp_get_query_template()
@@ -470,7 +472,7 @@ function bbp_get_reply_move_template() {
 /**
  * Get the topic template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_topic_tag_tax_id()
  * @uses bbp_get_query_template()
@@ -489,7 +491,7 @@ function bbp_get_topic_tag_template() {
 /**
  * Get the topic edit template
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses bbp_get_topic_tag_tax_id()
  * @uses bbp_get_query_template()
@@ -508,7 +510,7 @@ function bbp_get_topic_tag_edit_template() {
 /**
  * Get the templates to use as the endpoint for bbPress template parts
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  *
  * @uses apply_filters()
  * @uses bbp_set_theme_compat_templates()
diff --git src/includes/core/theme-compat.php src/includes/core/theme-compat.php
index fdeca34..e5ee3ae 100644
--- src/includes/core/theme-compat.php
+++ src/includes/core/theme-compat.php
@@ -31,7 +31,7 @@ defined( 'ABSPATH' ) || exit;
  * for future Theme Packs to use. @link BBP_Twenty_Ten is a good example of
  * extending this class, as is @link bbp_setup_theme_compat()
  *
- * @since bbPress (r3506)
+ * @since 2.0.0 bbPress (r3506)
  */
 class BBP_Theme_Compat {
 
@@ -52,7 +52,8 @@ class BBP_Theme_Compat {
 	/**
 	 * Pass the $properties to the object on creation.
 	 *
-	 * @since bbPress (r3926)
+	 * @since 2.1.0 bbPress (r3926)
+	 *
 	 * @param array $properties
 	 */
     public function __construct( Array $properties = array() ) {
@@ -62,7 +63,8 @@ class BBP_Theme_Compat {
 	/**
 	 * Set a theme's property.
 	 *
-	 * @since bbPress (r3926)
+	 * @since 2.1.0 bbPress (r3926)
+	 *
 	 * @param string $property
 	 * @param mixed $value
 	 * @return mixed
@@ -74,7 +76,8 @@ class BBP_Theme_Compat {
 	/**
 	 * Get a theme's property.
 	 *
-	 * @since bbPress (r3926)
+	 * @since 2.1.0 bbPress (r3926)
+	 *
 	 * @param string $property
 	 * @param mixed $value
 	 * @return mixed
@@ -91,7 +94,8 @@ class BBP_Theme_Compat {
 /**
  * Setup the default theme compat theme
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
+ *
  * @param BBP_Theme_Compat $theme
  */
 function bbp_setup_theme_compat( $theme = '' ) {
@@ -115,7 +119,8 @@ function bbp_setup_theme_compat( $theme = '' ) {
  * This can be filtered or set manually. Tricky theme authors can override the
  * default and include their own bbPress compatibility layers for their themes.
  *
- * @since bbPress (r3506)
+ * @since 2.0.0 bbPress (r3506)
+ *
  * @uses apply_filters()
  * @return string
  */
@@ -129,7 +134,8 @@ function bbp_get_theme_compat_id() {
  * This can be filtered or set manually. Tricky theme authors can override the
  * default and include their own bbPress compatibility layers for their themes.
  *
- * @since bbPress (r3506)
+ * @since 2.0.0 bbPress (r3506)
+ *
  * @uses apply_filters()
  * @return string
  */
@@ -143,7 +149,8 @@ function bbp_get_theme_compat_name() {
  * This can be filtered or set manually. Tricky theme authors can override the
  * default and include their own bbPress compatibility layers for their themes.
  *
- * @since bbPress (r3506)
+ * @since 2.0.0 bbPress (r3506)
+ *
  * @uses apply_filters()
  * @return string
  */
@@ -157,7 +164,8 @@ function bbp_get_theme_compat_version() {
  * or set manually. Tricky theme authors can override the default and include
  * their own bbPress compatibility layers for their themes.
  *
- * @since bbPress (r3032)
+ * @since 2.0.0 bbPress (r3032)
+ *
  * @uses apply_filters()
  * @return string
  */
@@ -171,7 +179,8 @@ function bbp_get_theme_compat_dir() {
  * or set manually. Tricky theme authors can override the default and include
  * their own bbPress compatibility layers for their themes.
  *
- * @since bbPress (r3032)
+ * @since 2.0.0 bbPress (r3032)
+ *
  * @uses apply_filters()
  * @return string
  */
@@ -182,7 +191,8 @@ function bbp_get_theme_compat_url() {
 /**
  * Gets true/false if page is currently inside theme compatibility
  *
- * @since bbPress (r3265)
+ * @since 2.0.0 bbPress (r3265)
+ *
  * @return bool
  */
 function bbp_is_theme_compat_active() {
@@ -198,7 +208,8 @@ function bbp_is_theme_compat_active() {
 /**
  * Sets true/false if page is currently inside theme compatibility
  *
- * @since bbPress (r3265)
+ * @since 2.0.0 bbPress (r3265)
+ *
  * @param bool $set
  * @return bool
  */
@@ -214,7 +225,7 @@ function bbp_set_theme_compat_active( $set = true ) {
  * Stash possible template files for the current query. Useful if plugins want
  * to override them, or see what files are being scanned for inclusion.
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  */
 function bbp_set_theme_compat_templates( $templates = array() ) {
 	bbpress()->theme_compat->templates = $templates;
@@ -228,7 +239,7 @@ function bbp_set_theme_compat_templates( $templates = array() ) {
  * Stash the template file for the current query. Useful if plugins want
  * to override it, or see what file is being included.
  *
- * @since bbPress (r3311)
+ * @since 2.0.0 bbPress (r3311)
  */
 function bbp_set_theme_compat_template( $template = '' ) {
 	bbpress()->theme_compat->template = $template;
@@ -242,7 +253,7 @@ function bbp_set_theme_compat_template( $template = '' ) {
  * Stash the original template file for the current query. Useful for checking
  * if bbPress was able to find a more appropriate template.
  *
- * @since bbPress (r3926)
+ * @since 2.1.0 bbPress (r3926)
  */
 function bbp_set_theme_compat_original_template( $template = '' ) {
 	bbpress()->theme_compat->original_template = $template;
@@ -256,7 +267,7 @@ function bbp_set_theme_compat_original_template( $template = '' ) {
  * Stash the original template file for the current query. Useful for checking
  * if bbPress was able to find a more appropriate template.
  *
- * @since bbPress (r3926)
+ * @since 2.1.0 bbPress (r3926)
  */
 function bbp_is_theme_compat_original_template( $template = '' ) {
 	$bbp = bbpress();
@@ -271,7 +282,8 @@ function bbp_is_theme_compat_original_template( $template = '' ) {
 /**
  * Register a new bbPress theme package to the active theme packages array
  *
- * @since bbPress (r3829)
+ * @since 2.1.0 bbPress (r3829)
+ *
  * @param array $theme
  */
 function bbp_register_theme_package( $theme = array(), $override = true ) {
@@ -298,7 +310,8 @@ function bbp_register_theme_package( $theme = array(), $override = true ) {
  * This fun little function fills up some WordPress globals with dummy data to
  * stop your average page template from complaining about it missing.
  *
- * @since bbPress (r3108)
+ * @since 2.0.0 bbPress (r3108)
+ *
  * @global WP_Query $wp_query
  * @global object $post
  * @param array $args
@@ -419,7 +432,8 @@ function bbp_theme_compat_reset_post( $args = array() ) {
  * Reset main query vars and filter 'the_content' to output a bbPress
  * template part as needed.
  *
- * @since bbPress (r3032)
+ * @since 2.0.0 bbPress (r3032)
+ *
  * @param string $template
  * @uses bbp_is_single_user() To check if page is single user
  * @uses bbp_get_single_user_template() To get user template
@@ -804,7 +818,7 @@ function bbp_template_include_theme_compat( $template = '' ) {
 /**
  * Remove the canonical redirect to allow pretty pagination
  *
- * @since bbPress (r2628)
+ * @since 2.0.0 bbPress (r2628)
  *
  * @param string $redirect_url Redirect url
  * @uses bbp_use_pretty_urls() To check if the blog is using permalinks
@@ -862,7 +876,8 @@ function bbp_redirect_canonical( $redirect_url ) {
  * Removes all filters from a WordPress filter, and stashes them in the $bbp
  * global in the event they need to be restored later.
  *
- * @since bbPress (r3251)
+ * @since 2.0.0 bbPress (r3251)
+ *
  * @global WP_filter $wp_filter
  * @global array $merged_filters
  * @param string $tag
@@ -914,7 +929,8 @@ function bbp_remove_all_filters( $tag, $priority = false ) {
  * Restores filters from the $bbp global that were removed using
  * bbp_remove_all_filters()
  *
- * @since bbPress (r3251)
+ * @since 2.0.0 bbPress (r3251)
+ *
  * @global WP_filter $wp_filter
  * @global array $merged_filters
  * @param string $tag
@@ -965,7 +981,8 @@ function bbp_restore_all_filters( $tag, $priority = false ) {
 /**
  * Force comments_status to 'closed' for bbPress post types
  *
- * @since bbPress (r3589)
+ * @since 2.1.0 bbPress (r3589)
+ *
  * @param bool $open True if open, false if closed
  * @param int $post_id ID of the post to check
  * @return bool True if open, false if closed
diff --git src/includes/core/update.php src/includes/core/update.php
index 37ee580..efd274a 100644
--- src/includes/core/update.php
+++ src/includes/core/update.php
@@ -13,7 +13,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * If there is no raw DB version, this is the first installation
  *
- * @since bbPress (r3764)
+ * @since 2.1.0 bbPress (r3764)
  *
  * @uses get_option()
  * @uses bbp_get_db_version() To get bbPress's database version
@@ -26,7 +26,7 @@ function bbp_is_install() {
 /**
  * Compare the bbPress version to the DB version to determine if updating
  *
- * @since bbPress (r3421)
+ * @since 2.0.0 bbPress (r3421)
  *
  * @uses get_option()
  * @uses bbp_get_db_version() To get bbPress's database version
@@ -45,7 +45,7 @@ function bbp_is_update() {
  * Note that this function currently is not used in bbPress core and is here
  * for third party plugins to use to check for bbPress activation.
  *
- * @since bbPress (r3421)
+ * @since 2.0.0 bbPress (r3421)
  *
  * @return bool True if activating bbPress, false if not
  */
@@ -95,7 +95,8 @@ function bbp_is_activation( $basename = '' ) {
 /**
  * Determine if bbPress is being deactivated
  *
- * @since bbPress (r3421)
+ * @since 2.0.0 bbPress (r3421)
+ *
  * @return bool True if deactivating bbPress, false if not
  */
 function bbp_is_deactivation( $basename = '' ) {
@@ -144,7 +145,8 @@ function bbp_is_deactivation( $basename = '' ) {
 /**
  * Update the DB to the latest version
  *
- * @since bbPress (r3421)
+ * @since 2.0.0 bbPress (r3421)
+ *
  * @uses update_option()
  * @uses bbp_get_db_version() To get bbPress's database version
  */
@@ -155,7 +157,7 @@ function bbp_version_bump() {
 /**
  * Setup the bbPress updater
  *
- * @since bbPress (r3419)
+ * @since 2.0.0 bbPress (r3419)
  *
  * @uses bbp_version_updater()
  * @uses bbp_version_bump()
@@ -175,7 +177,8 @@ function bbp_setup_updater() {
 /**
  * Create a default forum, topic, and reply
  *
- * @since bbPress (r3767)
+ * @since 2.1.0 bbPress (r3767)
+ *
  * @param array $args Array of arguments to override default values
  */
 function bbp_create_initial_content( $args = array() ) {
@@ -246,7 +249,7 @@ function bbp_create_initial_content( $args = array() ) {
  * This is most-often used when the data schema changes, but should also be used
  * to correct issues with bbPress meta-data silently on software update.
  *
- * @since bbPress (r4104)
+ * @since 2.2.0 bbPress (r4104)
  */
 function bbp_version_updater() {
 
@@ -308,7 +311,7 @@ function bbp_version_updater() {
 /**
  * Redirect user to bbPress's What's New page on activation
  *
- * @since bbPress (r4389)
+ * @since 2.2.0 bbPress (r4389)
  *
  * @internal Used internally to redirect bbPress to the about page on activation
  *
@@ -333,7 +336,7 @@ function bbp_add_activation_redirect() {
  * the current user a Key Master in the forums if they just activated bbPress,
  * regardless of the bbp_allow_global_access() setting.
  *
- * @since bbPress (r4910)
+ * @since 2.4.0 bbPress (r4910)
  *
  * @internal Used to internally make the current user a keymaster on activation
  *
diff --git src/includes/extend/akismet.php src/includes/extend/akismet.php
index b284918..5192e23 100644
--- src/includes/extend/akismet.php
+++ src/includes/extend/akismet.php
@@ -14,7 +14,7 @@ if ( !class_exists( 'BBP_Akismet' ) ) :
 /**
  * Loads Akismet extension
  *
- * @since bbPress (r3277)
+ * @since 2.0.0 bbPress (r3277)
  *
  * @package bbPress
  * @subpackage Akismet
@@ -24,7 +24,7 @@ class BBP_Akismet {
 	/**
 	 * The main bbPress Akismet loader
 	 *
-	 * @since bbPress (r3277)
+	 * @since 2.0.0 bbPress (r3277)
 	 *
 	 * @uses add_filter()
 	 */
@@ -35,7 +35,8 @@ class BBP_Akismet {
 	/**
 	 * Setup the admin hooks
 	 *
-	 * @since bbPress (r3277)
+	 * @since 2.0.0 bbPress (r3277)
+	 *
 	 * @access private
 	 *
 	 * @uses add_filter() To add various filters
@@ -81,7 +82,7 @@ class BBP_Akismet {
 	/**
 	 * Converts topic/reply data into Akismet comment checking format
 	 *
-	 * @since bbPress (r3277)
+	 * @since 2.0.0 bbPress (r3277)
 	 *
 	 * @param string $post_data
 	 *
@@ -220,7 +221,7 @@ class BBP_Akismet {
 	/**
 	 * Submit a post for spamming or hamming
 	 *
-	 * @since bbPress (r3277)
+	 * @since 2.0.0 bbPress (r3277)
 	 *
 	 * @param int $post_id
 	 *
@@ -362,7 +363,7 @@ class BBP_Akismet {
 	/**
 	 * Ping Akismet service and check for spam/ham response
 	 *
-	 * @since bbPress (r3277)
+	 * @since 2.0.0 bbPress (r3277)
 	 *
 	 * @param array $post_data
 	 * @param string $check Accepts check|submit
@@ -441,7 +442,7 @@ class BBP_Akismet {
 	/**
 	 * Update post meta after a spam check
 	 *
-	 * @since bbPress (r3308)
+	 * @since 2.0.0 bbPress (r3308)
 	 *
 	 * @param int $post_id
 	 * @param object $_post
@@ -531,7 +532,7 @@ class BBP_Akismet {
 	/**
 	 * Update a post's Akismet history
 	 *
-	 * @since bbPress (r3308)
+	 * @since 2.0.0 bbPress (r3308)
 	 *
 	 * @param int $post_id
 	 * @param string $message
@@ -572,7 +573,7 @@ class BBP_Akismet {
 	/**
 	 * Get a post's Akismet history
 	 *
-	 * @since bbPress (r3308)
+	 * @since 2.0.0 bbPress (r3308)
 	 *
 	 * @param int $post_id
 	 *
@@ -595,7 +596,7 @@ class BBP_Akismet {
 	/**
 	 * Handle any terms submitted with a post flagged as spam
 	 *
-	 * @since bbPress (r3308)
+	 * @since 2.0.0 bbPress (r3308)
 	 *
 	 * @param string $terms Comma-separated list of terms
 	 * @param int $topic_id
@@ -632,7 +633,7 @@ class BBP_Akismet {
 	 * This code is directly taken from the akismet_http_post() function and
 	 * documented to bbPress 2.0 standard.
 	 *
-	 * @since bbPress (r3466)
+	 * @since 2.0.0 bbPress (r3466)
 	 *
 	 * @param string $request The request we are sending
 	 * @param string $host The host to send our request to
@@ -689,7 +690,7 @@ class BBP_Akismet {
 	/**
 	 * Return a user's roles on this site (including super_admin)
 	 *
-	 * @since bbPress (r4812)
+	 * @since 2.3.0 bbPress (r4812)
 	 *
 	 * @param type $user_id
 	 * @return boolean
@@ -723,7 +724,7 @@ class BBP_Akismet {
 	/**
 	 * Add Aksimet History metaboxes to topics and replies
 	 *
-	 * @since bbPress (r5049)
+	 * @since 2.4.0 bbPress (r5049)
 	 */
 	public function add_metaboxes() {
 
@@ -751,7 +752,7 @@ class BBP_Akismet {
 	/**
 	 * Output for Akismet History metabox
 	 *
-	 * @since bbPress (r5049)
+	 * @since 2.4.0 bbPress (r5049)
 	 *
 	 * @uses get_post_history() To get the Akismet history for the post
 	 * @uses get_the_ID() To get the post ID
diff --git src/includes/extend/buddypress/activity.php src/includes/extend/buddypress/activity.php
index 9366f30..20bff29 100644
--- src/includes/extend/buddypress/activity.php
+++ src/includes/extend/buddypress/activity.php
@@ -14,7 +14,7 @@ if ( !class_exists( 'BBP_BuddyPress_Activity' ) ) :
 /**
  * Loads BuddyPress Activity extension
  *
- * @since bbPress (r3395)
+ * @since 2.0.0 bbPress (r3395)
  *
  * @package bbPress
  * @subpackage BuddyPress
@@ -84,7 +84,7 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * The bbPress BuddyPress Activity loader
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
 	 */
 	public function __construct() {
 		$this->setup_globals();
@@ -96,7 +96,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Extension variables
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @access private
 	 * @uses apply_filters() Calls various filters
 	 */
@@ -122,7 +123,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Setup the actions
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @access private
 	 * @uses add_filter() To add various filters
 	 * @uses add_action() To add various actions
@@ -157,7 +159,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Setup the filters
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @access private
 	 * @uses add_filter() To add various filters
 	 * @uses add_action() To add various actions
@@ -175,7 +178,7 @@ class BBP_BuddyPress_Activity {
 	 * Allow the variables, actions, and filters to be modified by third party
 	 * plugins and themes.
 	 *
-	 * @since bbPress (r3902)
+	 * @since 2.1.0 bbPress (r3902)
 	 */
 	private function fully_loaded() {
 		do_action_ref_array( 'bbp_buddypress_activity_loaded', array( $this ) );
@@ -186,7 +189,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Register our activity actions with BuddyPress
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @uses bp_activity_set_action()
 	 */
 	public function register_activity_actions() {
@@ -199,7 +203,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Wrapper for recoding bbPress actions to the BuddyPress activity stream
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @param type $args Array of arguments for bp_activity_add()
 	 * @uses bbp_get_current_user_id()
 	 * @uses bp_core_current_time()
@@ -232,7 +237,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Wrapper for deleting bbPress actions from BuddyPress activity stream
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @param type $args Array of arguments for bp_activity_add()
 	 * @uses bbp_get_current_user_id()
 	 * @uses bp_core_current_time()
@@ -287,7 +293,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Maybe disable activity stream comments on select actions
 	 *
-	 * @since bbPress (r3399)
+	 * @since 2.0.0 bbPress (r3399)
+	 *
 	 * @global BP_Activity_Template $activities_template
 	 * @param boolean $can_comment
 	 * @uses bp_get_activity_action_name()
@@ -325,7 +332,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Maybe link directly to topics and replies in activity stream entries
 	 *
-	 * @since bbPress (r3399)
+	 * @since 2.0.0 bbPress (r3399)
+	 *
 	 * @param string $link
 	 * @param mixed $activity_object
 	 * @return string The link to the activity stream item
@@ -349,7 +357,7 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Append forum options to activity filter select box
 	 *
-	 * @since bbPress (r3653)
+	 * @since 2.1.0 bbPress (r3653)
 	 */
 	function activity_filter_options() {
 	?>
@@ -365,7 +373,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Record an activity stream entry when a topic is created or updated
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @param int $topic_id
 	 * @param int $forum_id
 	 * @param array $anonymous_data
@@ -512,7 +521,8 @@ class BBP_BuddyPress_Activity {
 	/**
 	 * Record an activity stream entry when a reply is created
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @param int $topic_id
 	 * @param int $forum_id
 	 * @param array $anonymous_data
diff --git src/includes/extend/buddypress/functions.php src/includes/extend/buddypress/functions.php
index 14c0fec..07a2979 100644
--- src/includes/extend/buddypress/functions.php
+++ src/includes/extend/buddypress/functions.php
@@ -18,7 +18,8 @@ defined( 'ABSPATH' ) || exit;
  *
  * This is used primarily for Notifications integration.
  *
- * @since bbPress (r5232)
+ * @since 2.6.0 bbPress (r5232)
+ *
  * @return string
  */
 function bbp_get_component_name() {
@@ -38,7 +39,7 @@ function bbp_get_component_name() {
 /**
  * Filter the current bbPress user ID with the current BuddyPress user ID
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @param int $user_id
  * @param bool $displayed_user_fallback
@@ -77,7 +78,7 @@ add_filter( 'bbp_get_user_id', 'bbp_filter_user_id', 10, 3 );
 /**
  * Filter the bbPress is_single_user function with BuddyPress eqivalent
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @param bool $is Optional. Default false
  * @return bool True if viewing single user, false if not
@@ -94,7 +95,7 @@ add_filter( 'bbp_is_single_user', 'bbp_filter_is_single_user', 10, 1 );
 /**
  * Filter the bbPress is_user_home function with BuddyPress eqivalent
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @param bool $is Optional. Default false
  * @return bool True if viewing single user, false if not
@@ -111,7 +112,7 @@ add_filter( 'bbp_is_user_home', 'bbp_filter_is_user_home', 10, 1 );
 /**
  * Add the topic title to the <title> if viewing a single group forum topic
  *
- * @since bbPress (r5161)
+ * @since 2.5.0 bbPress (r5161)
  *
  * @param string $new_title The title to filter
  * @param string $old_title (Not used)
@@ -149,7 +150,7 @@ add_action( 'bp_modify_page_title', 'bbp_filter_modify_page_title', 10, 3 );
 /**
  * Hook bbPress topics template into plugins template
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @uses add_action() To add the content hook
  * @uses bp_core_load_template() To load the plugins template
@@ -162,7 +163,7 @@ function bbp_member_forums_screen_topics() {
 /**
  * Hook bbPress replies template into plugins template
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @uses add_action() To add the content hook
  * @uses bp_core_load_template() To load the plugins template
@@ -175,7 +176,7 @@ function bbp_member_forums_screen_replies() {
 /**
  * Hook bbPress favorites template into plugins template
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @uses add_action() To add the content hook
  * @uses bp_core_load_template() To load the plugins template
@@ -188,7 +189,7 @@ function bbp_member_forums_screen_favorites() {
 /**
  * Hook bbPress subscriptions template into plugins template
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @uses add_action() To add the content hook
  * @uses bp_core_load_template() To load the plugins template
@@ -203,7 +204,7 @@ function bbp_member_forums_screen_subscriptions() {
 /**
  * Get the topics created template part
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @uses bbp_get_template_part()s
  */
@@ -222,7 +223,7 @@ function bbp_member_forums_topics_content() {
 /**
  * Get the topics replied to template part
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @uses bbp_get_template_part()
  */
@@ -241,7 +242,7 @@ function bbp_member_forums_replies_content() {
 /**
  * Get the topics favorited template part
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @uses bbp_get_template_part()
  */
@@ -260,7 +261,7 @@ function bbp_member_forums_favorites_content() {
 /**
  * Get the topics subscribed template part
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @uses bbp_get_template_part()
  */
@@ -289,7 +290,7 @@ function bbp_member_forums_subscriptions_content() {
  * Get forum ID's for a group
  *
  * @param type $group_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_get_group_forum_ids( $group_id = 0 ) {
 
@@ -321,7 +322,7 @@ function bbp_get_group_forum_ids( $group_id = 0 ) {
  * Get group ID's for a forum
  *
  * @param type $forum_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_get_forum_group_ids( $forum_id = 0 ) {
 
@@ -353,7 +354,7 @@ function bbp_get_forum_group_ids( $forum_id = 0 ) {
  * Get forum ID's for a group
  *
  * @param type $group_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_update_group_forum_ids( $group_id = 0, $forum_ids = array() ) {
 
@@ -373,7 +374,7 @@ function bbp_update_group_forum_ids( $group_id = 0, $forum_ids = array() ) {
  * Update group ID's for a forum
  *
  * @param type $forum_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_update_forum_group_ids( $forum_id = 0, $group_ids = array() ) {
 	$forum_id = bbp_get_forum_id( $forum_id );
@@ -389,7 +390,7 @@ function bbp_update_forum_group_ids( $forum_id = 0, $group_ids = array() ) {
  * Add a group to a forum
  *
  * @param type $group_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_add_group_id_to_forum( $forum_id = 0, $group_id = 0 ) {
 
@@ -415,7 +416,7 @@ function bbp_add_group_id_to_forum( $forum_id = 0, $group_id = 0 ) {
  * Remove a forum from a group
  *
  * @param type $group_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_add_forum_id_to_group( $group_id = 0, $forum_id = 0 ) {
 
@@ -441,7 +442,7 @@ function bbp_add_forum_id_to_group( $group_id = 0, $forum_id = 0 ) {
  * Remove a group from a forum
  *
  * @param type $group_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_remove_group_id_from_forum( $forum_id = 0, $group_id = 0 ) {
 
@@ -467,7 +468,7 @@ function bbp_remove_group_id_from_forum( $forum_id = 0, $group_id = 0 ) {
  * Remove a forum from a group
  *
  * @param type $group_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_remove_forum_id_from_group( $group_id = 0, $forum_id = 0 ) {
 
@@ -493,7 +494,7 @@ function bbp_remove_forum_id_from_group( $group_id = 0, $forum_id = 0 ) {
  * Remove a group from aall forums
  *
  * @param type $group_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_remove_group_id_from_all_forums( $group_id = 0 ) {
 
@@ -515,7 +516,7 @@ function bbp_remove_group_id_from_all_forums( $group_id = 0 ) {
  * Remove a forum from all groups
  *
  * @param type $forum_id
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  */
 function bbp_remove_forum_id_from_all_groups( $forum_id = 0 ) {
 
@@ -532,7 +533,7 @@ function bbp_remove_forum_id_from_all_groups( $forum_id = 0 ) {
 /**
  * Return true if a forum is a group forum
  *
- * @since bbPress (r4571)
+ * @since 2.3.0 bbPress (r4571)
  *
  * @param int $forum_id
  * @uses bbp_get_forum_id() To get the forum id
@@ -559,7 +560,7 @@ function bbp_is_forum_group_forum( $forum_id = 0 ) {
 /**
  * Is the current user an admin of the current group
  *
- * @since bbPress (r4632)
+ * @since 2.3.0 bbPress (r4632)
  *
  * @uses is_user_logged_in()
  * @uses bp_is_group()
@@ -590,7 +591,7 @@ function bbp_group_is_admin() {
 /**
  * Is the current user a moderator of the current group
  *
- * @since bbPress (r4632)
+ * @since 2.3.0 bbPress (r4632)
  *
  * @uses is_user_logged_in()
  * @uses bp_is_group()
@@ -621,7 +622,7 @@ function bbp_group_is_mod() {
 /**
  * Is the current user a member of the current group
  *
- * @since bbPress (r4632)
+ * @since 2.3.0 bbPress (r4632)
  *
  * @uses is_user_logged_in()
  * @uses bp_is_group()
@@ -652,7 +653,7 @@ function bbp_group_is_member() {
 /**
  * Is the current user banned from the current group
  *
- * @since bbPress (r4632)
+ * @since 2.3.0 bbPress (r4632)
  *
  * @uses is_user_logged_in()
  * @uses bp_is_group()
@@ -683,7 +684,7 @@ function bbp_group_is_banned() {
 /**
  * Is the current user the creator of the current group
  *
- * @since bbPress (r4632)
+ * @since 2.3.0 bbPress (r4632)
  *
  * @uses is_user_logged_in()
  * @uses bp_is_group()
diff --git src/includes/extend/buddypress/groups.php src/includes/extend/buddypress/groups.php
index c7b5167..408bf1e 100644
--- src/includes/extend/buddypress/groups.php
+++ src/includes/extend/buddypress/groups.php
@@ -18,7 +18,7 @@ if ( !class_exists( 'BBP_Forums_Group_Extension' ) && class_exists( 'BP_Group_Ex
 /**
  * Loads Group Extension for Forums Component
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @package bbPress
  * @subpackage BuddyPress
@@ -30,7 +30,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Setup bbPress group extension variables
 	 *
-	 * @since bbPress (r3552)
+	 * @since 2.1.0 bbPress (r3552)
 	 */
 	public function __construct() {
 		$this->setup_variables();
@@ -42,7 +42,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Setup the group forums class variables
 	 *
-	 * @since bbPress (r3552)
+	 * @since 2.1.0 bbPress (r3552)
 	 */
 	private function setup_variables() {
 
@@ -75,7 +75,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Setup the group forums class actions
 	 *
-	 * @since bbPress (r4552)
+	 * @since 2.3.0 bbPress (r4552)
 	 */
 	private function setup_actions() {
 
@@ -104,7 +104,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Setup the group forums class filters
 	 *
-	 * @since bbPress (r4552)
+	 * @since 2.3.0 bbPress (r4552)
 	 */
 	private function setup_filters() {
 
@@ -149,7 +149,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * The primary display function for group forums
 	 *
-	 * @since bbPress (r3746)
+	 * @since 2.1.0 bbPress (r3746)
 	 *
 	 * @param int $group_id ID of the current group. Available only on BP 2.2+.
 	 */
@@ -174,7 +174,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Maybe unset the group forum nav item if group does not have a forum
 	 *
-	 * @since bbPress (r4552)
+	 * @since 2.3.0 bbPress (r4552)
 	 *
 	 * @return If not viewing a single group
 	 */
@@ -195,7 +195,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Allow group members to have advanced priviledges in group forum topics.
 	 *
-	 * @since bbPress (r4434)
+	 * @since 2.2.0 bbPress (r4434)
 	 *
 	 * @param array $caps
 	 * @param string $cap
@@ -245,7 +245,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Remove the topic meta cap map, so it doesn't interfere with sidebars.
 	 *
-	 * @since bbPress (r4434)
+	 * @since 2.2.0 bbPress (r4434)
 	 */
 	public function remove_group_forum_meta_cap_map() {
 		remove_filter( 'bbp_map_meta_caps', array( $this, 'map_group_forum_meta_caps' ), 99, 4 );
@@ -256,7 +256,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Show forums and new forum form when editing a group
 	 *
-	 * @since bbPress (r3563)
+	 * @since 2.1.0 bbPress (r3563)
 	 *
 	 * @param object $group (the group to edit if in Group Admin UI)
 	 * @uses is_admin() To check if we're in the Group Admin UI
@@ -322,7 +322,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Save the Group Forum data on edit
 	 *
-	 * @since bbPress (r3465)
+	 * @since 2.0.0 bbPress (r3465)
 	 *
 	 * @param int $group_id (to handle Group Admin UI hook bp_group_admin_edit_after )
 	 * @uses bbp_new_forum_handler() To check for forum creation
@@ -433,7 +433,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Adds a metabox to BuddyPress Group Admin UI
 	 *
-	 * @since bbPress (r4814)
+	 * @since 2.3.0 bbPress (r4814)
 	 *
 	 * @uses add_meta_box
 	 * @uses BBP_Forums_Group_Extension::group_admin_ui_display_metabox() To display the edit screen
@@ -452,7 +452,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Displays the bbPress metabox in BuddyPress Group Admin UI
 	 *
-	 * @since bbPress (r4814)
+	 * @since 2.3.0 bbPress (r4814)
 	 *
 	 * @param object $item (group object)
 	 * @uses add_meta_box
@@ -467,7 +467,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Show forums and new forum form when creating a group
 	 *
-	 * @since bbPress (r3465)
+	 * @since 2.0.0 bbPress (r3465)
 	 */
 	public function create_screen( $group_id = 0 ) {
 
@@ -497,7 +497,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Save the Group Forum data on create
 	 *
-	 * @since bbPress (r3465)
+	 * @since 2.0.0 bbPress (r3465)
 	 */
 	public function create_screen_save( $group_id = 0 ) {
 
@@ -584,7 +584,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Used to start an output buffer
 	 *
-	 * @since bbPress (r3746)
+	 * @since 2.1.0 bbPress (r3746)
 	 */
 	public function ob_start() {
 		ob_start();
@@ -593,7 +593,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Used to end an output buffer
 	 *
-	 * @since bbPress (r3746)
+	 * @since 2.1.0 bbPress (r3746)
 	 */
 	public function ob_end_clean() {
 		ob_end_clean();
@@ -602,7 +602,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Creating a group forum or category (including root for group)
 	 *
-	 * @since bbPress (r3653)
+	 * @since 2.1.0 bbPress (r3653)
 	 *
 	 * @param type $forum_args
 	 * @uses bbp_get_forum_id()
@@ -629,7 +629,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Removing a group forum or category (including root for group)
 	 *
-	 * @since bbPress (r3653)
+	 * @since 2.1.0 bbPress (r3653)
 	 *
 	 * @param type $forum_args
 	 * @uses bbp_get_forum_id()
@@ -656,7 +656,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Listening to BuddyPress Group deletion to remove the forum
 	 *
-	 * @since bbPress (r4815)
+	 * @since 2.3.0 bbPress (r4815)
 	 *
 	 * @param int $group_id The group ID
 	 * @uses bbp_get_group_forum_ids()
@@ -735,7 +735,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Toggle the enable_forum group setting on or off
 	 *
-	 * @since bbPress (r4612)
+	 * @since 2.3.0 bbPress (r4612)
 	 *
 	 * @param int $group_id The group to toggle
 	 * @param bool $enabled True for on, false for off
@@ -778,7 +778,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	 * As of right now, bbPress only supports 1-to-1 group forum relationships.
 	 * In the future, many-to-many should be allowed.
 	 *
-	 * @since bbPress (r3653)
+	 * @since 2.1.0 bbPress (r3653)
 	 *
 	 * @uses bp_get_current_group_id()
 	 * @uses bbp_get_group_forum_ids()
@@ -977,7 +977,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Strip super stickies from the topic query
 	 *
-	 * @since bbPress (r4810)
+	 * @since 2.3.0 bbPress (r4810)
 	 *
 	 * @access private
 	 * @param array $super the super sticky post ID's
@@ -991,7 +991,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Unset the type super sticky from topic type
 	 *
-	 * @since bbPress (r4810)
+	 * @since 2.3.0 bbPress (r4810)
 	 *
 	 * @access private
 	 * @param array $args
@@ -1007,7 +1007,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Ugly preg_replace to hide the to front admin link
 	 *
-	 * @since bbPress (r4810)
+	 * @since 2.3.0 bbPress (r4810)
 	 *
 	 * @access private
 	 * @param string $retval
@@ -1027,7 +1027,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Redirect to the group forum screen
 	 *
-	 * @since bbPress (r3653)
+	 * @since 2.1.0 bbPress (r3653)
 	 *
 	 * @param str $redirect_url
 	 * @param str $redirect_to
@@ -1045,7 +1045,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Redirect to the group forum screen
 	 *
-	 * @since bbPress (r3653)
+	 * @since 2.1.0 bbPress (r3653)
 	 */
 	public function new_reply_redirect_to( $redirect_url = '', $redirect_to = '', $reply_id = 0 ) {
 
@@ -1078,7 +1078,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Redirect to the group admin forum edit screen
 	 *
-	 * @since bbPress (r3653)
+	 * @since 2.1.0 bbPress (r3653)
 	 *
 	 * @uses groups_get_current_group()
 	 * @uses bp_is_group_admin_screen()
@@ -1104,7 +1104,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Prevent Forum Parent from appearing
 	 *
-	 * @since bbPress (r3746)
+	 * @since 2.1.0 bbPress (r3746)
 	 */
 
 	public function forum_parent() {
@@ -1118,7 +1118,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Prevent Topic Parent from appearing
 	 *
-	 * @since bbPress (r3746)
+	 * @since 2.1.0 bbPress (r3746)
 	 *
 	 * @uses bbp_get_group_forum_ids() to get BuddyPress group forums
 	 * @uses bbp_dropdown() To show a dropdown of the forums for forum parent
@@ -1139,7 +1139,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Permissions to view the 'New Topic'/'Reply To' form in a BuddyPress group.
 	 *
-	 * @since bbPress (r4608)
+	 * @since 2.3.0 bbPress (r4608)
 	 *
 	 * @param bool $retval Are we allowed to view the reply form?
 	 * @uses bp_is_group() To determine if we're on a group page
@@ -1184,7 +1184,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	 * Due to the way BuddyPress' group admin settings page saves its settings,
 	 * we need to let BP know that bbPress added a forum.
 	 *
-	 * @since bbPress (r5026)
+	 * @since 2.4.0 bbPress (r5026)
 	 *
 	 * @link https://bbpress.trac.wordpress.org/ticket/2339/
 	 * @see groups_screen_group_admin_settings()
@@ -1206,7 +1206,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Maybe map a bbPress forum/topic/reply permalink to the corresponding group
 	 *
-	 * @since bbPress (r4266)
+	 * @since 2.2.0 bbPress (r4266)
 	 *
 	 * @param int $post_id
 	 * @uses get_post()
@@ -1277,7 +1277,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Map a forum permalink to its corresponding group
 	 *
-	 * @since bbPress (r3802)
+	 * @since 2.1.0 bbPress (r3802)
 	 *
 	 * @param string $url
 	 * @param int $forum_id
@@ -1291,7 +1291,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Map a topic permalink to its group forum
 	 *
-	 * @since bbPress (r3802)
+	 * @since 2.1.0 bbPress (r3802)
 	 *
 	 * @param string $url
 	 * @param int $topic_id
@@ -1305,7 +1305,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Map a reply permalink to its group forum
 	 *
-	 * @since bbPress (r3802)
+	 * @since 2.1.0 bbPress (r3802)
 	 *
 	 * @param string $url
 	 * @param int $reply_id
@@ -1319,7 +1319,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Map a reply edit link to its group forum
 	 *
-	 * @since bbPress (r4266)
+	 * @since 2.2.0 bbPress (r4266)
 	 *
 	 * @param string $url
 	 * @param int $reply_id
@@ -1339,7 +1339,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Map a post link to its group forum
 	 *
-	 * @since bbPress (r4266)
+	 * @since 2.2.0 bbPress (r4266)
 	 *
 	 * @param string $url
 	 * @param obj $post
@@ -1354,7 +1354,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Map a page link to its group forum
 	 *
-	 * @since bbPress (r4266)
+	 * @since 2.2.0 bbPress (r4266)
 	 *
 	 * @param string $url
 	 * @param int $post_id
@@ -1369,7 +1369,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Map a custom post type link to its group forum
 	 *
-	 * @since bbPress (r4266)
+	 * @since 2.2.0 bbPress (r4266)
 	 *
 	 * @param string $url
 	 * @param obj $post
@@ -1385,7 +1385,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Fix pagination of topics on forum view
 	 *
-	 * @since bbPress (r4266)
+	 * @since 2.2.0 bbPress (r4266)
 	 *
 	 * @param array $args
 	 * @uses bbp_get_forum_id()
@@ -1407,7 +1407,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Fix pagination of replies on topic view
 	 *
-	 * @since bbPress (r4266)
+	 * @since 2.2.0 bbPress (r4266)
 	 *
 	 * @param array $args
 	 * @uses bbp_get_topic_id()
@@ -1429,7 +1429,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	 * Ensure that forum content associated with a BuddyPress group can only be
 	 * viewed via the group URL.
 	 *
-	 * @since bbPress (r3802)
+	 * @since 2.1.0 bbPress (r3802)
 	 */
 	public function redirect_canonical() {
 
@@ -1474,7 +1474,7 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
 	/**
 	 * Map a forum post to its corresponding group in the group activity stream.
 	 *
-	 * @since bbPress (r4396)
+	 * @since 2.2.0 bbPress (r4396)
 	 *
 	 * @param array $args Arguments from BBP_BuddyPress_Activity::record_activity()
 	 * @uses groups_get_current_group() To see if we're posting from a BP group
diff --git src/includes/extend/buddypress/loader.php src/includes/extend/buddypress/loader.php
index 01f4b5c..5dde500 100644
--- src/includes/extend/buddypress/loader.php
+++ src/includes/extend/buddypress/loader.php
@@ -24,7 +24,7 @@ if ( !class_exists( 'BBP_Forums_Component' ) ) :
 /**
  * Loads Forums Component
  *
- * @since bbPress (r3552)
+ * @since 2.1.0 bbPress (r3552)
  *
  * @package bbPress
  * @subpackage BuddyPress
@@ -34,7 +34,7 @@ class BBP_Forums_Component extends BP_Component {
 	/**
 	 * Start the forums component creation process
 	 *
-	 * @since bbPress (r3552)
+	 * @since 2.1.0 bbPress (r3552)
 	 */
 	public function __construct() {
 		parent::start(
@@ -83,7 +83,7 @@ class BBP_Forums_Component extends BP_Component {
 	 * The BP_FORUMS_SLUG constant is deprecated, and only used here for
 	 * backwards compatibility.
 	 *
-	 * @since bbPress (r3552)
+	 * @since 2.1.0 bbPress (r3552)
 	 */
 	public function setup_globals( $args = array() ) {
 		$bp = buddypress();
@@ -113,7 +113,8 @@ class BBP_Forums_Component extends BP_Component {
 	/**
 	 * Setup the actions
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
+	 *
 	 * @access private
 	 * @uses add_filter() To add various filters
 	 * @uses add_action() To add various actions
@@ -130,7 +131,7 @@ class BBP_Forums_Component extends BP_Component {
 	/**
 	 * Instantiate classes for BuddyPress integration
 	 *
-	 * @since bbPress (r3395)
+	 * @since 2.0.0 bbPress (r3395)
 	 */
 	public function setup_components() {
 
@@ -152,7 +153,7 @@ class BBP_Forums_Component extends BP_Component {
 	 * Allow the variables, actions, and filters to be modified by third party
 	 * plugins and themes.
 	 *
-	 * @since bbPress (r3902)
+	 * @since 2.1.0 bbPress (r3902)
 	 */
 	private function fully_loaded() {
 		do_action_ref_array( 'bbp_buddypress_loaded', array( $this ) );
@@ -161,7 +162,7 @@ class BBP_Forums_Component extends BP_Component {
 	/**
 	 * Setup BuddyBar navigation
 	 *
-	 * @since bbPress (r3552)
+	 * @since 2.1.0 bbPress (r3552)
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
@@ -249,7 +250,7 @@ class BBP_Forums_Component extends BP_Component {
 	/**
 	 * Set up the admin bar
 	 *
-	 * @since bbPress (r3552)
+	 * @since 2.1.0 bbPress (r3552)
 	 */
 	public function setup_admin_bar( $wp_admin_nav = array() ) {
 
@@ -325,7 +326,7 @@ class BBP_Forums_Component extends BP_Component {
 	/**
 	 * Sets up the title for pages and <title>
 	 *
-	 * @since bbPress (r3552)
+	 * @since 2.1.0 bbPress (r3552)
 	 */
 	public function setup_title() {
 		$bp = buddypress();
diff --git src/includes/extend/buddypress/members.php src/includes/extend/buddypress/members.php
index 054c630..26d90ec 100644
--- src/includes/extend/buddypress/members.php
+++ src/includes/extend/buddypress/members.php
@@ -14,7 +14,7 @@ if ( !class_exists( 'BBP_Forums_Members' ) ) :
 /**
  * Member profile modifications
  *
- * @since bbPress (r4395)
+ * @since 2.2.0 bbPress (r4395)
  *
  * @package bbPress
  * @subpackage BuddyPress
@@ -24,7 +24,7 @@ class BBP_BuddyPress_Members {
 	/**
 	 * Main constructor for modifying bbPress profile links
 	 *
-	 * @since bbPress (r4395)
+	 * @since 2.2.0 bbPress (r4395)
 	 */
 	public function __construct() {
 		$this->setup_actions();
@@ -34,7 +34,7 @@ class BBP_BuddyPress_Members {
 	/**
 	 * Setup the actions
 	 *
-	 * @since bbPress (r4395)
+	 * @since 2.2.0 bbPress (r4395)
 	 *
 	 * @access private
 	 * @uses add_filter() To add various filters
@@ -61,7 +61,7 @@ class BBP_BuddyPress_Members {
 	/**
 	 * Setup the filters
 	 *
-	 * @since bbPress (r4395)
+	 * @since 2.2.0 bbPress (r4395)
 	 *
 	 * @access private
 	 * @uses add_filter() To add various filters
@@ -78,7 +78,8 @@ class BBP_BuddyPress_Members {
 	/**
 	 * Override bbPress profile URL with BuddyPress profile URL
 	 *
-	 * @since bbPress (r3401)
+	 * @since 2.0.0 bbPress (r3401)
+	 *
 	 * @param string $url
 	 * @param int $user_id
 	 * @param string $user_nicename
@@ -126,7 +127,8 @@ class BBP_BuddyPress_Members {
 	/**
 	 * Override bbPress favorites URL with BuddyPress profile URL
 	 *
-	 * @since bbPress (r3721)
+	 * @since 2.1.0 bbPress (r3721)
+	 *
 	 * @param string $url
 	 * @param int $user_id
 	 * @return string
@@ -146,7 +148,8 @@ class BBP_BuddyPress_Members {
 	/**
 	 * Override bbPress subscriptions URL with BuddyPress profile URL
 	 *
-	 * @since bbPress (r3721)
+	 * @since 2.1.0 bbPress (r3721)
+	 *
 	 * @param string $url
 	 * @param int $user_id
 	 * @return string
@@ -167,7 +170,7 @@ class BBP_BuddyPress_Members {
 	 * Set favorites and subscriptions query variables if viewing member profile
 	 * pages.
 	 *
-	 * @since bbPress (r4615)
+	 * @since 2.3.0 bbPress (r4615)
 	 *
 	 * @global WP_Query $wp_query
 	 * @return If not viewing your own profile
diff --git src/includes/extend/buddypress/notifications.php src/includes/extend/buddypress/notifications.php
index d15b83d..42c3ef6 100644
--- src/includes/extend/buddypress/notifications.php
+++ src/includes/extend/buddypress/notifications.php
@@ -4,7 +4,7 @@
  * Filter registered notifications components, and add 'forums' to the queried
  * 'component_name' array.
  *
- * @since bbPress (r5232)
+ * @since 2.6.0 bbPress (r5232)
  *
  * @see BP_Notifications_Notification::get()
  * @param array $component_names
@@ -28,7 +28,7 @@ add_filter( 'bp_notifications_get_registered_components', 'bbp_filter_notificati
 /**
  * Format the BuddyBar/Toolbar notifications
  *
- * @since bbPress (r5155)
+ * @since 2.5.0 bbPress (r5155)
  *
  * @package bbPress
  *
@@ -85,7 +85,7 @@ add_filter( 'bp_notifications_get_notifications_for_user', 'bbp_format_buddypres
  * Hooked into the new reply function, this notification action is responsible
  * for notifying topic and hierarchical reply authors of topic replies.
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $reply_id
  * @param int $topic_id
@@ -139,7 +139,7 @@ add_action( 'bbp_new_reply', 'bbp_buddypress_add_notification', 10, 7 );
 /**
  * Mark notifications as read when reading a topic
  *
- * @since bbPress (r5155)
+ * @since 2.5.0 bbPress (r5155)
  *
  * @return If not trying to mark a notification as read
  */
diff --git src/includes/forums/capabilities.php src/includes/forums/capabilities.php
index aa57030..972316c 100644
--- src/includes/forums/capabilities.php
+++ src/includes/forums/capabilities.php
@@ -12,7 +12,7 @@
 /**
  * Return forum capabilities
  *
- * @since bbPress (r2593)
+ * @since 2.0.0 bbPress (r2593)
  *
  * @uses apply_filters() Calls 'bbp_get_forum_caps' with the capabilities
  * @return array Forum capabilities
@@ -32,7 +32,7 @@ function bbp_get_forum_caps() {
 /**
  * Maps forum capabilities
  *
- * @since bbPress (r4242)
+ * @since 2.2.0 bbPress (r4242)
  *
  * @param array $caps Capabilities for meta capability
  * @param string $cap Capability name
@@ -196,7 +196,7 @@ function bbp_map_forum_meta_caps( $caps = array(), $cap = '', $user_id = 0, $arg
 /**
  * Return forum moderator capabilities
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @uses apply_filters() Calls 'bbp_get_forum_mod_caps' with the capabilities
  *
@@ -214,7 +214,7 @@ function bbp_get_forum_mod_caps() {
 /**
  * Maps forum moderator capabilities
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @param array  $caps Capabilities for meta capability.
  * @param string $cap Capability name.
@@ -246,7 +246,7 @@ function bbp_map_forum_mod_meta_caps( $caps, $cap, $user_id, $args ) {
 /**
  * Get moderators of a forum
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @param int $forum_id Forum id.
  * @uses bbp_get_forum_id() To get the forum id
@@ -298,7 +298,7 @@ function bbp_get_forum_moderator_ids( $forum_id = 0 ) {
 /**
  * Get forums of a moderator
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @param int $user_id User id.
  * @uses get_userdata() To get the user object
@@ -355,7 +355,7 @@ function bbp_get_moderator_forum_ids( $user_id = 0 ) {
 /**
  * Can a user moderate a forum?
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @param int $user_id User id.
  * @param int $forum_id Forum id.
diff --git src/includes/forums/functions.php src/includes/forums/functions.php
index 517f0f9..f89788f 100644
--- src/includes/forums/functions.php
+++ src/includes/forums/functions.php
@@ -16,7 +16,7 @@ defined( 'ABSPATH' ) || exit;
  * A wrapper for wp_insert_post() that also includes the necessary meta values
  * for the forum to function properly.
  *
- * @since bbPress (r3349)
+ * @since 2.0.0 bbPress (r3349)
  *
  * @uses bbp_parse_args()
  * @uses bbp_get_forum_post_type()
@@ -642,7 +642,8 @@ function bbp_edit_forum_handler( $action = '' ) {
 /**
  * Handle the saving of core forum metadata (Status, Visibility, and Type)
  *
- * @since bbPress (r3678)
+ * @since 2.1.0 bbPress (r3678)
+ *
  * @param int $forum_id
  * @uses bbp_is_forum_closed() To check if forum is closed
  * @uses bbp_close_forum() To close forum
@@ -726,7 +727,7 @@ function bbp_save_forum_extras( $forum_id = 0 ) {
 		/**
 		 * Allow custom forum visibility save actions
 		 *
-		 * @since bbPress (r5855)
+		 * @since 2.6.0 bbPress (r5855)
 		 *
 		 * @param int    $forum_id       The forum ID
 		 * @param string $old_visibility The current forum visibility
@@ -741,7 +742,7 @@ function bbp_save_forum_extras( $forum_id = 0 ) {
 /**
  * Closes a forum
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id forum id
  * @uses do_action() Calls 'bbp_close_forum' with the forum id
@@ -765,7 +766,7 @@ function bbp_close_forum( $forum_id = 0 ) {
 /**
  * Opens a forum
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id forum id
  * @uses do_action() Calls 'bbp_open_forum' with the forum id
@@ -792,7 +793,7 @@ function bbp_open_forum( $forum_id = 0 ) {
 /**
  * Make the forum a category
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id Optional. Forum id
  * @uses update_post_meta() To update the forum category meta
@@ -814,7 +815,7 @@ function bbp_categorize_forum( $forum_id = 0 ) {
 /**
  * Remove the category status from a forum
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id Optional. Forum id
  * @uses delete_post_meta() To delete the forum category meta
@@ -838,7 +839,7 @@ function bbp_normalize_forum( $forum_id = 0 ) {
 /**
  * Mark the forum as public
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id Optional. Forum id
  * @uses update_post_meta() To update the forum private meta
@@ -896,7 +897,7 @@ function bbp_publicize_forum( $forum_id = 0, $current_visibility = '' ) {
 /**
  * Mark the forum as private
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id Optional. Forum id
  * @uses update_post_meta() To update the forum private meta
@@ -946,7 +947,7 @@ function bbp_privatize_forum( $forum_id = 0, $current_visibility = '' ) {
 /**
  * Mark the forum as hidden
  *
- * @since bbPress (r2996)
+ * @since 2.0.0 bbPress (r2996)
  *
  * @param int $forum_id Optional. Forum id
  * @uses update_post_meta() To update the forum private meta
@@ -996,7 +997,7 @@ function bbp_hide_forum( $forum_id = 0, $current_visibility = '' ) {
 /**
  * Recaches the private and hidden forums
  *
- * @since bbPress (r5017)
+ * @since 2.4.0 bbPress (r5017)
  *
  * @uses delete_option() to delete private and hidden forum pointers
  * @uses WP_Query() To query post IDs
@@ -1059,7 +1060,7 @@ function bbp_repair_forum_visibility() {
 /**
  * Remove a deleted forum from all users' subscriptions
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $forum_id Get the forum ID to remove
  * @uses bbp_is_subscriptions_active() To check if the subscriptions are active
@@ -1101,7 +1102,7 @@ function bbp_remove_forum_from_all_subscriptions( $forum_id = 0 ) {
 /**
  * Bump the total topic count of a forum
  *
- * @since bbPress (r3825)
+ * @since 2.1.0 bbPress (r3825)
  *
  * @param int $forum_id Optional. Forum id.
  * @param int $difference Optional. Default 1
@@ -1159,7 +1160,7 @@ function bbp_bump_forum_topic_count( $forum_id = 0, $difference = 1, $update_anc
 /**
  * Bump the total hidden topic count of a forum
  *
- * @since bbPress (r3825)
+ * @since 2.1.0 bbPress (r3825)
  *
  * @param int $forum_id Optional. Forum id.
  * @param int $difference Optional. Default 1
@@ -1192,7 +1193,7 @@ function bbp_bump_forum_topic_count_hidden( $forum_id = 0, $difference = 1 ) {
 /**
  * Bump the total topic count of a forum
  *
- * @since bbPress (r3825)
+ * @since 2.1.0 bbPress (r3825)
  *
  * @param int $forum_id Optional. Forum id.
  * @param int $difference Optional. Default 1
@@ -1485,7 +1486,7 @@ function bbp_update_forum_last_active_time( $forum_id = 0, $new_time = '' ) {
 /**
  * Update the forum sub-forum count
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_id() To get the forum id
@@ -1508,7 +1509,7 @@ function bbp_update_forum_subforum_count( $forum_id = 0, $subforums = 0 ) {
 /**
  * Adjust the total topic count of a forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id or topic id. It is checked whether it
  *                       is a topic or a forum. If it's a topic, its parent,
@@ -1553,7 +1554,7 @@ function bbp_update_forum_topic_count( $forum_id = 0 ) {
  * Adjust the total hidden topic count of a forum (hidden includes trashed,
  * spammed and pending topics)
  *
- * @since bbPress (r2888)
+ * @since 2.0.0 bbPress (r2888)
  *
  * @param int $forum_id Optional. Topic id to update
  * @param int $topic_count Optional. Set the topic count manually
@@ -1606,7 +1607,7 @@ function bbp_update_forum_topic_count_hidden( $forum_id = 0, $topic_count = 0 )
 /**
  * Adjust the total reply count of a forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id or topic id. It is checked whether it
  *                       is a topic or a forum. If it's a topic, its parent,
@@ -1663,7 +1664,7 @@ function bbp_update_forum_reply_count( $forum_id = 0 ) {
  * database to get their results. As such, this function can be costly to run
  * but is necessary to keep everything accurate.
  *
- * @since bbPress (r2908)
+ * @since 2.0.0 bbPress (r2908)
  *
  * @param array $args Supports these arguments:
  *  - forum_id: Forum id
@@ -1730,7 +1731,7 @@ function bbp_update_forum( $args = array() ) {
 /**
  * Get forum mods for a specific forum ID
  *
- * @since bbPress (r5836)
+ * @since 2.6.0 bbPress (r5836)
  *
  * @param int $forum_id
  *
@@ -1747,7 +1748,7 @@ function bbp_get_forum_mods( $forum_id = 0 ) {
 /**
  * Get forum mods for a specific forum ID
  *
- * @since bbPress (r4165)
+ * @since 2.2.0 bbPress (r4165)
  *
  * @param int    $forum_id
  * @param string $sep
@@ -1767,7 +1768,7 @@ function bbp_get_forum_mod_names( $forum_id = 0, $sep = ', ' ) {
 /**
  * Return an associative array of available topic statuses
  *
- * @since bbPress (r5059)
+ * @since 2.4.0 bbPress (r5059)
  *
  * @return array
  */
@@ -1781,7 +1782,7 @@ function bbp_get_forum_statuses() {
 /**
  * Return an associative array of forum types
  *
- * @since bbPress (r5059)
+ * @since 2.4.0 bbPress (r5059)
  *
  * @return array
  */
@@ -1795,7 +1796,7 @@ function bbp_get_forum_types() {
 /**
  * Return an associative array of forum visibility
  *
- * @since bbPress (r5059)
+ * @since 2.4.0 bbPress (r5059)
  *
  * @return array
  */
@@ -1814,7 +1815,7 @@ function bbp_get_forum_visibilities() {
  *
  * Only hidden forum ids are returned. Public and private ids are not.
  *
- * @since bbPress (r3007)
+ * @since 2.0.0 bbPress (r3007)
  *
  * @uses get_option() Returns the unserialized array of hidden forum ids
  * @uses apply_filters() Calls 'bbp_forum_query_topic_ids' with the topic ids
@@ -1831,7 +1832,7 @@ function bbp_get_hidden_forum_ids() {
  *
  * Only private forum ids are returned. Public and hidden ids are not.
  *
- * @since bbPress (r3007)
+ * @since 2.0.0 bbPress (r3007)
  *
  * @uses get_option() Returns the unserialized array of private forum ids
  * @uses apply_filters() Calls 'bbp_forum_query_topic_ids' with the topic ids
@@ -1847,7 +1848,7 @@ function bbp_get_private_forum_ids() {
  * Returns a meta_query that either includes or excludes hidden forum IDs
  * from a query.
  *
- * @since bbPress (r3291)
+ * @since 2.0.0 bbPress (r3291)
  *
  * @param string Optional. The type of value to return. (string|array|meta_query)
  *
@@ -1933,7 +1934,7 @@ function bbp_exclude_forum_ids( $type = 'string' ) {
  * to hardcode this logic into each query. It also protects forum content for
  * plugins that might be doing their own queries.
  *
- * @since bbPress (r3291)
+ * @since 2.0.0 bbPress (r3291)
  *
  * @param WP_Query $posts_query
  *
@@ -2038,7 +2039,7 @@ function bbp_pre_get_posts_normalize_forum_visibility( $posts_query = null ) {
  *
  * Only topics with published and closed statuses are returned
  *
- * @since bbPress (r2908)
+ * @since 2.0.0 bbPress (r2908)
  *
  * @param int $forum_id Forum id
  * @uses bbp_get_topic_post_type() To get the topic post type
@@ -2057,7 +2058,7 @@ function bbp_forum_query_topic_ids( $forum_id ) {
  *
  * Only forums with published status are returned
  *
- * @since bbPress (r2908)
+ * @since 2.0.0 bbPress (r2908)
  *
  * @param int $forum_id Forum id
  * @uses bbp_get_forum_post_type() To get the forum post type
@@ -2075,7 +2076,8 @@ function bbp_forum_query_subforum_ids( $forum_id ) {
 /**
  * Callback to sort forum ID's based on last active time
  *
- * @since bbPress (r3789)
+ * @since 2.1.0 bbPress (r3789)
+ *
  * @param int $a First forum ID to compare
  * @param int $b Second forum ID to compare
  * @return Position change based on sort
@@ -2089,7 +2091,7 @@ function _bbp_forum_query_usort_subforum_ids( $a = 0, $b = 0 ) {
 /**
  * Returns the forum's last reply id
  *
- * @since bbPress (r2908)
+ * @since 2.0.0 bbPress (r2908)
  *
  * @param int $forum_id Forum id
  * @param int $topic_ids Optional. Topic ids
@@ -2135,7 +2137,7 @@ function bbp_forum_query_last_reply_id( $forum_id, $topic_ids = 0 ) {
  * Check if it's a hidden forum or a topic or reply of a hidden forum and if
  * the user can't view it, then sets a 404
  *
- * @since bbPress (r2996)
+ * @since 2.0.0 bbPress (r2996)
  *
  * @uses current_user_can() To check if the current user can read private forums
  * @uses is_singular() To check if it's a singular page
@@ -2190,7 +2192,7 @@ function bbp_forum_enforce_hidden() {
  * Check if it's a private forum or a topic or reply of a private forum and if
  * the user can't view it, then sets a 404
  *
- * @since bbPress (r2996)
+ * @since 2.0.0 bbPress (r2996)
  *
  * @uses current_user_can() To check if the current user can read private forums
  * @uses is_singular() To check if it's a singular page
@@ -2246,7 +2248,7 @@ function bbp_forum_enforce_private() {
 /**
  * Redirect if unathorized user is attempting to edit a forum
  *
- * @since bbPress (r3607)
+ * @since 2.1.0 bbPress (r3607)
  *
  * @uses bbp_is_forum_edit()
  * @uses current_user_can()
@@ -2270,7 +2272,7 @@ function bbp_check_forum_edit() {
 /**
  * Delete all topics (and their replies) for a specific forum ID
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
  *
  * @param int $forum_id
  * @uses bbp_get_forum_id() To validate the forum ID
@@ -2319,7 +2321,7 @@ function bbp_delete_forum_topics( $forum_id = 0 ) {
 /**
  * Trash all topics inside a forum
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
  *
  * @param int $forum_id
  * @uses bbp_get_forum_id() To validate the forum ID
@@ -2387,7 +2389,7 @@ function bbp_trash_forum_topics( $forum_id = 0 ) {
 /**
  * Trash all topics inside a forum
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
  *
  * @param int $forum_id
  * @uses bbp_get_forum_id() To validate the forum ID
@@ -2432,7 +2434,8 @@ function bbp_untrash_forum_topics( $forum_id = 0 ) {
  * handled by WordPress core API functions. It is used to clean up after
  * a forum that is being deleted.
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
+ *
  * @uses bbp_get_forum_id() To get the forum id
  * @uses bbp_is_forum() To check if the passed id is a forum
  * @uses do_action() Calls 'bbp_delete_forum' with the forum id
@@ -2454,7 +2457,8 @@ function bbp_delete_forum( $forum_id = 0 ) {
  * handled by WordPress core API functions. It is used to clean up after
  * a forum that is being trashed.
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
+ *
  * @uses bbp_get_forum_id() To get the forum id
  * @uses bbp_is_forum() To check if the passed id is a forum
  * @uses do_action() Calls 'bbp_trash_forum' with the forum id
@@ -2472,7 +2476,8 @@ function bbp_trash_forum( $forum_id = 0 ) {
 /**
  * Called before untrashing a forum
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
+ *
  * @uses bbp_get_forum_id() To get the forum id
  * @uses bbp_is_forum() To check if the passed id is a forum
  * @uses do_action() Calls 'bbp_untrash_forum' with the forum id
@@ -2492,7 +2497,8 @@ function bbp_untrash_forum( $forum_id = 0 ) {
 /**
  * Called after deleting a forum
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
+ *
  * @uses bbp_get_forum_id() To get the forum id
  * @uses bbp_is_forum() To check if the passed id is a forum
  * @uses do_action() Calls 'bbp_deleted_forum' with the forum id
@@ -2510,7 +2516,8 @@ function bbp_deleted_forum( $forum_id = 0 ) {
 /**
  * Called after trashing a forum
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
+ *
  * @uses bbp_get_forum_id() To get the forum id
  * @uses bbp_is_forum() To check if the passed id is a forum
  * @uses do_action() Calls 'bbp_trashed_forum' with the forum id
@@ -2528,7 +2535,8 @@ function bbp_trashed_forum( $forum_id = 0 ) {
 /**
  * Called after untrashing a forum
  *
- * @since bbPress (r3668)
+ * @since 2.1.0 bbPress (r3668)
+ *
  * @uses bbp_get_forum_id() To get the forum id
  * @uses bbp_is_forum() To check if the passed id is a forum
  * @uses do_action() Calls 'bbp_untrashed_forum' with the forum id
diff --git src/includes/forums/template.php src/includes/forums/template.php
index 6b8ab3d..aed3bab 100644
--- src/includes/forums/template.php
+++ src/includes/forums/template.php
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Output the unique id of the custom post type for forums
  *
- * @since bbPress (r2857)
+ * @since 2.0.0 bbPress (r2857)
  *
  * @uses bbp_get_forum_post_type() To get the forum post type
  */
@@ -25,7 +25,7 @@ function bbp_forum_post_type() {
 	/**
 	 * Return the unique id of the custom post type for forums
 	 *
-	 * @since bbPress (r2857)
+	 * @since 2.0.0 bbPress (r2857)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_forum_post_type' with the forum
 	 *                        post type id
@@ -39,7 +39,7 @@ function bbp_forum_post_type() {
 /**
  * Return array of labels used by the forum post type
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -66,7 +66,7 @@ function bbp_get_forum_post_type_labels() {
 /**
  * Return array of forum post type rewrite settings
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -80,7 +80,7 @@ function bbp_get_forum_post_type_rewrite() {
 /**
  * Return array of features the forum post type supports
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -99,7 +99,7 @@ function bbp_get_forum_post_type_supports() {
  *
  * WordPress makes this easy for us.
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param array $args All the arguments supported by {@link WP_Query}
  * @uses WP_Query To make query and get the forums
@@ -149,7 +149,7 @@ function bbp_has_forums( $args = array() ) {
 /**
  * Whether there are more forums available in the loop
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses bbPress:forum_query::have_posts() To check if there are more forums
  *                                          available
@@ -171,7 +171,7 @@ function bbp_forums() {
 /**
  * Loads up the current forum in the loop
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses bbPress:forum_query::the_post() To get the current forum
  * @return object Forum information
@@ -185,7 +185,7 @@ function bbp_the_forum() {
 /**
  * Output forum id
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param $forum_id Optional. Used to check emptiness
  * @uses bbp_get_forum_id() To get the forum id
@@ -196,7 +196,7 @@ function bbp_forum_id( $forum_id = 0 ) {
 	/**
 	 * Return the forum id
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param $forum_id Optional. Used to check emptiness
 	 * @uses bbPress::forum_query::in_the_loop To check if we're in the loop
@@ -251,7 +251,7 @@ function bbp_forum_id( $forum_id = 0 ) {
 /**
  * Gets a forum
  *
- * @since bbPress (r2787)
+ * @since 2.0.0 bbPress (r2787)
  *
  * @param int|object $forum forum id or forum object
  * @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N. Default = OBJECT
@@ -299,7 +299,7 @@ function bbp_get_forum( $forum, $output = OBJECT, $filter = 'raw' ) {
 /**
  * Output the link to the forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id
  * @param string $redirect_to Optional. Pass a redirect value for use with
@@ -312,7 +312,7 @@ function bbp_forum_permalink( $forum_id = 0, $redirect_to = '' ) {
 	/**
 	 * Return the link to the forum
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @param string $redirect_to Optional. Pass a redirect value for use with
@@ -341,7 +341,7 @@ function bbp_forum_permalink( $forum_id = 0, $redirect_to = '' ) {
 /**
  * Output the title of the forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_title() To get the forum title
@@ -352,7 +352,7 @@ function bbp_forum_title( $forum_id = 0 ) {
 	/**
 	 * Return the title of the forum
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -370,7 +370,7 @@ function bbp_forum_title( $forum_id = 0 ) {
 /**
  * Output the forum archive title
  *
- * @since bbPress (r3249)
+ * @since 2.0.0 bbPress (r3249)
  *
  * @param string $title Default text to use as title
  */
@@ -380,7 +380,7 @@ function bbp_forum_archive_title( $title = '' ) {
 	/**
 	 * Return the forum archive title
 	 *
-	 * @since bbPress (r3249)
+	 * @since 2.0.0 bbPress (r3249)
 	 *
 	 * @param string $title Default text to use as title
 	 *
@@ -416,7 +416,7 @@ function bbp_forum_archive_title( $title = '' ) {
 /**
  * Output the content of the forum
  *
- * @since bbPress (r2780)
+ * @since 2.0.0 bbPress (r2780)
  *
  * @param int $forum_id Optional. Topic id
  * @uses bbp_get_forum_content() To get the forum content
@@ -427,7 +427,7 @@ function bbp_forum_content( $forum_id = 0 ) {
 	/**
 	 * Return the content of the forum
 	 *
-	 * @since bbPress (r2780)
+	 * @since 2.0.0 bbPress (r2780)
 	 *
 	 * @param int $forum_id Optional. Topic id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -454,7 +454,7 @@ function bbp_forum_content( $forum_id = 0 ) {
 /**
  * Allow forum rows to have adminstrative actions
  *
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
  *
  * @uses do_action()
  * @todo Links and filter
@@ -466,7 +466,8 @@ function bbp_forum_row_actions() {
 /**
  * Output value of forum mods field
  *
- * @since bbPress (r5837)
+ * @since 2.6.0 bbPress (r5837)
+ *
  * @uses bbp_get_form_forum_mods() To get the value of forum mods field
  */
 function bbp_form_forum_mods() {
@@ -475,7 +476,7 @@ function bbp_form_forum_mods() {
 	/**
 	 * Return value of forum mods field
 	 *
-	 * @since bbPress (r5837)
+	 * @since 2.6.0 bbPress (r5837)
 	 *
 	 * @uses bbp_is_forum_edit() To check if it's the forum edit page
 	 * @uses apply_filters() Calls 'bbp_get_form_forum_mods' with the mods
@@ -510,7 +511,7 @@ function bbp_form_forum_mods() {
 /**
  * Output the forums last active ID
  *
- * @since bbPress (r2860)
+ * @since 2.0.0 bbPress (r2860)
  *
  * @uses bbp_get_forum_last_active_id() To get the forum's last active id
  * @param int $forum_id Optional. Forum id
@@ -521,7 +522,7 @@ function bbp_forum_last_active_id( $forum_id = 0 ) {
 	/**
 	 * Return the forums last active ID
 	 *
-	 * @since bbPress (r2860)
+	 * @since 2.0.0 bbPress (r2860)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -540,7 +541,7 @@ function bbp_forum_last_active_id( $forum_id = 0 ) {
 /**
  * Output the forums last update date/time (aka freshness)
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses bbp_get_forum_last_active_time() To get the forum freshness
  * @param int $forum_id Optional. Forum id
@@ -551,7 +552,7 @@ function bbp_forum_last_active_time( $forum_id = 0 ) {
 	/**
 	 * Return the forums last update date/time (aka freshness)
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -595,7 +596,7 @@ function bbp_forum_last_active_time( $forum_id = 0 ) {
  *
  * Outputs a complete link with attributes and content.
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_freshness_link() To get the forum freshness link
@@ -608,7 +609,7 @@ function bbp_forum_freshness_link( $forum_id = 0) {
 	 *
 	 * Returns a complete link with attributes and content.
 	 *
-	 * @since bbPress (r2625)
+	 * @since 2.0.0 bbPress (r2625)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -662,7 +663,7 @@ function bbp_forum_freshness_link( $forum_id = 0) {
 /**
  * Output parent ID of a forum, if exists
  *
- * @since bbPress (r3675)
+ * @since 2.1.0 bbPress (r3675)
  *
  * @param int $forum_id Forum ID
  * @uses bbp_get_forum_parent_id() To get the forum's parent ID
@@ -673,7 +674,7 @@ function bbp_forum_parent_id( $forum_id = 0 ) {
 	/**
 	 * Return ID of forum parent, if exists
 	 *
-	 * @since bbPress (r3675)
+	 * @since 2.1.0 bbPress (r3675)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -691,7 +692,7 @@ function bbp_forum_parent_id( $forum_id = 0 ) {
 /**
  * Return array of parent forums
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_id() To get the forum id
@@ -718,7 +719,7 @@ function bbp_get_forum_ancestors( $forum_id = 0 ) {
 /**
  * Return subforums of given forum
  *
- * @since bbPress (r2747)
+ * @since 2.0.0 bbPress (r2747)
  *
  * @param array $args All the arguments supported by {@link WP_Query}
  * @uses bbp_get_forum_id() To get the forum id
@@ -864,7 +865,7 @@ function bbp_list_forums( $args = array() ) {
 /**
  * Output the forum subscription link
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @uses bbp_get_forum_subscription_link()
  */
@@ -877,7 +878,7 @@ function bbp_forum_subscription_link( $args = array() ) {
 	 *
 	 * A custom wrapper for bbp_get_user_subscribe_link()
 	 *
-	 * @since bbPress (r5156)
+	 * @since 2.5.0 bbPress (r5156)
 	 *
 	 * @uses bbp_parse_args()
 	 * @uses bbp_get_user_subscribe_link()
@@ -912,7 +913,7 @@ function bbp_forum_subscription_link( $args = array() ) {
 /**
  * Output the forum's last topic id
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses bbp_get_forum_last_topic_id() To get the forum's last topic id
  * @param int $forum_id Optional. Forum id
@@ -923,7 +924,7 @@ function bbp_forum_last_topic_id( $forum_id = 0 ) {
 	/**
 	 * Return the forum's last topic id
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -942,7 +943,7 @@ function bbp_forum_last_topic_id( $forum_id = 0 ) {
 /**
  * Output the title of the last topic inside a forum
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_last_topic_title() To get the forum's last topic's title
@@ -953,7 +954,7 @@ function bbp_forum_last_topic_title( $forum_id = 0 ) {
 	/**
 	 * Return the title of the last topic inside a forum
 	 *
-	 * @since bbPress (r2625)
+	 * @since 2.0.0 bbPress (r2625)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -974,7 +975,7 @@ function bbp_forum_last_topic_title( $forum_id = 0 ) {
 /**
  * Output the link to the last topic in a forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_last_topic_permalink() To get the forum's last topic's
@@ -986,7 +987,7 @@ function bbp_forum_last_topic_permalink( $forum_id = 0 ) {
 	/**
 	 * Return the link to the last topic in a forum
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1007,7 +1008,7 @@ function bbp_forum_last_topic_permalink( $forum_id = 0 ) {
 /**
  * Return the author ID of the last topic of a forum
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_id() To get the forum id
@@ -1028,7 +1029,7 @@ function bbp_get_forum_last_topic_author_id( $forum_id = 0 ) {
 /**
  * Output link to author of last topic of forum
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_last_topic_author_link() To get the forum's last topic's
@@ -1040,7 +1041,7 @@ function bbp_forum_last_topic_author_link( $forum_id = 0 ) {
 	/**
 	 * Return link to author of last topic of forum
 	 *
-	 * @since bbPress (r2625)
+	 * @since 2.0.0 bbPress (r2625)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1064,7 +1065,7 @@ function bbp_forum_last_topic_author_link( $forum_id = 0 ) {
 /**
  * Output the forums last reply id
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @uses bbp_get_forum_last_reply_id() To get the forum's last reply id
  * @param int $forum_id Optional. Forum id
@@ -1075,7 +1076,7 @@ function bbp_forum_last_reply_id( $forum_id = 0 ) {
 	/**
 	 * Return the forums last reply id
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1123,7 +1124,7 @@ function bbp_forum_last_reply_title( $forum_id = 0 ) {
 /**
  * Output the link to the last reply in a forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_last_reply_permalink() To get the forum last reply link
@@ -1134,7 +1135,7 @@ function bbp_forum_last_reply_permalink( $forum_id = 0 ) {
 	/**
 	 * Return the link to the last reply in a forum
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1155,7 +1156,7 @@ function bbp_forum_last_reply_permalink( $forum_id = 0 ) {
 /**
  * Output the url to the last reply in a forum
  *
- * @since bbPress (r2683)
+ * @since 2.0.0 bbPress (r2683)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_last_reply_url() To get the forum last reply url
@@ -1166,7 +1167,7 @@ function bbp_forum_last_reply_url( $forum_id = 0 ) {
 	/**
 	 * Return the url to the last reply in a forum
 	 *
-	 * @since bbPress (r2683)
+	 * @since 2.0.0 bbPress (r2683)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1203,7 +1204,7 @@ function bbp_forum_last_reply_url( $forum_id = 0 ) {
 /**
  * Output author ID of last reply of forum
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_last_reply_author_id() To get the forum's last reply
@@ -1215,7 +1216,7 @@ function bbp_forum_last_reply_author_id( $forum_id = 0 ) {
 	/**
 	 * Return author ID of last reply of forum
 	 *
-	 * @since bbPress (r2625)
+	 * @since 2.0.0 bbPress (r2625)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1237,7 +1238,7 @@ function bbp_forum_last_reply_author_id( $forum_id = 0 ) {
 /**
  * Output link to author of last reply of forum
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_last_reply_author_link() To get the forum's last reply's
@@ -1249,7 +1250,7 @@ function bbp_forum_last_reply_author_link( $forum_id = 0 ) {
 	/**
 	 * Return link to author of last reply of forum
 	 *
-	 * @since bbPress (r2625)
+	 * @since 2.0.0 bbPress (r2625)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1274,7 +1275,7 @@ function bbp_forum_last_reply_author_link( $forum_id = 0 ) {
 /**
  * Output the topics link of the forum
  *
- * @since bbPress (r2883)
+ * @since 2.0.0 bbPress (r2883)
  *
  * @param int $forum_id Optional. Topic id
  * @uses bbp_get_forum_topics_link() To get the forum topics link
@@ -1286,7 +1287,7 @@ function bbp_forum_topics_link( $forum_id = 0 ) {
 	/**
 	 * Return the topics link of the forum
 	 *
-	 * @since bbPress (r2883)
+	 * @since 2.0.0 bbPress (r2883)
 	 *
 	 * @param int $forum_id Optional. Topic id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1338,7 +1339,7 @@ function bbp_forum_topics_link( $forum_id = 0 ) {
 /**
  * Output total sub-forum count of a forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id to check
  * @param boolean $integer Optional. Whether or not to format the result
@@ -1350,7 +1351,7 @@ function bbp_forum_subforum_count( $forum_id = 0, $integer = false ) {
 	/**
 	 * Return total subforum count of a forum
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @param boolean $integer Optional. Whether or not to format the result
@@ -1371,7 +1372,7 @@ function bbp_forum_subforum_count( $forum_id = 0, $integer = false ) {
 /**
  * Output total topic count of a forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $total_count Optional. To get the total count or normal count?
@@ -1384,7 +1385,7 @@ function bbp_forum_topic_count( $forum_id = 0, $total_count = true, $integer = f
 	/**
 	 * Return total topic count of a forum
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @param bool $total_count Optional. To get the total count or normal
@@ -1408,7 +1409,7 @@ function bbp_forum_topic_count( $forum_id = 0, $total_count = true, $integer = f
 /**
  * Output total reply count of a forum
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $total_count Optional. To get the total count or normal count?
@@ -1421,7 +1422,7 @@ function bbp_forum_reply_count( $forum_id = 0, $total_count = true, $integer = f
 	/**
 	 * Return total post count of a forum
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @param bool $total_count Optional. To get the total count or normal
@@ -1445,7 +1446,7 @@ function bbp_forum_reply_count( $forum_id = 0, $total_count = true, $integer = f
 /**
  * Output total post count of a forum
  *
- * @since bbPress (r2954)
+ * @since 2.0.0 bbPress (r2954)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $total_count Optional. To get the total count or normal count?
@@ -1458,7 +1459,7 @@ function bbp_forum_post_count( $forum_id = 0, $total_count = true, $integer = fa
 	/**
 	 * Return total post count of a forum
 	 *
-	 * @since bbPress (r2954)
+	 * @since 2.0.0 bbPress (r2954)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @param bool $total_count Optional. To get the total count or normal
@@ -1485,7 +1486,7 @@ function bbp_forum_post_count( $forum_id = 0, $total_count = true, $integer = fa
  * Output total hidden topic count of a forum (hidden includes trashed, spammed,
  * and pending topics)
  *
- * @since bbPress (r2883)
+ * @since 2.0.0 bbPress (r2883)
  *
  * @param int $forum_id Optional. Topic id
  * @param boolean $integer Optional. Whether or not to format the result
@@ -1498,7 +1499,7 @@ function bbp_forum_topic_count_hidden( $forum_id = 0, $integer = false ) {
 	 * Return total hidden topic count of a forum (hidden includes trashed,
 	 * spammed and pending topics)
 	 *
-	 * @since bbPress (r2883)
+	 * @since 2.0.0 bbPress (r2883)
 	 *
 	 * @param int $forum_id Optional. Topic id
 	 * @param boolean $integer Optional. Whether or not to format the result
@@ -1519,7 +1520,7 @@ function bbp_forum_topic_count_hidden( $forum_id = 0, $integer = false ) {
 /**
  * Output the status of the forum
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_status() To get the forum status
@@ -1530,7 +1531,7 @@ function bbp_forum_status( $forum_id = 0 ) {
 	/**
 	 * Return the status of the forum
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1553,7 +1554,7 @@ function bbp_forum_status( $forum_id = 0 ) {
 /**
  * Output the visibility of the forum
  *
- * @since bbPress (r2997)
+ * @since 2.0.0 bbPress (r2997)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_visibility() To get the forum visibility
@@ -1564,7 +1565,7 @@ function bbp_forum_visibility( $forum_id = 0 ) {
 	/**
 	 * Return the visibility of the forum
 	 *
-	 * @since bbPress (r2997)
+	 * @since 2.0.0 bbPress (r2997)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1583,7 +1584,7 @@ function bbp_forum_visibility( $forum_id = 0 ) {
 /**
  * Output the type of the forum
  *
- * @since bbPress (r3563)
+ * @since 2.1.0 bbPress (r3563)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_type() To get the forum type
@@ -1594,7 +1595,7 @@ function bbp_forum_type( $forum_id = 0 ) {
 	/**
 	 * Return the type of forum (category/forum/etc...)
 	 *
-	 * @since bbPress (r3563)
+	 * @since 2.1.0 bbPress (r3563)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses get_post_meta() To get the forum category meta
@@ -1614,7 +1615,7 @@ function bbp_forum_type( $forum_id = 0 ) {
 /**
  * Is the forum a category?
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_type() To get the forum type
@@ -1631,7 +1632,7 @@ function bbp_is_forum_category( $forum_id = 0 ) {
 /**
  * Is the forum open?
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $check_ancestors Check if the ancestors are open (only
@@ -1646,7 +1647,7 @@ function bbp_is_forum_open( $forum_id = 0, $check_ancestors = true ) {
 /**
 * Is the forum closed?
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $check_ancestors Check if the ancestors are closed (only
@@ -1669,7 +1670,7 @@ function bbp_is_forum_closed( $forum_id = 0, $check_ancestors = true ) {
 /**
  * Check if the forum status is a specific one, also maybe checking ancestors
  *
- * @since bbPress (r5499)
+ * @since 2.6.0 bbPress (r5499)
  *
  * @param bool $status_name The forum status name to check
  * @param bool $check_ancestors Check the forum ancestors
@@ -1743,7 +1744,7 @@ function bbp_is_forum_status( $forum_id, $status_name, $check_ancestors = true,
 /**
  * Is the forum public?
  *
- * @since bbPress (r2997)
+ * @since 2.0.0 bbPress (r2997)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $check_ancestors Check if the ancestors are public
@@ -1765,7 +1766,7 @@ function bbp_is_forum_public( $forum_id = 0, $check_ancestors = true ) {
 /**
  * Is the forum private?
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $check_ancestors Check if the ancestors are private
@@ -1787,7 +1788,7 @@ function bbp_is_forum_private( $forum_id = 0, $check_ancestors = true ) {
 /**
  * Is the forum hidden?
  *
- * @since bbPress (r2997)
+ * @since 2.0.0 bbPress (r2997)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $check_ancestors Check if the ancestors are private (only if
@@ -1810,7 +1811,7 @@ function bbp_is_forum_hidden( $forum_id = 0, $check_ancestors = true ) {
 /**
  * Check the forum visibility ID
  *
- * @since bbPress (r5499)
+ * @since 2.6.0 bbPress (r5499)
  *
  * @param int $forum_id Optional. Forum id
  * @param bool $status_name The post status name to check
@@ -1887,7 +1888,7 @@ function bbp_is_forum_visibility( $forum_id, $status_name, $check_ancestors = tr
 /**
  * Output the author ID of the forum
  *
- * @since bbPress (r3675)
+ * @since 2.1.0 bbPress (r3675)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_author_id() To get the forum author id
@@ -1898,7 +1899,7 @@ function bbp_forum_author_id( $forum_id = 0 ) {
 	/**
 	 * Return the author ID of the forum
 	 *
-	 * @since bbPress (r3675)
+	 * @since 2.1.0 bbPress (r3675)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1917,7 +1918,7 @@ function bbp_forum_author_id( $forum_id = 0 ) {
 /**
  * Output the author of the forum
  *
- * @since bbPress (r3675)
+ * @since 2.1.0 bbPress (r3675)
  *
  * @param int $forum_id Optional. Forum id
  * @uses bbp_get_forum_author() To get the forum author
@@ -1928,7 +1929,7 @@ function bbp_forum_author_display_name( $forum_id = 0 ) {
 	/**
 	 * Return the author of the forum
 	 *
-	 * @since bbPress (r3675)
+	 * @since 2.1.0 bbPress (r3675)
 	 *
 	 * @param int $forum_id Optional. Forum id
 	 * @uses bbp_get_forum_id() To get the forum id
@@ -1949,7 +1950,7 @@ function bbp_forum_author_display_name( $forum_id = 0 ) {
 /**
  * Replace forum meta details for users that cannot view them.
  *
- * @since bbPress (r3162)
+ * @since 2.0.0 bbPress (r3162)
  *
  * @param string $retval
  * @param int $forum_id
@@ -1970,7 +1971,7 @@ function bbp_suppress_private_forum_meta( $retval, $forum_id ) {
 /**
  * Replace forum author details for users that cannot view them.
  *
- * @since bbPress (r3162)
+ * @since 2.0.0 bbPress (r3162)
  *
  * @param string $author_link
  * @param array $args
@@ -2030,7 +2031,7 @@ function bbp_suppress_private_author_link( $author_link = '', $args = array() )
 /**
  * Output the row class of a forum
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $forum_id Optional. Forum ID.
  * @param array Extra classes you can pass when calling this function
@@ -2042,7 +2043,7 @@ function bbp_forum_class( $forum_id = 0, $classes = array() ) {
 	/**
 	 * Return the row class of a forum
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $forum_id Optional. Forum ID
 	 * @param array Extra classes you can pass when calling this function
@@ -2087,7 +2088,7 @@ function bbp_forum_class( $forum_id = 0, $classes = array() ) {
  * Output a fancy description of the current forum, including total topics,
  * total replies, and last activity.
  *
- * @since bbPress (r2860)
+ * @since 2.0.0 bbPress (r2860)
  *
  * @param array $args Arguments passed to alter output
  * @uses bbp_get_single_forum_description() Return the eventual output
@@ -2099,7 +2100,7 @@ function bbp_single_forum_description( $args = array() ) {
 	 * Return a fancy description of the current forum, including total
 	 * topics, total replies, and last activity.
 	 *
-	 * @since bbPress (r2860)
+	 * @since 2.0.0 bbPress (r2860)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - forum_id: Forum id
@@ -2222,7 +2223,7 @@ function bbp_single_forum_description( $args = array() ) {
 /**
  * Output the unique id of the forum moderators taxonomy
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @uses bbp_get_forum_mod_tax_id() To get the forum modorator taxonomy ID
  */
@@ -2232,7 +2233,7 @@ function bbp_forum_mod_tax_id() {
 	/**
 	 * Return the unique id of the forum moderators taxonomy
 	 *
-	 * @since bbPress (r5834)
+	 * @since 2.6.0 bbPress (r5834)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_forum_mod_tax_id' with the forum
 	 *                        moderator taxonomy id
@@ -2245,7 +2246,7 @@ function bbp_forum_mod_tax_id() {
 /**
  * Return array of labels used by the forum-mod taxonomy
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @uses apply_filters() Calls 'bbp_get_forum_mod_tax_id' with the forum
  *                        moderator taxonomy labels
@@ -2270,7 +2271,7 @@ function bbp_get_forum_mod_tax_labels() {
 /**
  * Output a the moderators of a forum
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @param int   $forum_id Optional. Topic id
  * @param array $args     See {@link bbp_get_forum_mod_list()}
@@ -2282,7 +2283,7 @@ function bbp_forum_mod_list( $forum_id = 0, $args = array() ) {
 	/**
 	 * Return the moderators of a forum
 	 *
-	 * @since bbPress (r5834)
+	 * @since 2.6.0 bbPress (r5834)
 	 *
 	 * @param int   $forum_id Optional. Forum id
 	 * @param array $args     This function supports these arguments:
@@ -2350,7 +2351,7 @@ function bbp_forum_mod_list( $forum_id = 0, $args = array() ) {
 /**
  * Output the value of forum title field
  *
- * @since bbPress (r3551)
+ * @since 2.1.0 bbPress (r3551)
  *
  * @uses bbp_get_form_forum_title() To get the value of forum title field
  */
@@ -2360,7 +2361,7 @@ function bbp_form_forum_title() {
 	/**
 	 * Return the value of forum title field
 	 *
-	 * @since bbPress (r3551)
+	 * @since 2.1.0 bbPress (r3551)
 	 *
 	 * @uses bbp_is_forum_edit() To check if it's forum edit page
 	 * @uses apply_filters() Calls 'bbp_get_form_forum_title' with the title
@@ -2387,7 +2388,7 @@ function bbp_form_forum_title() {
 /**
  * Output the value of forum content field
  *
- * @since bbPress (r3551)
+ * @since 2.1.0 bbPress (r3551)
  *
  * @uses bbp_get_form_forum_content() To get value of forum content field
  */
@@ -2397,7 +2398,7 @@ function bbp_form_forum_content() {
 	/**
 	 * Return the value of forum content field
 	 *
-	 * @since bbPress (r3551)
+	 * @since 2.1.0 bbPress (r3551)
 	 *
 	 * @uses bbp_is_forum_edit() To check if it's the forum edit page
 	 * @uses apply_filters() Calls 'bbp_get_form_forum_content' with the content
@@ -2424,7 +2425,7 @@ function bbp_form_forum_content() {
 /**
  * Output value of forum parent
  *
- * @since bbPress (r3551)
+ * @since 2.1.0 bbPress (r3551)
  *
  * @uses bbp_get_form_forum_parent() To get the topic's forum id
  */
@@ -2434,7 +2435,7 @@ function bbp_form_forum_parent() {
 	/**
 	 * Return value of forum parent
 	 *
-	 * @since bbPress (r3551)
+	 * @since 2.1.0 bbPress (r3551)
 	 *
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
 	 * @uses bbp_get_forum_parent_id() To get the topic forum id
@@ -2462,7 +2463,7 @@ function bbp_form_forum_parent() {
 /**
  * Output value of forum type
  *
- * @since bbPress (r3563)
+ * @since 2.1.0 bbPress (r3563)
  *
  * @uses bbp_get_form_forum_type() To get the topic's forum id
  */
@@ -2472,7 +2473,7 @@ function bbp_form_forum_type() {
 	/**
 	 * Return value of forum type
 	 *
-	 * @since bbPress (r3563)
+	 * @since 2.1.0 bbPress (r3563)
 	 *
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
 	 * @uses bbp_get_forum_type_id() To get the topic forum id
@@ -2500,7 +2501,7 @@ function bbp_form_forum_type() {
 /**
  * Output value of forum visibility
  *
- * @since bbPress (r3563)
+ * @since 2.1.0 bbPress (r3563)
  *
  * @uses bbp_get_form_forum_visibility() To get the topic's forum id
  */
@@ -2510,7 +2511,7 @@ function bbp_form_forum_visibility() {
 	/**
 	 * Return value of forum visibility
 	 *
-	 * @since bbPress (r3563)
+	 * @since 2.1.0 bbPress (r3563)
 	 *
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
 	 * @uses bbp_get_forum_visibility_id() To get the topic forum id
@@ -2538,7 +2539,7 @@ function bbp_form_forum_visibility() {
 /**
  * Output checked value of forum subscription
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @uses bbp_get_form_forum_subscribed() To get the subscribed checkbox value
  */
@@ -2548,7 +2549,7 @@ function bbp_form_forum_subscribed() {
 	/**
 	 * Return checked value of forum subscription
 	 *
-	 * @since bbPress (r5156)
+	 * @since 2.5.0 bbPress (r5156)
 	 *
 	 * @uses bbp_is_forum_edit() To check if it's the forum edit page
 	 * @uses bbp_get_global_post_field() To get current post author
@@ -2600,7 +2601,7 @@ function bbp_form_forum_subscribed() {
 /**
  * Output value forum type dropdown
  *
- * @since bbPress (r3563)
+ * @since 2.1.0 bbPress (r3563)
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_forum_type
@@ -2615,7 +2616,7 @@ function bbp_form_forum_type_dropdown( $args = array() ) {
 	/**
 	 * Return the forum type dropdown
 	 *
-	 * @since bbPress (r3563)
+	 * @since 2.1.0 bbPress (r3563)
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_forum_type
@@ -2692,7 +2693,7 @@ function bbp_form_forum_type_dropdown( $args = array() ) {
 /**
  * Output value forum status dropdown
  *
- * @since bbPress (r3563)
+ * @since 2.1.0 bbPress (r3563)
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_forum_status
@@ -2707,7 +2708,7 @@ function bbp_form_forum_status_dropdown( $args = array() ) {
 	/**
 	 * Return the forum status dropdown
 	 *
-	 * @since bbPress (r3563)
+	 * @since 2.1.0 bbPress (r3563)
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_forum_status
@@ -2784,7 +2785,7 @@ function bbp_form_forum_status_dropdown( $args = array() ) {
 /**
  * Output value forum visibility dropdown
  *
- * @since bbPress (r3563)
+ * @since 2.1.0 bbPress (r3563)
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_forum_visibility
@@ -2799,7 +2800,7 @@ function bbp_form_forum_visibility_dropdown( $args = array() ) {
 	/**
 	 * Return the forum visibility dropdown
 	 *
-	 * @since bbPress (r3563)
+	 * @since 2.1.0 bbPress (r3563)
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_forum_visibility
@@ -2881,7 +2882,8 @@ function bbp_form_forum_visibility_dropdown( $args = array() ) {
  *
  * @see bbp_forum_form_fields()
  *
- * @since bbPress (r5558)
+ * @since 2.6.0 bbPress (r5558)
+ *
  * @return boolean True if is a post request with valid nonce
  */
 function bbp_is_forum_form_post_request() {
@@ -2909,7 +2911,7 @@ function bbp_is_forum_form_post_request() {
 /**
  * Output the link for the forum feed
  *
- * @since bbPress (r3172)
+ * @since 2.0.0 bbPress (r3172)
  *
  * @param type $forum_id Optional. Forum ID.
  *
@@ -2921,7 +2923,7 @@ function bbp_forum_topics_feed_link( $forum_id = 0 ) {
 	/**
 	 * Retrieve the link for the forum feed
 	 *
-	 * @since bbPress (r3172)
+	 * @since 2.0.0 bbPress (r3172)
 	 *
 	 * @param int $forum_id Optional. Forum ID.
 	 *
@@ -2971,7 +2973,7 @@ function bbp_forum_topics_feed_link( $forum_id = 0 ) {
 /**
  * Output the link for the forum replies feed
  *
- * @since bbPress (r3172)
+ * @since 2.0.0 bbPress (r3172)
  *
  * @param type $forum_id Optional. Forum ID.
  *
@@ -2983,7 +2985,7 @@ function bbp_forum_replies_feed_link( $forum_id = 0 ) {
 	/**
 	 * Retrieve the link for the forum replies feed
 	 *
-	 * @since bbPress (r3172)
+	 * @since 2.0.0 bbPress (r3172)
 	 *
 	 * @param int $forum_id Optional. Forum ID.
 	 *
diff --git src/includes/replies/capabilities.php src/includes/replies/capabilities.php
index 1f1c3a9..ed22cbe 100644
--- src/includes/replies/capabilities.php
+++ src/includes/replies/capabilities.php
@@ -12,7 +12,7 @@
 /**
  * Return reply capabilities
  *
- * @since bbPress (r2593)
+ * @since 2.0.0 bbPress (r2593)
  *
  * @uses apply_filters() Calls 'bbp_get_reply_caps' with the capabilities
  * @return array Reply capabilities
@@ -31,7 +31,7 @@ function bbp_get_reply_caps() {
 /**
  * Maps topic capabilities
  *
- * @since bbPress (r4242)
+ * @since 2.2.0 bbPress (r4242)
  *
  * @param array $caps Capabilities for meta capability
  * @param string $cap Capability name
diff --git src/includes/replies/functions.php src/includes/replies/functions.php
index 36b49bf..a6ebae6 100644
--- src/includes/replies/functions.php
+++ src/includes/replies/functions.php
@@ -16,7 +16,7 @@ defined( 'ABSPATH' ) || exit;
  * A wrapper for wp_insert_post() that also includes the necessary meta values
  * for the reply to function properly.
  *
- * @since bbPress (r3349)
+ * @since 2.0.0 bbPress (r3349)
  *
  * @uses bbp_parse_args()
  * @uses bbp_get_reply_post_type()
@@ -74,7 +74,7 @@ function bbp_insert_reply( $reply_data = array(), $reply_meta = array() ) {
 /**
  * Handles the front end reply submission
  *
- * @since bbPress (r2574)
+ * @since 2.0.0 bbPress (r2574)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_add_error() To add an error message
@@ -884,7 +884,7 @@ function bbp_update_reply( $reply_id = 0, $topic_id = 0, $forum_id = 0, $anonymo
 /**
  * Walk up the ancestor tree from the current reply, and update all the counts
  *
- * @since bbPress (r2884)
+ * @since 2.0.0 bbPress (r2884)
  *
  * @param int $reply_id Optional. Reply id
  * @param string $last_active_time Optional. Last active time
@@ -1014,7 +1014,7 @@ function bbp_update_reply_walker( $reply_id, $last_active_time = '', $forum_id =
 /**
  * Update the reply with its forum id it is in
  *
- * @since bbPress (r2855)
+ * @since 2.0.0 bbPress (r2855)
  *
  * @param int $reply_id Optional. Reply id to update
  * @param int $forum_id Optional. Forum id
@@ -1063,7 +1063,7 @@ function bbp_update_reply_forum_id( $reply_id = 0, $forum_id = 0 ) {
 /**
  * Update the reply with its topic id it is in
  *
- * @since bbPress (r2855)
+ * @since 2.0.0 bbPress (r2855)
  *
  * @param int $reply_id Optional. Reply id to update
  * @param int $topic_id Optional. Topic id
@@ -1112,7 +1112,7 @@ function bbp_update_reply_topic_id( $reply_id = 0, $topic_id = 0 ) {
 /*
  * Update the reply's meta data with its reply to id
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @param int $reply_id Reply id to update
  * @param int $reply_to Optional. Reply to id
@@ -1150,7 +1150,7 @@ function bbp_update_reply_to( $reply_id = 0, $reply_to = 0 ) {
  * Because settings can be changed, this function does not care if hierarchical
  * replies are active or to what depth.
  *
- * @since bbPress (r5390)
+ * @since 2.6.0 bbPress (r5390)
  *
  * @param int $reply_id
  * @return array
@@ -1196,7 +1196,7 @@ function bbp_get_reply_ancestors( $reply_id = 0 ) {
 /**
  * Update the revision log of the reply
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param array $args Supports these args:
  *  - reply_id: reply id
@@ -1240,7 +1240,7 @@ function bbp_update_reply_revision_log( $args = array() ) {
  *
  * Handles the front end move reply submission
  *
- * @since bbPress (r4521)
+ * @since 2.3.0 bbPress (r4521)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_add_error() To add an error message
@@ -1496,7 +1496,7 @@ function bbp_move_reply_handler( $action = '' ) {
  * When a reply is moved, update the counts of source and destination topic
  * and their forums.
  *
- * @since bbPress (r4521)
+ * @since 2.3.0 bbPress (r4521)
  *
  * @param int $move_reply_id Move reply id
  * @param int $source_topic_id Source topic id
@@ -1539,7 +1539,7 @@ function bbp_move_reply_count( $move_reply_id, $source_topic_id, $destination_to
  * Handles the front end spamming/unspamming and trashing/untrashing/deleting of
  * replies
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_get_reply() To get the reply
@@ -1693,7 +1693,7 @@ function bbp_toggle_reply_handler( $action = '' ) {
 /**
  * Return an associative array of available reply statuses
  *
- * @since bbPress (r5399)
+ * @since 2.6.0 bbPress (r5399)
  *
  * @return array
  */
@@ -1711,7 +1711,7 @@ function bbp_get_reply_statuses() {
 /**
  * Marks a reply as spam
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $reply_id Reply id
  * @uses bbp_get_reply() To get the reply
@@ -1759,7 +1759,7 @@ function bbp_spam_reply( $reply_id = 0 ) {
 /**
  * Unspams a reply
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $reply_id Reply id
  * @uses bbp_get_reply() To get the reply
@@ -1813,7 +1813,7 @@ function bbp_unspam_reply( $reply_id = 0 ) {
 /**
  * Approves a reply
  *
- * @since bbPress (r5506)
+ * @since 2.6.0 bbPress (r5506)
  *
  * @param int $reply_id Reply id
  * @uses bbp_get_reply() To get the reply
@@ -1860,7 +1860,7 @@ function bbp_approve_reply( $reply_id = 0 ) {
 /**
  * Unapproves a reply
  *
- * @since bbPress (r5506)
+ * @since 2.6.0 bbPress (r5506)
  *
  * @param int $reply_id Reply id
  * @uses bbp_get_reply() To get the reply
@@ -2014,7 +2014,7 @@ function bbp_untrashed_reply( $reply_id = 0 ) {
 /**
  * Return the replies per page setting
  *
- * @since bbPress (r3540)
+ * @since 2.0.0 bbPress (r3540)
  *
  * @param int $default Default replies per page (15)
  * @uses get_option() To get the setting
@@ -2038,7 +2038,7 @@ function bbp_get_replies_per_page( $default = 15 ) {
 /**
  * Return the replies per RSS page setting
  *
- * @since bbPress (r3540)
+ * @since 2.0.0 bbPress (r3540)
  *
  * @param int $default Default replies per page (25)
  * @uses get_option() To get the setting
@@ -2064,7 +2064,8 @@ function bbp_get_replies_per_rss_page( $default = 25 ) {
 /**
  * Check if autoembeds are enabled and hook them in if so
  *
- * @since bbPress (r3752)
+ * @since 2.1.0 bbPress (r3752)
+ *
  * @global WP_Embed $wp_embed
  */
 function bbp_reply_content_autoembed() {
@@ -2083,7 +2084,7 @@ function bbp_reply_content_autoembed() {
  * This function filters the 'post_where' of the WP_Query, and changes the query
  * to include both the topic AND its children in the same loop.
  *
- * @since bbPress (r4058)
+ * @since 2.1.0 bbPress (r4058)
  *
  * @param string $where
  * @return string
@@ -2148,7 +2149,7 @@ function _bbp_has_replies_where( $where = '', $query = false ) {
 /**
  * Output an RSS2 feed of replies, based on the query passed.
  *
- * @since bbPress (r3171)
+ * @since 2.0.0 bbPress (r3171)
  *
  * @uses bbp_version()
  * @uses bbp_is_single_topic()
@@ -2287,7 +2288,7 @@ function bbp_display_replies_feed_rss2( $replies_query = array() ) {
 /**
  * Redirect if unathorized user is attempting to edit a reply
  *
- * @since bbPress (r3605)
+ * @since 2.1.0 bbPress (r3605)
  *
  * @uses bbp_is_reply_edit()
  * @uses current_user_can()
@@ -2318,7 +2319,7 @@ function bbp_check_reply_edit() {
  * freshness order. By updating the menu_order accordingly, we're able to
  * leverage core WordPress query ordering much more effectively.
  *
- * @since bbPress (r3933)
+ * @since 2.1.0 bbPress (r3933)
  *
  * @param int $reply_id
  * @param int $reply_position
@@ -2363,7 +2364,7 @@ function bbp_update_reply_position( $reply_id = 0, $reply_position = 0 ) {
  * Get the position of a reply by querying the DB directly for the replies
  * of a given topic.
  *
- * @since bbPress (r3933)
+ * @since 2.1.0 bbPress (r3933)
  *
  * @param int $reply_id
  * @param int $topic_id
@@ -2404,7 +2405,7 @@ function bbp_get_reply_position_raw( $reply_id = 0, $topic_id = 0 ) {
 /**
  * List replies
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  */
 function bbp_list_replies( $args = array() ) {
 
@@ -2442,7 +2443,7 @@ function bbp_list_replies( $args = array() ) {
  * @see https://bbpress.trac.wordpress.org/ticket/2588
  * @see https://bbpress.trac.wordpress.org/ticket/2586
  *
- * @since bbPress (r5377)
+ * @since 2.5.4 bbPress (r5377)
  *
  * @param int $reply_to
  * @param int $reply_id
diff --git src/includes/replies/template.php src/includes/replies/template.php
index 754706f..925ff91 100644
--- src/includes/replies/template.php
+++ src/includes/replies/template.php
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Return the unique id of the custom post type for replies
  *
- * @since bbPress (r2857)
+ * @since 2.0.0 bbPress (r2857)
  *
  * @uses bbp_get_reply_post_type() To get the reply post type
  */
@@ -25,7 +25,7 @@ function bbp_reply_post_type() {
 	/**
 	 * Return the unique id of the custom post type for replies
 	 *
-	 * @since bbPress (r2857)
+	 * @since 2.0.0 bbPress (r2857)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_forum_post_type' with the forum
 	 *                        post type id
@@ -38,7 +38,7 @@ function bbp_reply_post_type() {
 /**
  * Return array of labels used by the reply post type
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -65,7 +65,7 @@ function bbp_get_reply_post_type_labels() {
 /**
  * Return array of reply post type rewrite settings
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -79,7 +79,7 @@ function bbp_get_reply_post_type_rewrite() {
 /**
  * Return array of features the reply post type supports
  *
- * @since bbPress (rx5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -96,7 +96,7 @@ function bbp_get_reply_post_type_supports() {
 /**
  * The main reply loop. WordPress makes this easy for us
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @param array $args All the arguments supported by {@link WP_Query}
  * @uses bbp_show_lead_topic() Are we showing the topic as a lead?
@@ -285,7 +285,7 @@ function bbp_has_replies( $args = array() ) {
 /**
  * Whether there are more replies available in the loop
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @uses WP_Query bbPress::reply_query::have_posts() To check if there are more
  *                                                    replies available
@@ -307,7 +307,7 @@ function bbp_replies() {
 /**
  * Loads up the current reply in the loop
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @uses WP_Query bbPress::reply_query::the_post() To get the current reply
  * @return object Reply information
@@ -319,7 +319,7 @@ function bbp_the_reply() {
 /**
  * Output reply id
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @param $reply_id Optional. Used to check emptiness
  * @uses bbp_get_reply_id() To get the reply id
@@ -330,7 +330,7 @@ function bbp_reply_id( $reply_id = 0 ) {
 	/**
 	 * Return the id of the reply in a replies loop
 	 *
-	 * @since bbPress (r2553)
+	 * @since 2.0.0 bbPress (r2553)
 	 *
 	 * @param $reply_id Optional. Used to check emptiness
 	 * @uses bbPress::reply_query::post::ID To get the reply id
@@ -380,7 +380,7 @@ function bbp_reply_id( $reply_id = 0 ) {
 /**
  * Gets a reply
  *
- * @since bbPress (r2787)
+ * @since 2.0.0 bbPress (r2787)
  *
  * @param int|object $reply reply id or reply object
  * @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N. Default = OBJECT
@@ -423,7 +423,7 @@ function bbp_get_reply( $reply, $output = OBJECT, $filter = 'raw' ) {
 /**
  * Output the link to the reply in the reply loop
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_permalink() To get the reply permalink
@@ -434,7 +434,7 @@ function bbp_reply_permalink( $reply_id = 0 ) {
 	/**
 	 * Return the link to the reply
 	 *
-	 * @since bbPress (r2553)
+	 * @since 2.0.0 bbPress (r2553)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -451,7 +451,7 @@ function bbp_reply_permalink( $reply_id = 0 ) {
 /**
  * Output the paginated url to the reply in the reply loop
  *
- * @since bbPress (r2679)
+ * @since 2.0.0 bbPress (r2679)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_url() To get the reply url
@@ -462,7 +462,7 @@ function bbp_reply_url( $reply_id = 0 ) {
 	/**
 	 * Return the paginated url to the reply in the reply loop
 	 *
-	 * @since bbPress (r2679)
+	 * @since 2.0.0 bbPress (r2679)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @param string $redirect_to Optional. Pass a redirect value for use with
@@ -525,7 +525,7 @@ function bbp_reply_url( $reply_id = 0 ) {
 /**
  * Output the title of the reply
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_title() To get the reply title
@@ -537,7 +537,7 @@ function bbp_reply_title( $reply_id = 0 ) {
 	/**
 	 * Return the title of the reply
 	 *
-	 * @since bbPress (r2553)
+	 * @since 2.0.0 bbPress (r2553)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -555,7 +555,7 @@ function bbp_reply_title( $reply_id = 0 ) {
 	/**
 	 * Get empty reply title fallback.
 	 *
-	 * @since bbPress (r5177)
+	 * @since 2.5.0 bbPress (r5177)
 	 *
 	 * @param string $post_title Required. Reply Title
 	 * @param int $post_id Required. Reply ID
@@ -582,7 +582,7 @@ function bbp_reply_title( $reply_id = 0 ) {
 /**
  * Output the content of the reply
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @param int $reply_id Optional. reply id
  * @uses bbp_get_reply_content() To get the reply content
@@ -593,7 +593,7 @@ function bbp_reply_content( $reply_id = 0 ) {
 	/**
 	 * Return the content of the reply
 	 *
-	 * @since bbPress (r2780)
+	 * @since 2.0.0 bbPress (r2780)
 	 *
 	 * @param int $reply_id Optional. reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -620,7 +620,7 @@ function bbp_reply_content( $reply_id = 0 ) {
 /**
  * Output the excerpt of the reply
  *
- * @since bbPress (r2751)
+ * @since 2.0.0 bbPress (r2751)
  *
  * @param int $reply_id Optional. Reply id
  * @param int $length Optional. Length of the excerpt. Defaults to 100 letters
@@ -632,7 +632,7 @@ function bbp_reply_excerpt( $reply_id = 0, $length = 100 ) {
 	/**
 	 * Return the excerpt of the reply
 	 *
-	 * @since bbPress (r2751)
+	 * @since 2.0.0 bbPress (r2751)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @param int $length Optional. Length of the excerpt. Defaults to 100
@@ -673,7 +673,7 @@ function bbp_reply_excerpt( $reply_id = 0, $length = 100 ) {
 /**
  * Output the post date and time of a reply
  *
- * @since bbPress (r4155)
+ * @since 2.2.0 bbPress (r4155)
  *
  * @param int $reply_id Optional. Reply id.
  * @param bool $humanize Optional. Humanize output using time_since
@@ -686,7 +686,7 @@ function bbp_reply_post_date( $reply_id = 0, $humanize = false, $gmt = false ) {
 	/**
 	 * Return the post date and time of a reply
 	 *
-	 * @since bbPress (r4155)
+	 * @since 2.2.0 bbPress (r4155)
 	 *
 	 * @param int $reply_id Optional. Reply id.
 	 * @param bool $humanize Optional. Humanize output using time_since
@@ -719,7 +719,7 @@ function bbp_reply_post_date( $reply_id = 0, $humanize = false, $gmt = false ) {
 /**
  * Append revisions to the reply content
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param string $content Optional. Content to which we need to append the revisions to
  * @param int $reply_id Optional. Reply id
@@ -744,7 +744,7 @@ function bbp_reply_content_append_revisions( $content = '', $reply_id = 0 ) {
 /**
  * Output the revision log of the reply
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_revision_log() To get the reply revision log
@@ -755,7 +755,7 @@ function bbp_reply_revision_log( $reply_id = 0 ) {
 	/**
 	 * Return the formatted revision log of the reply
 	 *
-	 * @since bbPress (r2782)
+	 * @since 2.0.0 bbPress (r2782)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -826,7 +826,7 @@ function bbp_reply_revision_log( $reply_id = 0 ) {
 		/**
 		 * Return the raw revision log of the reply
 		 *
-		 * @since bbPress (r2782)
+		 * @since 2.0.0 bbPress (r2782)
 		 *
 		 * @param int $reply_id Optional. Reply id
 		 * @uses bbp_get_reply_id() To get the reply id
@@ -846,7 +846,7 @@ function bbp_reply_revision_log( $reply_id = 0 ) {
 /**
  * Return the revisions of the reply
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_id() To get the reply id
@@ -865,7 +865,7 @@ function bbp_get_reply_revisions( $reply_id = 0 ) {
 /**
  * Return the revision count of the reply
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param int $reply_id Optional. Reply id
  * @param boolean $integer Optional. Whether or not to format the result
@@ -884,7 +884,7 @@ function bbp_get_reply_revision_count( $reply_id = 0, $integer = false ) {
 /**
  * Output the status of the reply
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_status() To get the reply status
@@ -895,7 +895,7 @@ function bbp_reply_status( $reply_id = 0 ) {
 	/**
 	 * Return the status of the reply
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -911,7 +911,7 @@ function bbp_reply_status( $reply_id = 0 ) {
 /**
  * Is the reply not spam or deleted?
  *
- * @since bbPress (r3496)
+ * @since 2.0.0 bbPress (r3496)
  *
  * @param int $reply_id Optional. Topic id
  * @uses bbp_get_reply_id() To get the reply id
@@ -926,7 +926,7 @@ function bbp_is_reply_published( $reply_id = 0 ) {
 /**
  * Is the reply marked as spam?
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_id() To get the reply id
@@ -941,7 +941,7 @@ function bbp_is_reply_spam( $reply_id = 0 ) {
 /**
  * Is the reply trashed?
  *
- * @since bbPress (r2884)
+ * @since 2.0.0 bbPress (r2884)
  *
  * @param int $reply_id Optional. Topic id
  * @uses bbp_get_reply_id() To get the reply id
@@ -956,7 +956,7 @@ function bbp_is_reply_trash( $reply_id = 0 ) {
 /**
  * Is the reply pending?
  *
- * @since bbPress (r5507)
+ * @since 2.6.0 bbPress (r5507)
  *
  * @param int $reply_id Optional. Topic id
  * @uses bbp_get_reply_id() To get the reply id
@@ -972,7 +972,7 @@ function bbp_is_reply_pending( $reply_id = 0 ) {
 /**
  * Is the reply private?
  *
- * @since bbPress (r5507)
+ * @since 2.6.0 bbPress (r5507)
  *
  * @param int $reply_id Optional. Topic id
  * @uses bbp_get_reply_id() To get the reply id
@@ -988,7 +988,7 @@ function bbp_is_reply_private( $reply_id = 0 ) {
 /**
  * Is the reply by an anonymous user?
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_id() To get the reply id
@@ -1018,8 +1018,9 @@ function bbp_is_reply_anonymous( $reply_id = 0 ) {
  *
  * Output the author of the reply
  *
- * @since bbPress (r2667)
- * @deprecated bbPress (r5119)
+ * @since 2.0.0 bbPress (r2667)
+ *
+ * @deprecated 2.5.0 bbPress (r5119)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_author() To get the reply author
@@ -1032,8 +1033,9 @@ function bbp_reply_author( $reply_id = 0 ) {
 	 *
 	 * Return the author of the reply
 	 *
-	 * @since bbPress (r2667)
-	 * @deprecated bbPress (r5119)
+	 * @since 2.0.0 bbPress (r2667)
+	 *
+	 * @deprecated 2.5.0 bbPress (r5119)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1060,7 +1062,7 @@ function bbp_reply_author( $reply_id = 0 ) {
 /**
  * Output the author ID of the reply
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_author_id() To get the reply author id
@@ -1071,7 +1073,7 @@ function bbp_reply_author_id( $reply_id = 0 ) {
 	/**
 	 * Return the author ID of the reply
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1090,7 +1092,7 @@ function bbp_reply_author_id( $reply_id = 0 ) {
 /**
  * Output the author display_name of the reply
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_author_display_name()
@@ -1101,7 +1103,7 @@ function bbp_reply_author_display_name( $reply_id = 0 ) {
 	/**
 	 * Return the author display_name of the reply
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1152,7 +1154,7 @@ function bbp_reply_author_display_name( $reply_id = 0 ) {
 /**
  * Output the author avatar of the reply
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $reply_id Optional. Reply id
  * @param int $size Optional. Size of the avatar. Defaults to 40
@@ -1164,7 +1166,7 @@ function bbp_reply_author_avatar( $reply_id = 0, $size = 40 ) {
 	/**
 	 * Return the author avatar of the reply
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @param int $size Optional. Size of the avatar. Defaults to 40
@@ -1197,7 +1199,7 @@ function bbp_reply_author_avatar( $reply_id = 0, $size = 40 ) {
 /**
  * Output the author link of the reply
  *
- * @since bbPress (r2717)
+ * @since 2.0.0 bbPress (r2717)
  *
  * @param array $args Optional. If it is an integer, it is used as reply id.
  * @uses bbp_get_reply_author_link() To get the reply author link
@@ -1208,7 +1210,7 @@ function bbp_reply_author_link( $args = array() ) {
 	/**
 	 * Return the author link of the reply
 	 *
-	 * @since bbPress (r2717)
+	 * @since 2.0.0 bbPress (r2717)
 	 *
 	 * @param array $args Optional. If an integer, it is used as reply id.
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1307,7 +1309,7 @@ function bbp_reply_author_link( $args = array() ) {
 /**
  * Output the author url of the reply
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_author_url() To get the reply author url
@@ -1318,7 +1320,7 @@ function bbp_reply_author_url( $reply_id = 0 ) {
 	/**
 	 * Return the author url of the reply
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1351,7 +1353,7 @@ function bbp_reply_author_url( $reply_id = 0 ) {
 /**
  * Output the reply author email address
  *
- * @since bbPress (r3445)
+ * @since 2.0.0 bbPress (r3445)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_author_email() To get the reply author email
@@ -1362,7 +1364,7 @@ function bbp_reply_author_email( $reply_id = 0 ) {
 	/**
 	 * Return the reply author email address
 	 *
-	 * @since bbPress (r3445)
+	 * @since 2.0.0 bbPress (r3445)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1404,7 +1406,7 @@ function bbp_reply_author_email( $reply_id = 0 ) {
 /**
  * Output the reply author role
  *
- * @since bbPress (r3860)
+ * @since 2.1.0 bbPress (r3860)
  *
  * @param array $args Optional.
  * @uses bbp_get_reply_author_role() To get the reply author role
@@ -1415,7 +1417,7 @@ function bbp_reply_author_role( $args = array() ) {
 	/**
 	 * Return the reply author role
 	 *
-	 * @since bbPress (r3860)
+	 * @since 2.1.0 bbPress (r3860)
 	 *
 	 * @param array $args Optional.
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1454,7 +1456,7 @@ function bbp_reply_author_role( $args = array() ) {
 /**
  * Output the topic title a reply belongs to
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_topic_title() To get the reply topic title
@@ -1465,7 +1467,7 @@ function bbp_reply_topic_title( $reply_id = 0 ) {
 	/**
 	 * Return the topic title a reply belongs to
 	 *
-	 * @since bbPress (r2553)
+	 * @since 2.0.0 bbPress (r2553)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1485,7 +1487,7 @@ function bbp_reply_topic_title( $reply_id = 0 ) {
 /**
  * Output the topic id a reply belongs to
  *
- * @since bbPress (r2553)
+ * @since 2.0.0 bbPress (r2553)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_topic_id() To get the reply topic id
@@ -1496,7 +1498,7 @@ function bbp_reply_topic_id( $reply_id = 0 ) {
 	/**
 	 * Return the topic id a reply belongs to
 	 *
-	 * @since bbPress (r2553)
+	 * @since 2.0.0 bbPress (r2553)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1526,7 +1528,7 @@ function bbp_reply_topic_id( $reply_id = 0 ) {
 /**
  * Output the forum id a reply belongs to
  *
- * @since bbPress (r2679)
+ * @since 2.0.0 bbPress (r2679)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_forum_id() To get the reply forum id
@@ -1537,7 +1539,7 @@ function bbp_reply_forum_id( $reply_id = 0 ) {
 	/**
 	 * Return the forum id a reply belongs to
 	 *
-	 * @since bbPress (r2679)
+	 * @since 2.0.0 bbPress (r2679)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1566,7 +1568,7 @@ function bbp_reply_forum_id( $reply_id = 0 ) {
 /**
  * Output the reply's ancestor reply id
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_ancestor_id() To get the reply's ancestor id
@@ -1577,7 +1579,7 @@ function bbp_reply_ancestor_id( $reply_id = 0 ) {
 	/**
 	 * Return the reply's ancestor reply id
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @param in $reply_id Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1605,7 +1607,7 @@ function bbp_reply_ancestor_id( $reply_id = 0 ) {
 /**
  * Output the reply to id of a reply
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_to() To get the reply to id
@@ -1616,7 +1618,7 @@ function bbp_reply_to( $reply_id = 0 ) {
 	/**
 	 * Return the reply to id of a reply
 	 *
- 	 * @since bbPress (r4944)
+ 	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -1644,7 +1646,7 @@ function bbp_reply_to( $reply_id = 0 ) {
 /**
  * Output the link for the reply to
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @param array $args
  * @uses bbp_get_reply_to_link() To get the reply to link
@@ -1656,7 +1658,7 @@ function bbp_reply_to_link( $args = array() ) {
 	/**
 	 * Return the link for a reply to a reply
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @param array $args Arguments
 	 * @uses bbp_current_user_can_access_create_reply_form() To check permissions
@@ -1722,7 +1724,7 @@ function bbp_reply_to_link( $args = array() ) {
 /**
  * Output the reply to a reply cancellation link
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @uses bbp_get_cancel_reply_to_link() To get the reply cancellation link
  */
@@ -1732,7 +1734,7 @@ function bbp_cancel_reply_to_link( $text = '' ) {
 	/**
 	 * Return the cancellation link for a reply to a reply
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @param string $text The cancel text
 	 * @uses apply_filters() Calls 'bbp_get_cancel_reply_to_link' with the cancellation
@@ -1764,7 +1766,7 @@ function bbp_cancel_reply_to_link( $text = '' ) {
 /**
  * Output the numeric position of a reply within a topic
  *
- * @since bbPress (r2984)
+ * @since 2.0.0 bbPress (r2984)
  *
  * @param int $reply_id Optional. Reply id
  * @param int $topic_id Optional. Topic id
@@ -1776,7 +1778,7 @@ function bbp_reply_position( $reply_id = 0, $topic_id = 0 ) {
 	/**
 	 * Return the numeric position of a reply within a topic
 	 *
-	 * @since bbPress (r2984)
+	 * @since 2.0.0 bbPress (r2984)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @param int $topic_id Optional. Topic id
@@ -1830,7 +1832,7 @@ function bbp_reply_position( $reply_id = 0, $topic_id = 0 ) {
 /**
  * Output admin links for reply
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param array $args See {@link bbp_get_reply_admin_links()}
  * @uses bbp_get_reply_admin_links() To get the reply admin links
@@ -1841,7 +1843,7 @@ function bbp_reply_admin_links( $args = array() ) {
 	/**
 	 * Return admin links for reply
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - id: Optional. Reply id
@@ -1930,7 +1932,7 @@ function bbp_reply_admin_links( $args = array() ) {
 /**
  * Output the edit link of the reply
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param array $args See {@link bbp_get_reply_edit_link()}
  * @uses bbp_get_reply_edit_link() To get the reply edit link
@@ -1942,7 +1944,7 @@ function bbp_reply_edit_link( $args = array() ) {
 	/**
 	 * Return the edit link of the reply
 	 *
-	 * @since bbPress (r2740)
+	 * @since 2.0.0 bbPress (r2740)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - id: Reply id
@@ -1995,7 +1997,7 @@ function bbp_reply_edit_link( $args = array() ) {
 /**
  * Output URL to the reply edit page
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
  *
  * @param int $reply_id Optional. Reply id
  * @uses bbp_get_reply_edit_url() To get the reply edit url
@@ -2006,7 +2008,7 @@ function bbp_reply_edit_url( $reply_id = 0 ) {
 	/**
 	 * Return URL to the reply edit page
 	 *
-	 * @since bbPress (r2753)
+	 * @since 2.0.0 bbPress (r2753)
 	 *
 	 * @param int $reply_id Optional. Reply id
 	 * @uses bbp_get_reply_id() To get the reply id
@@ -2048,7 +2050,7 @@ function bbp_reply_edit_url( $reply_id = 0 ) {
 /**
  * Output the trash link of the reply
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param array $args See {@link bbp_get_reply_trash_link()}
  * @uses bbp_get_reply_trash_link() To get the reply trash link
@@ -2060,7 +2062,7 @@ function bbp_reply_trash_link( $args = array() ) {
 	/**
 	 * Return the trash link of the reply
 	 *
-	 * @since bbPress (r2740)
+	 * @since 2.0.0 bbPress (r2740)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - id: Reply id
@@ -2124,7 +2126,7 @@ function bbp_reply_trash_link( $args = array() ) {
 /**
  * Output the spam link of the reply
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param array $args See {@link bbp_get_reply_spam_link()}
  * @uses bbp_get_reply_spam_link() To get the reply spam link
@@ -2136,7 +2138,7 @@ function bbp_reply_spam_link( $args = array() ) {
 	/**
 	 * Return the spam link of the reply
 	 *
-	 * @since bbPress (r2740)
+	 * @since 2.0.0 bbPress (r2740)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - id: Reply id
@@ -2187,7 +2189,7 @@ function bbp_reply_spam_link( $args = array() ) {
  *
  * Output the move link of the reply
  *
- * @since bbPress (r4521)
+ * @since 2.3.0 bbPress (r4521)
  *
  * @param array $args See {@link bbp_get_reply_move_link()}
  * @uses bbp_get_reply_move_link() To get the reply move link
@@ -2201,7 +2203,7 @@ function bbp_reply_move_link( $args = array() ) {
 	 *
 	 * Return the move link of the reply
 	 *
-	 * @since bbPress (r4521)
+	 * @since 2.3.0 bbPress (r4521)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - id: Reply id
@@ -2255,7 +2257,7 @@ function bbp_reply_move_link( $args = array() ) {
  *
  * Output the split link of the topic (but is bundled with each reply)
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @param array $args See {@link bbp_get_topic_split_link()}
  * @uses bbp_get_topic_split_link() To get the topic split link
@@ -2269,7 +2271,7 @@ function bbp_topic_split_link( $args = array() ) {
 	 *
 	 * Return the split link of the topic (but is bundled with each reply)
 	 *
-	 * @since bbPress (r2756)
+	 * @since 2.0.0 bbPress (r2756)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - id: Reply id
@@ -2321,7 +2323,7 @@ function bbp_topic_split_link( $args = array() ) {
 /**
  * Output the approve link of the reply
  *
- * @since bbPress (r5507)
+ * @since 2.6.0 bbPress (r5507)
  *
  * @param array $args See {@link bbp_get_reply_approve_link()}
  * @uses bbp_get_reply_approve_link() To get the reply approve link
@@ -2333,7 +2335,7 @@ function bbp_reply_approve_link( $args = array() ) {
 	/**
 	 * Return the approve link of the reply
 	 *
-	 * @since bbPress (r5507)
+	 * @since 2.6.0 bbPress (r5507)
 	 *
 	 * @param array $args This function supports these args:
 	 *  - id: Optional. Reply id
@@ -2382,7 +2384,7 @@ function bbp_reply_approve_link( $args = array() ) {
 /**
  * Output the row class of a reply
  *
- * @since bbPress (r2678)
+ * @since 2.0.0 bbPress (r2678)
  *
  * @param int $reply_id Optional. Reply ID
  * @param array Extra classes you can pass when calling this function
@@ -2394,7 +2396,7 @@ function bbp_reply_class( $reply_id = 0, $classes = array() ) {
 	/**
 	 * Return the row class of a reply
 	 *
-	 * @since bbPress (r2678)
+	 * @since 2.0.0 bbPress (r2678)
 	 *
 	 * @param int $reply_id Optional. Reply ID
 	 * @param array Extra classes you can pass when calling this function
@@ -2427,7 +2429,7 @@ function bbp_reply_class( $reply_id = 0, $classes = array() ) {
 /**
  * Output the topic pagination count
  *
- * @since bbPress (r2519)
+ * @since 2.0.0 bbPress (r2519)
  *
  * @uses bbp_get_topic_pagination_count() To get the topic pagination count
  */
@@ -2437,7 +2439,7 @@ function bbp_topic_pagination_count() {
 	/**
 	 * Return the topic pagination count
 	 *
-	 * @since bbPress (r2519)
+	 * @since 2.0.0 bbPress (r2519)
 	 *
 	 * @uses bbp_number_format() To format the number value
 	 * @uses bbp_show_lead_topic() Are we showing the topic as a lead?
@@ -2500,7 +2502,7 @@ function bbp_topic_pagination_count() {
 /**
  * Output topic pagination links
  *
- * @since bbPress (r2519)
+ * @since 2.0.0 bbPress (r2519)
  *
  * @uses bbp_get_topic_pagination_links() To get the topic pagination links
  */
@@ -2510,7 +2512,7 @@ function bbp_topic_pagination_links() {
 	/**
 	 * Return topic pagination links
 	 *
-	 * @since bbPress (r2519)
+	 * @since 2.0.0 bbPress (r2519)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_topic_pagination_links' with the
 	 *                        pagination links
@@ -2531,7 +2533,7 @@ function bbp_topic_pagination_links() {
 /**
  * Output the value of reply content field
  *
- * @since bbPress (r31301)
+ * @since 2.0.0 bbPress (r3130)
  *
  * @uses bbp_get_form_reply_content() To get value of reply content field
  */
@@ -2541,7 +2543,7 @@ function bbp_form_reply_content() {
 	/**
 	 * Return the value of reply content field
 	 *
-	 * @since bbPress (r31301)
+	 * @since 2.0.0 bbPress (r3130)
 	 *
 	 * @uses bbp_is_reply_edit() To check if it's the reply edit page
 	 * @uses apply_filters() Calls 'bbp_get_form_reply_content' with the content
@@ -2568,7 +2570,7 @@ function bbp_form_reply_content() {
 /**
  * Output the value of the reply to field
  *
- * @since bbPress (r4944)
+ * @since 2.4.0 bbPress (r4944)
  *
  * @uses bbp_get_form_reply_to() To get value of the reply to field
  */
@@ -2579,7 +2581,7 @@ function bbp_form_reply_to() {
 	/**
 	 * Return the value of reply to field
 	 *
-	 * @since bbPress (r4944)
+	 * @since 2.4.0 bbPress (r4944)
 	 *
 	 * @uses bbp_get_reply_id() To validate the reply to
 	 * @uses apply_filters() Calls 'bbp_get_form_reply_to' with the reply to
@@ -2607,7 +2609,7 @@ function bbp_form_reply_to() {
  * Output a select box allowing to pick which reply an existing hierarchical
  * reply belongs to.
  *
- * @since bbPress (r5387)
+ * @since 2.6.0 bbPress (r5387)
  *
  * @param int $reply_id
  */
@@ -2617,7 +2619,7 @@ function bbp_reply_to_dropdown( $reply_id = 0 ) {
 	/**
 	 * Return a select box allowing to pick which topic/reply a reply belongs.
 	 *
-	 * @since bbPress (r5387)
+	 * @since 2.6.0 bbPress (r5387)
 	 *
 	 * @param int $reply_id
 	 *
@@ -2691,7 +2693,7 @@ function bbp_reply_to_dropdown( $reply_id = 0 ) {
 /**
  * Output checked value of reply log edit field
  *
- * @since bbPress (r31301)
+ * @since 2.0.0 bbPress (r3130)
  *
  * @uses bbp_get_form_reply_log_edit() To get the reply log edit value
  */
@@ -2701,7 +2703,7 @@ function bbp_form_reply_log_edit() {
 	/**
 	 * Return checked value of reply log edit field
 	 *
-	 * @since bbPress (r31301)
+	 * @since 2.0.0 bbPress (r3130)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_form_reply_log_edit' with the
 	 *                        log edit value
@@ -2727,7 +2729,7 @@ function bbp_form_reply_log_edit() {
 /**
  * Output the value of the reply edit reason
  *
- * @since bbPress (r31301)
+ * @since 2.0.0 bbPress (r3130)
  *
  * @uses bbp_get_form_reply_edit_reason() To get the reply edit reason value
  */
@@ -2737,7 +2739,7 @@ function bbp_form_reply_edit_reason() {
 	/**
 	 * Return the value of the reply edit reason
 	 *
-	 * @since bbPress (r31301)
+	 * @since 2.0.0 bbPress (r3130)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_form_reply_edit_reason' with the
 	 *                        reply edit reason value
@@ -2760,7 +2762,7 @@ function bbp_form_reply_edit_reason() {
 /**
  * Output value reply status dropdown
  *
- * @since bbPress (r5399)
+ * @since 2.6.0 bbPress (r5399)
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_reply_status
@@ -2778,7 +2780,7 @@ function bbp_form_reply_status_dropdown( $args = array() ) {
 	 * capability. Because of this, no additional capablitiy checks are performed
 	 * within this function to check available reply statuses.
 	 *
-	 * @since bbPress (r5399)
+	 * @since 2.6.0 bbPress (r5399)
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_reply_status
@@ -2849,7 +2851,8 @@ function bbp_form_reply_status_dropdown( $args = array() ) {
  *
  * @see bbp_reply_form_fields()
  *
- * @since bbPress (r5558)
+ * @since 2.6.0 bbPress (r5558)
+ *
  * @return boolean True if is a post request with valid nonce
  */
 function bbp_is_reply_form_post_request() {
diff --git src/includes/search/functions.php src/includes/search/functions.php
index 0187a11..760fa9f 100644
--- src/includes/search/functions.php
+++ src/includes/search/functions.php
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Run the search query
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @param mixed $new_args New arguments
  * @uses bbp_get_search_query_args() To get the search query args
@@ -40,7 +40,7 @@ function bbp_search_query( $new_args = array() ) {
 /**
  * Return the search's query args
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses bbp_get_search_terms() To get the search terms
  * @return array Query arguments
@@ -57,7 +57,7 @@ function bbp_get_search_query_args() {
 /**
  * Redirect to search results page if needed
  *
- * @since bbPress (r4928)
+ * @since 2.4.0 bbPress (r4928)
  *
  * @return If a redirect is not needed
  */
diff --git src/includes/search/template.php src/includes/search/template.php
index 02c3cb1..25e4de3 100644
--- src/includes/search/template.php
+++ src/includes/search/template.php
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * The main search loop. WordPress does the heavy lifting.
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @param array $args All the arguments supported by {@link WP_Query}
  * @uses bbp_get_view_all() Are we showing all results?
@@ -166,7 +166,7 @@ function bbp_has_search_results( $args = array() ) {
 /**
  * Whether there are more search results available in the loop
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses WP_Query bbPress::search_query::have_posts() To check if there are more
  *                                                     search results available
@@ -188,7 +188,7 @@ function bbp_search_results() {
 /**
  * Loads up the current search result in the loop
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses WP_Query bbPress::search_query::the_post() To get the current search result
  * @return object Search information
@@ -207,7 +207,7 @@ function bbp_the_search_result() {
 /**
  * Output the search page title
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses bbp_get_search_title()
  */
@@ -218,7 +218,7 @@ function bbp_search_title() {
 	/**
 	 * Get the search page title
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @uses bbp_get_search_terms()
 	 */
@@ -242,7 +242,7 @@ function bbp_search_title() {
 /**
  * Output the search url
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses bbp_get_search_url() To get the search url
  */
@@ -252,7 +252,7 @@ function bbp_search_url() {
 	/**
 	 * Return the search url
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @uses user_trailingslashit() To fix slashes
 	 * @uses trailingslashit() To fix slashes
@@ -282,7 +282,7 @@ function bbp_search_url() {
 /**
  * Output the search results url
  *
- * @since bbPress (r4928)
+ * @since 2.4.0 bbPress (r4928)
  *
  * @uses bbp_get_search_url() To get the search url
  */
@@ -292,7 +292,7 @@ function bbp_search_results_url() {
 	/**
 	 * Return the search url
 	 *
-	 * @since bbPress (r4928)
+	 * @since 2.4.0 bbPress (r4928)
 	 *
 	 * @uses user_trailingslashit() To fix slashes
 	 * @uses trailingslashit() To fix slashes
@@ -334,7 +334,7 @@ function bbp_search_results_url() {
 /**
  * Output the search terms
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @param string $search_terms Optional. Search terms
  * @uses bbp_get_search_terms() To get the search terms
@@ -346,7 +346,7 @@ function bbp_search_terms( $search_terms = '' ) {
 	/**
 	 * Get the search terms
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * If search terms are supplied, those are used. Otherwise check the
 	 * search rewrite id query var.
@@ -376,7 +376,7 @@ function bbp_search_terms( $search_terms = '' ) {
 /**
  * Output the search result pagination count
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses bbp_get_search_pagination_count() To get the search result pagination count
  */
@@ -387,7 +387,7 @@ function bbp_search_pagination_count() {
 	/**
 	 * Return the search results pagination count
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @uses bbp_number_format() To format the number value
 	 * @uses apply_filters() Calls 'bbp_get_search_pagination_count' with the
@@ -424,7 +424,7 @@ function bbp_search_pagination_count() {
 /**
  * Output search pagination links
  *
- * @since bbPress (r4579)
+ * @since 2.3.0 bbPress (r4579)
  *
  * @uses bbp_get_search_pagination_links() To get the search pagination links
  */
@@ -435,7 +435,7 @@ function bbp_search_pagination_links() {
 	/**
 	 * Return search pagination links
 	 *
-	 * @since bbPress (r4579)
+	 * @since 2.3.0 bbPress (r4579)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_search_pagination_links' with the
 	 *                        pagination links
diff --git src/includes/topics/capabilities.php src/includes/topics/capabilities.php
index e3c5022..99d949d 100644
--- src/includes/topics/capabilities.php
+++ src/includes/topics/capabilities.php
@@ -12,7 +12,7 @@
 /**
  * Return topic capabilities
  *
- * @since bbPress (r2593)
+ * @since 2.0.0 bbPress (r2593)
  *
  * @uses apply_filters() Calls 'bbp_get_topic_caps' with the capabilities
  * @return array Topic capabilities
@@ -32,7 +32,7 @@ function bbp_get_topic_caps() {
 /**
  * Return topic tag capabilities
  *
- * @since bbPress (r2593)
+ * @since 2.0.0 bbPress (r2593)
  *
  * @uses apply_filters() Calls 'bbp_get_topic_tag_caps' with the capabilities
  * @return array Topic tag capabilities
@@ -49,7 +49,7 @@ function bbp_get_topic_tag_caps() {
 /**
  * Maps topic capabilities
  *
- * @since bbPress (r4242)
+ * @since 2.2.0 bbPress (r4242)
  *
  * @param array $caps Capabilities for meta capability
  * @param string $cap Capability name
@@ -223,7 +223,7 @@ function bbp_map_topic_meta_caps( $caps = array(), $cap = '', $user_id = 0, $arg
 /**
  * Maps topic tag capabilities
  *
- * @since bbPress (r4242)
+ * @since 2.2.0 bbPress (r4242)
  *
  * @param array $caps Capabilities for meta capability
  * @param string $cap Capability name
diff --git src/includes/topics/functions.php src/includes/topics/functions.php
index 75f79b5..d5eca39 100644
--- src/includes/topics/functions.php
+++ src/includes/topics/functions.php
@@ -16,7 +16,7 @@ defined( 'ABSPATH' ) || exit;
  * A wrapper for wp_insert_post() that also includes the necessary meta values
  * for the topic to function properly.
  *
- * @since bbPress (r3349)
+ * @since 2.0.0 bbPress (r3349)
  *
  * @uses bbp_parse_args()
  * @uses bbp_get_topic_post_type()
@@ -935,7 +935,8 @@ function bbp_update_topic( $topic_id = 0, $forum_id = 0, $anonymous_data = false
  * manual queries against the database to get their results. As such, this
  * function can be costly to run but is necessary to keep everything accurate.
  *
- * @since bbPress (r2800)
+ * @since 2.0.0 bbPress (r2800)
+ *
  * @param int $topic_id Topic id
  * @param string $last_active_time Optional. Last active time
  * @param int $forum_id Optional. Forum id
@@ -1139,7 +1140,7 @@ function bbp_move_topic_handler( $topic_id, $old_forum_id, $new_forum_id ) {
  *
  * Handles the front end merge topic submission
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_add_error() To add an error message
@@ -1393,7 +1394,7 @@ function bbp_merge_topic_handler( $action = '' ) {
  * When a topic is merged, update the counts of source and destination topic
  * and their forums.
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @param int $destination_topic_id Destination topic id
  * @param int $source_topic_id Source topic id
@@ -1436,7 +1437,7 @@ function bbp_merge_topic_count( $destination_topic_id, $source_topic_id, $source
  *
  * Handles the front end split topic submission
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_add_error() To add an error message
@@ -1773,7 +1774,7 @@ function bbp_split_topic_handler( $action = '' ) {
  * When a topic is split, update the counts of source and destination topic
  * and their forums.
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @param int $from_reply_id From reply id
  * @param int $source_topic_id Source topic id
@@ -1813,7 +1814,7 @@ function bbp_split_topic_count( $from_reply_id, $source_topic_id, $destination_t
 /**
  * Handles the front end tag management (renaming, merging, destroying)
  *
- * @since bbPress (r2768)
+ * @since 2.0.0 bbPress (r2768)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_verify_nonce_request() To verify the nonce and check the request
@@ -2004,7 +2005,7 @@ function bbp_edit_topic_tag_handler( $action = '' ) {
 /**
  * Return an associative array of available topic statuses
  *
- * @since bbPress (r5059)
+ * @since 2.4.0 bbPress (r5059)
  *
  * @return array
  */
@@ -2021,7 +2022,7 @@ function bbp_get_topic_statuses() {
 /**
  * Return an associative array of topic sticky types
  *
- * @since bbPress (r5059)
+ * @since 2.4.0 bbPress (r5059)
  *
  * @return array
  */
@@ -2038,7 +2039,7 @@ function bbp_get_topic_types() {
 /**
  * Return sticky topics of a forum
  *
- * @since bbPress (r2592)
+ * @since 2.0.0 bbPress (r2592)
  *
  * @param int $forum_id Optional. If not passed, super stickies are returned.
  * @uses bbp_get_super_stickies() To get the super stickies
@@ -2056,7 +2057,7 @@ function bbp_get_stickies( $forum_id = 0 ) {
 /**
  * Return topics stuck to front page of the forums
  *
- * @since bbPress (r2592)
+ * @since 2.0.0 bbPress (r2592)
  *
  * @uses get_option() To get super sticky topics
  * @uses apply_filters() Calls 'bbp_get_super_stickies' with the stickies
@@ -2075,7 +2076,7 @@ function bbp_get_super_stickies() {
  * Handles the front end opening/closing, spamming/unspamming,
  * sticking/unsticking and trashing/untrashing/deleting of topics
  *
- * @since bbPress (r2727)
+ * @since 2.0.0 bbPress (r2727)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_get_topic() To get the topic
@@ -2257,7 +2258,7 @@ function bbp_toggle_topic_handler( $action = '' ) {
 /**
  * Remove a deleted topic from all users' favorites
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param int $topic_id Get the topic id to remove
  * @uses bbp_get_topic_id To get the topic id
@@ -2290,7 +2291,7 @@ function bbp_remove_topic_from_all_favorites( $topic_id = 0 ) {
 /**
  * Remove a deleted topic from all users' subscriptions
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param int $topic_id Get the topic id to remove
  * @uses bbp_is_subscriptions_active() To check if the subscriptions are active
@@ -2332,7 +2333,7 @@ function bbp_remove_topic_from_all_subscriptions( $topic_id = 0 ) {
 /**
  * Bump the total reply count of a topic
  *
- * @since bbPress (r3825)
+ * @since 2.1.0 bbPress (r3825)
  *
  * @param int $topic_id   Optional. Topic id.
  * @param int $difference Optional. Default 1
@@ -2365,7 +2366,7 @@ function bbp_bump_topic_reply_count( $topic_id = 0, $difference = 1 ) {
 /**
  * Bump the total hidden reply count of a topic
  *
- * @since bbPress (r3825)
+ * @since 2.1.0 bbPress (r3825)
  *
  * @param int $topic_id   Optional. Topic id.
  * @param int $difference Optional. Default 1
@@ -2400,7 +2401,7 @@ function bbp_bump_topic_reply_count_hidden( $topic_id = 0, $difference = 1 ) {
 /**
  * Update the topic's forum id
  *
- * @since bbPress (r2855)
+ * @since 2.0.0 bbPress (r2855)
  *
  * @param int $topic_id Optional. Topic id to update
  * @param int $forum_id Optional. Forum id
@@ -2437,7 +2438,7 @@ function bbp_update_topic_forum_id( $topic_id = 0, $forum_id = 0 ) {
 /**
  * Update the topic's topic id
  *
- * @since bbPress (r2954)
+ * @since 2.0.0 bbPress (r2954)
  *
  * @param int $topic_id Optional. Topic id to update
  * @uses bbp_get_topic_id() To get the topic id
@@ -2456,7 +2457,7 @@ function bbp_update_topic_topic_id( $topic_id = 0 ) {
 /**
  * Adjust the total reply count of a topic
  *
- * @since bbPress (r2467)
+ * @since 2.0.0 bbPress (r2467)
  *
  * @param int $topic_id Optional. Topic id to update
  * @param int $reply_count Optional. Set the reply count manually.
@@ -2495,7 +2496,7 @@ function bbp_update_topic_reply_count( $topic_id = 0, $reply_count = 0 ) {
  * Adjust the total hidden reply count of a topic (hidden includes trashed,
  * spammed and pending replies)
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $topic_id Optional. Topic id to update
  * @param int $reply_count Optional. Set the reply count manually
@@ -2541,7 +2542,7 @@ function bbp_update_topic_reply_count_hidden( $topic_id = 0, $reply_count = 0 )
 /**
  * Update the topic with the last active post ID
  *
- * @since bbPress (r2888)
+ * @since 2.0.0 bbPress (r2888)
  *
  * @param int $topic_id Optional. Topic id to update
  * @param int $active_id Optional. active id
@@ -2625,7 +2626,7 @@ function bbp_update_topic_last_active_time( $topic_id = 0, $new_time = '' ) {
 /**
  * Update the topic with the most recent reply ID
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $topic_id Optional. Topic id to update
  * @param int $reply_id Optional. Reply id
@@ -2673,7 +2674,7 @@ function bbp_update_topic_last_reply_id( $topic_id = 0, $reply_id = 0 ) {
 /**
  * Adjust the total voice count of a topic
  *
- * @since bbPress (r2567)
+ * @since 2.0.0 bbPress (r2567)
  *
  * @param int $topic_id Optional. Topic id to update
  * @uses bbp_is_reply() To check if the passed topic id is a reply
@@ -2714,7 +2715,7 @@ function bbp_update_topic_voice_count( $topic_id = 0 ) {
 /**
  * Adjust the total anonymous reply count of a topic
  *
- * @since bbPress (r2567)
+ * @since 2.0.0 bbPress (r2567)
  *
  * @param int $topic_id Optional. Topic id to update
  * @uses bbp_is_reply() To check if the passed topic id is a reply
@@ -2754,7 +2755,7 @@ function bbp_update_topic_anonymous_reply_count( $topic_id = 0 ) {
 /**
  * Update the revision log of the topic
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param array $args Supports these args:
  *  - topic_id: Topic id
@@ -2796,7 +2797,7 @@ function bbp_update_topic_revision_log( $args = array() ) {
 /**
  * Closes a topic
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $topic_id Topic id
  * @uses bbp_get_topic() To get the topic
@@ -2866,7 +2867,7 @@ function bbp_close_topic( $topic_id = 0 ) {
 /**
  * Opens a topic
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $topic_id Topic id
  * @uses bbp_get_topic() To get the topic
@@ -2936,7 +2937,7 @@ function bbp_open_topic( $topic_id = 0 ) {
 /**
  * Marks a topic as spam
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $topic_id Topic id
  * @uses bbp_get_topic() To get the topic
@@ -2989,7 +2990,7 @@ function bbp_spam_topic( $topic_id = 0 ) {
  *
  * Usually you'll want to do this before the topic itself is marked as spam.
  *
- * @since bbPress (r5405)
+ * @since 2.6.0 bbPress (r5405)
  *
  * @param int $topic_id
  */
@@ -3036,7 +3037,7 @@ function bbp_spam_topic_replies( $topic_id = 0 ) {
  *
  * Usually you'll want to do this before the topic itself is marked as spam.
  *
- * @since bbPress (r5405)
+ * @since 2.6.0 bbPress (r5405)
  *
  * @param int $topic_id
  */
@@ -3073,7 +3074,7 @@ function bbp_spam_topic_tags( $topic_id = 0 ) {
 /**
  * Unspams a topic
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $topic_id Topic id
  * @uses bbp_get_topic() To get the topic
@@ -3133,7 +3134,7 @@ function bbp_unspam_topic( $topic_id = 0 ) {
  *
  * Usually you'll want to do this after the topic is unspammed.
  *
- * @since bbPress (r5405)
+ * @since 2.6.0 bbPress (r5405)
  *
  * @param int $topic_id
  */
@@ -3168,7 +3169,7 @@ function bbp_unspam_topic_replies( $topic_id = 0 ) {
  *
  * Usually you'll want to do this before the topic itself is unmarked as spam.
  *
- * @since bbPress (r5405)
+ * @since 2.6.0 bbPress (r5405)
  *
  * @param int $topic_id
  */
@@ -3191,7 +3192,7 @@ function bbp_unspam_topic_tags( $topic_id = 0 ) {
 /**
  * Sticks a topic to a forum or front
  *
- * @since bbPress (r2754)
+ * @since 2.0.0 bbPress (r2754)
  *
  * @param int $topic_id Optional. Topic id
  * @param int $super Should we make the topic a super sticky?
@@ -3253,7 +3254,7 @@ function bbp_stick_topic( $topic_id = 0, $super = false ) {
 /**
  * Approves a pending topic
  *
- * @since bbPress (r5503)
+ * @since 2.6.0 bbPress (r5503)
  *
  * @param int $topic_id Topic id
  * @uses bbp_get_topic() To get the topic
@@ -3300,7 +3301,7 @@ function bbp_approve_topic( $topic_id = 0 ) {
 /**
  * Unapproves a topic
  *
- * @since bbPress (r5503)
+ * @since 2.6.0 bbPress (r5503)
  *
  * @param int $topic_id Topic id
  * @uses bbp_get_topic() To get the topic
@@ -3346,7 +3347,7 @@ function bbp_unapprove_topic( $topic_id = 0 ) {
 /**
  * Unsticks a topic both from front and it's forum
  *
- * @since bbPress (r2754)
+ * @since 2.0.0 bbPress (r2754)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -3425,7 +3426,7 @@ function bbp_delete_topic( $topic_id = 0 ) {
  *
  * Usually you'll want to do this before the topic itself is deleted.
  *
- * @since bbPress (r5405)
+ * @since 2.6.0 bbPress (r5405)
  *
  * @param int $topic_id
  */
@@ -3487,7 +3488,7 @@ function bbp_trash_topic( $topic_id = 0 ) {
  *
  * Usually you'll want to do this before the topic itself is marked as spam.
  *
- * @since bbPress (r5405)
+ * @since 2.6.0 bbPress (r5405)
  *
  * @param int $topic_id
  */
@@ -3553,7 +3554,7 @@ function bbp_untrash_topic( $topic_id = 0 ) {
  *
  * Usually you'll want to do this after the topic is unspammed.
  *
- * @since bbPress (r5405)
+ * @since 2.6.0 bbPress (r5405)
  *
  * @param int $topic_id
  */
@@ -3641,7 +3642,7 @@ function bbp_untrashed_topic( $topic_id = 0 ) {
 /**
  * Return the topics per page setting
  *
- * @since bbPress (r3540)
+ * @since 2.0.0 bbPress (r3540)
  *
  * @param int $default Default replies per page (15)
  * @uses get_option() To get the setting
@@ -3665,7 +3666,7 @@ function bbp_get_topics_per_page( $default = 15 ) {
 /**
  * Return the topics per RSS page setting
  *
- * @since bbPress (r3540)
+ * @since 2.0.0 bbPress (r3540)
  *
  * @param int $default Default replies per page (25)
  * @uses get_option() To get the setting
@@ -3691,7 +3692,7 @@ function bbp_get_topics_per_rss_page( $default = 25 ) {
 /**
  * Get topic tags for a specific topic ID
  *
- * @since bbPress (r5836)
+ * @since 2.6.0 bbPress (r5836)
  *
  * @param int $topic_id
  *
@@ -3708,7 +3709,7 @@ function bbp_get_topic_tags( $topic_id = 0 ) {
 /**
  * Get topic tags for a specific topic ID
  *
- * @since bbPress (r4165)
+ * @since 2.2.0 bbPress (r4165)
  *
  * @param int    $topic_id
  * @param string $sep
@@ -3728,7 +3729,8 @@ function bbp_get_topic_tag_names( $topic_id = 0, $sep = ', ' ) {
 /**
  * Check if autoembeds are enabled and hook them in if so
  *
- * @since bbPress (r3752)
+ * @since 2.1.0 bbPress (r3752)
+ *
  * @global WP_Embed $wp_embed
  */
 function bbp_topic_content_autoembed() {
@@ -3744,7 +3746,7 @@ function bbp_topic_content_autoembed() {
 /**
  * Output an RSS2 feed of topics, based on the query passed.
  *
- * @since bbPress (r3171)
+ * @since 2.0.0 bbPress (r3171)
  *
  * @uses bbp_version()
  * @uses bbp_is_single_topic()
@@ -3848,7 +3850,7 @@ function bbp_display_topics_feed_rss2( $topics_query = array() ) {
 /**
  * Redirect if unathorized user is attempting to edit a topic
  *
- * @since bbPress (r3605)
+ * @since 2.1.0 bbPress (r3605)
  *
  * @uses bbp_is_topic_edit()
  * @uses current_user_can()
@@ -3872,7 +3874,7 @@ function bbp_check_topic_edit() {
 /**
  * Redirect if unathorized user is attempting to edit a topic tag
  *
- * @since bbPress (r3605)
+ * @since 2.1.0 bbPress (r3605)
  *
  * @uses bbp_is_topic_tag_edit()
  * @uses current_user_can()
diff --git src/includes/topics/template.php src/includes/topics/template.php
index 8973f66..ea5d512 100644
--- src/includes/topics/template.php
+++ src/includes/topics/template.php
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Output the unique id of the custom post type for topics
  *
- * @since bbPress (r2857)
+ * @since 2.0.0 bbPress (r2857)
  *
  * @uses bbp_get_topic_post_type() To get the topic post type
  */
@@ -25,7 +25,7 @@ function bbp_topic_post_type() {
 	/**
 	 * Return the unique id of the custom post type for topics
 	 *
-	 * @since bbPress (r2857)
+	 * @since 2.0.0 bbPress (r2857)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_topic_post_type' with the topic
 	 *                        post type id
@@ -38,7 +38,7 @@ function bbp_topic_post_type() {
 /**
  * Return array of labels used by the topic post type
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -65,7 +65,7 @@ function bbp_get_topic_post_type_labels() {
 /**
  * Return array of topic post type rewrite settings
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -79,7 +79,7 @@ function bbp_get_topic_post_type_rewrite() {
 /**
  * Return array of features the topic post type supports
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -96,7 +96,8 @@ function bbp_get_topic_post_type_supports() {
  * - Traditional: Topics are included in the reply loop (default)
  * - New Style: Topics appear as "lead" posts, ahead of replies
  *
- * @since bbPress (r2954)
+ * @since 2.0.0 bbPress (r2954)
+ *
  * @param $show_lead Optional. Default false
  * @return bool Yes if the topic appears as a lead, otherwise false
  */
@@ -115,7 +116,7 @@ function bbp_show_lead_topic( $show_lead = false ) {
 /**
  * The main topic loop. WordPress makes this easy for us
  *
- * @since bbPress (r2485)
+ * @since 2.0.0 bbPress (r2485)
  *
  * @param array $args All the arguments supported by {@link WP_Query}
  * @uses current_user_can() To check if the current user can edit other's topics
@@ -427,7 +428,7 @@ function bbp_has_topics( $args = array() ) {
 /**
  * Whether there are more topics available in the loop
  *
- * @since bbPress (r2485)
+ * @since 2.0.0 bbPress (r2485)
  *
  * @uses WP_Query bbPress::topic_query::have_posts()
  * @return object Topic information
@@ -448,7 +449,7 @@ function bbp_topics() {
 /**
  * Loads up the current topic in the loop
  *
- * @since bbPress (r2485)
+ * @since 2.0.0 bbPress (r2485)
  *
  * @uses WP_Query bbPress::topic_query::the_post()
  * @return object Topic information
@@ -460,7 +461,7 @@ function bbp_the_topic() {
 /**
  * Output the topic id
  *
- * @since bbPress (r2485)
+ * @since 2.0.0 bbPress (r2485)
  *
  * @uses bbp_get_topic_id() To get the topic id
  */
@@ -470,7 +471,7 @@ function bbp_topic_id( $topic_id = 0) {
 	/**
 	 * Return the topic id
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param $topic_id Optional. Used to check emptiness
 	 * @uses bbPress::topic_query::post::ID To get the topic id
@@ -527,7 +528,7 @@ function bbp_topic_id( $topic_id = 0) {
 /**
  * Gets a topic
  *
- * @since bbPress (r2787)
+ * @since 2.0.0 bbPress (r2787)
  *
  * @param int|object $topic Topic id or topic object
  * @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N. Default = OBJECT
@@ -574,7 +575,7 @@ function bbp_get_topic( $topic, $output = OBJECT, $filter = 'raw' ) {
 /**
  * Output the link to the topic in the topic loop
  *
- * @since bbPress (r2485)
+ * @since 2.0.0 bbPress (r2485)
  *
  * @param int $topic_id Optional. Topic id
  * @param string $redirect_to Optional. Pass a redirect value for use with
@@ -587,7 +588,7 @@ function bbp_topic_permalink( $topic_id = 0, $redirect_to = '' ) {
 	/**
 	 * Return the link to the topic
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @param string $redirect_to Optional. Pass a redirect value for use with
@@ -617,7 +618,7 @@ function bbp_topic_permalink( $topic_id = 0, $redirect_to = '' ) {
 /**
  * Output the title of the topic
  *
- * @since bbPress (r2485)
+ * @since 2.0.0 bbPress (r2485)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_title() To get the topic title
@@ -628,7 +629,7 @@ function bbp_topic_title( $topic_id = 0 ) {
 	/**
 	 * Return the title of the topic
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -647,7 +648,7 @@ function bbp_topic_title( $topic_id = 0 ) {
 /**
  * Output the topic archive title
  *
- * @since bbPress (r3249)
+ * @since 2.0.0 bbPress (r3249)
  *
  * @param string $title Default text to use as title
  */
@@ -657,7 +658,7 @@ function bbp_topic_archive_title( $title = '' ) {
 	/**
 	 * Return the topic archive title
 	 *
-	 * @since bbPress (r3249)
+	 * @since 2.0.0 bbPress (r3249)
 	 *
 	 * @param string $title Default text to use as title
 	 *
@@ -693,7 +694,7 @@ function bbp_topic_archive_title( $title = '' ) {
 /**
  * Output the content of the topic
  *
- * @since bbPress (r2780)
+ * @since 2.0.0 bbPress (r2780)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_content() To get the topic content
@@ -704,7 +705,7 @@ function bbp_topic_content( $topic_id = 0 ) {
 	/**
 	 * Return the content of the topic
 	 *
-	 * @since bbPress (r2780)
+	 * @since 2.0.0 bbPress (r2780)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -731,7 +732,7 @@ function bbp_topic_content( $topic_id = 0 ) {
 /**
  * Output the excerpt of the topic
  *
- * @since bbPress (r2780)
+ * @since 2.0.0 bbPress (r2780)
  *
  * @param int $topic_id Optional. Topic id
  * @param int $length Optional. Length of the excerpt. Defaults to 100 letters
@@ -743,7 +744,7 @@ function bbp_topic_excerpt( $topic_id = 0, $length = 100 ) {
 	/**
 	 * Return the excerpt of the topic
 	 *
-	 * @since bbPress (r2780)
+	 * @since 2.0.0 bbPress (r2780)
 	 *
 	 * @param int $topic_id Optional. topic id
 	 * @param int $length Optional. Length of the excerpt. Defaults to 100
@@ -784,7 +785,7 @@ function bbp_topic_excerpt( $topic_id = 0, $length = 100 ) {
 /**
  * Output the post date and time of a topic
  *
- * @since bbPress (r4155)
+ * @since 2.2.0 bbPress (r4155)
  *
  * @param int $topic_id Optional. Topic id.
  * @param bool $humanize Optional. Humanize output using time_since
@@ -797,7 +798,7 @@ function bbp_topic_post_date( $topic_id = 0, $humanize = false, $gmt = false ) {
 	/**
 	 * Return the post date and time of a topic
 	 *
-	 * @since bbPress (r4155)
+	 * @since 2.2.0 bbPress (r4155)
 	 *
 	 * @param int $topic_id Optional. Topic id.
 	 * @param bool $humanize Optional. Humanize output using time_since
@@ -830,7 +831,7 @@ function bbp_topic_post_date( $topic_id = 0, $humanize = false, $gmt = false ) {
 /**
  * Output pagination links of a topic within the topic loop
  *
- * @since bbPress (r2966)
+ * @since 2.0.0 bbPress (r2966)
  *
  * @param array $args See {@link bbp_get_topic_pagination()}
  * @uses bbp_get_topic_pagination() To get the topic pagination links
@@ -841,7 +842,7 @@ function bbp_topic_pagination( $args = array() ) {
 	/**
 	 * Returns pagination links of a topic within the topic loop
 	 *
-	 * @since bbPress (r2966)
+	 * @since 2.0.0 bbPress (r2966)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - topic_id: Topic id
@@ -921,7 +922,7 @@ function bbp_topic_pagination( $args = array() ) {
 /**
  * Append revisions to the topic content
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param string $content Optional. Content to which we need to append the revisions to
  * @param int $topic_id Optional. Topic id
@@ -946,7 +947,7 @@ function bbp_topic_content_append_revisions( $content = '', $topic_id = 0 ) {
 /**
  * Output the revision log of the topic
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_revision_log() To get the topic revision log
@@ -957,7 +958,7 @@ function bbp_topic_revision_log( $topic_id = 0 ) {
 	/**
 	 * Return the formatted revision log of the topic
 	 *
-	 * @since bbPress (r2782)
+	 * @since 2.0.0 bbPress (r2782)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1018,7 +1019,7 @@ function bbp_topic_revision_log( $topic_id = 0 ) {
 		/**
 		 * Return the raw revision log of the topic
 		 *
-		 * @since bbPress (r2782)
+		 * @since 2.0.0 bbPress (r2782)
 		 *
 		 * @param int $topic_id Optional. Topic id
 		 * @uses bbp_get_topic_id() To get the topic id
@@ -1039,7 +1040,7 @@ function bbp_topic_revision_log( $topic_id = 0 ) {
 /**
  * Return the revisions of the topic
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -1058,7 +1059,7 @@ function bbp_get_topic_revisions( $topic_id = 0 ) {
 /**
  * Return the revision count of the topic
  *
- * @since bbPress (r2782)
+ * @since 2.0.0 bbPress (r2782)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_revisions() To get the topic revisions
@@ -1076,7 +1077,7 @@ function bbp_get_topic_revision_count( $topic_id = 0, $integer = false ) {
 /**
  * Is the topic a sticky or super sticky?
  *
- * @since bbPress (r2754)
+ * @since 2.0.0 bbPress (r2754)
  *
  * @param int $topic_id Optional. Topic id
  * @param int $check_super Optional. If set to true and if the topic is not a
@@ -1105,7 +1106,7 @@ function bbp_is_topic_sticky( $topic_id = 0, $check_super = true ) {
 /**
  * Is the topic a super sticky?
  *
- * @since bbPress (r2754)
+ * @since 2.0.0 bbPress (r2754)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -1123,7 +1124,7 @@ function bbp_is_topic_super_sticky( $topic_id = 0 ) {
 /**
  * Output the status of the topic
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_status() To get the topic status
@@ -1134,7 +1135,7 @@ function bbp_topic_status( $topic_id = 0 ) {
 	/**
 	 * Return the status of the topic
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1152,7 +1153,7 @@ function bbp_topic_status( $topic_id = 0 ) {
 /**
  * Is the topic closed to new replies?
  *
- * @since bbPress (r2746)
+ * @since 2.0.0 bbPress (r2746)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_status() To get the topic status
@@ -1171,7 +1172,7 @@ function bbp_is_topic_closed( $topic_id = 0 ) {
 /**
  * Is the topic open to new replies?
  *
- * @since bbPress (r2727)
+ * @since 2.0.0 bbPress (r2727)
  *
  * @uses bbp_get_topic_status()
  *
@@ -1186,7 +1187,7 @@ function bbp_is_topic_open( $topic_id = 0 ) {
 /**
  * Is the topic not spam or deleted?
  *
- * @since bbPress (r3496)
+ * @since 2.0.0 bbPress (r3496)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -1205,7 +1206,7 @@ function bbp_is_topic_published( $topic_id = 0 ) {
 /**
  * Is the topic marked as spam?
  *
- * @since bbPress (r2727)
+ * @since 2.0.0 bbPress (r2727)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -1224,7 +1225,7 @@ function bbp_is_topic_spam( $topic_id = 0 ) {
 /**
  * Is the topic trashed?
  *
- * @since bbPress (r2888)
+ * @since 2.0.0 bbPress (r2888)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -1243,7 +1244,7 @@ function bbp_is_topic_trash( $topic_id = 0 ) {
 /**
  * Is the topic pending?
  *
- * @since bbPress (r5504)
+ * @since 2.6.0 bbPress (r5504)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -1262,7 +1263,7 @@ function bbp_is_topic_pending( $topic_id = 0 ) {
 /**
  * Is the topic private?
  *
- * @since bbPress (r5504)
+ * @since 2.6.0 bbPress (r5504)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -1281,7 +1282,7 @@ function bbp_is_topic_private( $topic_id = 0 ) {
 /**
  * Is the posted by an anonymous user?
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_id() To get the topic id
@@ -1313,8 +1314,9 @@ function bbp_is_topic_anonymous( $topic_id = 0 ) {
  *
  * Output the author of the topic.
  *
- * @since bbPress (r2590)
- * @deprecated bbPress (r5119)
+ * @since 2.0.0 bbPress (r2590)
+ *
+ * @deprecated 2.5.0 bbPress (r5119)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_author() To get the topic author
@@ -1327,8 +1329,9 @@ function bbp_topic_author( $topic_id = 0 ) {
 	 *
 	 * Return the author of the topic
 	 *
-	 * @since bbPress (r2590)
-	 * @deprecated bbPress (r5119)
+	 * @since 2.0.0 bbPress (r2590)
+	 *
+	 * @deprecated 2.5.0 bbPress (r5119)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1356,7 +1359,7 @@ function bbp_topic_author( $topic_id = 0 ) {
 /**
  * Output the author ID of the topic
  *
- * @since bbPress (r2590)
+ * @since 2.0.0 bbPress (r2590)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_author_id() To get the topic author id
@@ -1367,7 +1370,7 @@ function bbp_topic_author_id( $topic_id = 0 ) {
 	/**
 	 * Return the author ID of the topic
 	 *
-	 * @since bbPress (r2590)
+	 * @since 2.0.0 bbPress (r2590)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1386,7 +1389,7 @@ function bbp_topic_author_id( $topic_id = 0 ) {
 /**
  * Output the author display_name of the topic
  *
- * @since bbPress (r2590)
+ * @since 2.0.0 bbPress (r2590)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_author_display_name() To get the topic author's display
@@ -1398,7 +1401,7 @@ function bbp_topic_author_display_name( $topic_id = 0 ) {
 	/**
 	 * Return the author display_name of the topic
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1449,7 +1452,7 @@ function bbp_topic_author_display_name( $topic_id = 0 ) {
 /**
  * Output the author avatar of the topic
  *
- * @since bbPress (r2590)
+ * @since 2.0.0 bbPress (r2590)
  *
  * @param int $topic_id Optional. Topic id
  * @param int $size Optional. Avatar size. Defaults to 40
@@ -1461,7 +1464,7 @@ function bbp_topic_author_avatar( $topic_id = 0, $size = 40 ) {
 	/**
 	 * Return the author avatar of the topic
 	 *
-	 * @since bbPress (r2590)
+	 * @since 2.0.0 bbPress (r2590)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @param int $size Optional. Avatar size. Defaults to 40
@@ -1493,7 +1496,7 @@ function bbp_topic_author_avatar( $topic_id = 0, $size = 40 ) {
 /**
  * Output the author link of the topic
  *
- * @since bbPress (r2717)
+ * @since 2.0.0 bbPress (r2717)
  *
  * @param mixed|int $args If it is an integer, it is used as topic_id. Optional.
  * @uses bbp_get_topic_author_link() To get the topic author link
@@ -1504,7 +1507,7 @@ function bbp_topic_author_link( $args = array() ) {
 	/**
 	 * Return the author link of the topic
 	 *
-	 * @since bbPress (r2717)
+	 * @since 2.0.0 bbPress (r2717)
 	 *
 	 * @param mixed|int $args If it is an integer, it is used as topic id.
 	 *                         Optional.
@@ -1606,7 +1609,7 @@ function bbp_topic_author_link( $args = array() ) {
 /**
  * Output the author url of the topic
  *
- * @since bbPress (r2590)
+ * @since 2.0.0 bbPress (r2590)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_author_url() To get the topic author url
@@ -1618,7 +1621,7 @@ function bbp_topic_author_url( $topic_id = 0 ) {
 	/**
 	 * Return the author url of the topic
 	 *
-	 * @since bbPress (r2590)
+	 * @since 2.0.0 bbPress (r2590)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1653,7 +1656,7 @@ function bbp_topic_author_url( $topic_id = 0 ) {
 /**
  * Output the topic author email address
  *
- * @since bbPress (r3445)
+ * @since 2.0.0 bbPress (r3445)
  *
  * @param int $topic_id Optional. Reply id
  * @uses bbp_get_topic_author_email() To get the topic author email
@@ -1664,7 +1667,7 @@ function bbp_topic_author_email( $topic_id = 0 ) {
 	/**
 	 * Return the topic author email address
 	 *
-	 * @since bbPress (r3445)
+	 * @since 2.0.0 bbPress (r3445)
 	 *
 	 * @param int $topic_id Optional. Reply id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1706,7 +1709,7 @@ function bbp_topic_author_email( $topic_id = 0 ) {
 /**
  * Output the topic author role
  *
- * @since bbPress (r3860)
+ * @since 2.1.0 bbPress (r3860)
  *
  * @param array $args Optional.
  * @uses bbp_get_topic_author_role() To get the topic author role
@@ -1717,7 +1720,7 @@ function bbp_topic_author_role( $args = array() ) {
 	/**
 	 * Return the topic author role
 	 *
-	 * @since bbPress (r3860)
+	 * @since 2.1.0 bbPress (r3860)
 	 *
 	 * @param array $args Optional.
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1757,7 +1760,7 @@ function bbp_topic_author_role( $args = array() ) {
 /**
  * Output the title of the forum a topic belongs to
  *
- * @since bbPress (r2485)
+ * @since 2.0.0 bbPress (r2485)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_forum_title() To get the topic's forum title
@@ -1768,7 +1771,7 @@ function bbp_topic_forum_title( $topic_id = 0 ) {
 	/**
 	 * Return the title of the forum a topic belongs to
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get topic id
@@ -1787,7 +1790,7 @@ function bbp_topic_forum_title( $topic_id = 0 ) {
 /**
  * Output the forum id a topic belongs to
  *
- * @since bbPress (r2491)
+ * @since 2.0.0 bbPress (r2491)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_forum_id()
@@ -1798,7 +1801,7 @@ function bbp_topic_forum_id( $topic_id = 0 ) {
 	/**
 	 * Return the forum id a topic belongs to
 	 *
-	 * @since bbPress (r2491)
+	 * @since 2.0.0 bbPress (r2491)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get topic id
@@ -1817,7 +1820,7 @@ function bbp_topic_forum_id( $topic_id = 0 ) {
 /**
  * Output the topics last active ID
  *
- * @since bbPress (r2860)
+ * @since 2.0.0 bbPress (r2860)
  *
  * @param int $topic_id Optional. Forum id
  * @uses bbp_get_topic_last_active_id() To get the topic's last active id
@@ -1828,7 +1831,7 @@ function bbp_topic_last_active_id( $topic_id = 0 ) {
 	/**
 	 * Return the topics last active ID
 	 *
-	 * @since bbPress (r2860)
+	 * @since 2.0.0 bbPress (r2860)
 	 *
 	 * @param int $topic_id Optional. Forum id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -1847,7 +1850,7 @@ function bbp_topic_last_active_id( $topic_id = 0 ) {
 /**
  * Output the topics last update date/time (aka freshness)
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_last_active_time() To get topic freshness
@@ -1858,7 +1861,7 @@ function bbp_topic_last_active_time( $topic_id = 0 ) {
 	/**
 	 * Return the topics last update date/time (aka freshness)
 	 *
-	 * @since bbPress (r2625)
+	 * @since 2.0.0 bbPress (r2625)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get topic id
@@ -1896,7 +1899,7 @@ function bbp_topic_last_active_time( $topic_id = 0 ) {
 /**
  * Output the topic subscription link
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @uses bbp_get_topic_subscription_link()
  */
@@ -1909,7 +1912,7 @@ function bbp_topic_subscription_link( $args = array() ) {
 	 *
 	 * A custom wrapper for bbp_get_user_subscribe_link()
 	 *
-	 * @since bbPress (r5156)
+	 * @since 2.5.0 bbPress (r5156)
 	 *
 	 * @uses bbp_parse_args()
 	 * @uses bbp_get_user_subscribe_link()
@@ -1941,7 +1944,7 @@ function bbp_topic_subscription_link( $args = array() ) {
 /**
  * Output the topic favorite link
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @uses bbp_get_topic_favorite_link()
  */
@@ -1954,7 +1957,7 @@ function bbp_topic_favorite_link( $args = array() ) {
 	 *
 	 * A custom wrapper for bbp_get_user_favorite_link()
 	 *
-	 * @since bbPress (r5156)
+	 * @since 2.5.0 bbPress (r5156)
 	 *
 	 * @uses bbp_parse_args()
 	 * @uses bbp_get_user_favorites_link()
@@ -1986,7 +1989,7 @@ function bbp_topic_favorite_link( $args = array() ) {
 /**
  * Output the id of the topics last reply
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_last_reply_id() To get the topic last reply id
@@ -1997,7 +2000,7 @@ function bbp_topic_last_reply_id( $topic_id = 0 ) {
 	/**
 	 * Return the topics last update date/time (aka freshness)
 	 *
-	 * @since bbPress (r2625)
+	 * @since 2.0.0 bbPress (r2625)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -2044,7 +2047,7 @@ function bbp_topic_last_reply_title( $topic_id = 0 ) {
 /**
  * Output the link to the last reply in a topic
  *
- * @since bbPress (r2464)
+ * @since 2.0.0 bbPress (r2464)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_last_reply_permalink() To get the topic's last reply link
@@ -2055,7 +2058,7 @@ function bbp_topic_last_reply_permalink( $topic_id = 0 ) {
 	/**
 	 * Return the link to the last reply in a topic
 	 *
-	 * @since bbPress (r2464)
+	 * @since 2.0.0 bbPress (r2464)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -2076,7 +2079,7 @@ function bbp_topic_last_reply_permalink( $topic_id = 0 ) {
 /**
  * Output the link to the last reply in a topic
  *
- * @since bbPress (r2683)
+ * @since 2.0.0 bbPress (r2683)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_last_reply_url() To get the topic last reply url
@@ -2087,7 +2090,7 @@ function bbp_topic_last_reply_url( $topic_id = 0 ) {
 	/**
 	 * Return the link to the last reply in a topic
 	 *
-	 * @since bbPress (r2683)
+	 * @since 2.0.0 bbPress (r2683)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -2115,7 +2118,7 @@ function bbp_topic_last_reply_url( $topic_id = 0 ) {
  * Output link to the most recent activity inside a topic, complete with link
  * attributes and content.
  *
- * @since bbPress (r2625)
+ * @since 2.0.0 bbPress (r2625)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_freshness_link() To get the topic freshness link
@@ -2127,7 +2130,7 @@ function bbp_topic_freshness_link( $topic_id = 0 ) {
 	 * Returns link to the most recent activity inside a topic, complete
 	 * with link attributes and content.
 	 *
-	 * @since bbPress (r2625)
+	 * @since 2.0.0 bbPress (r2625)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -2156,7 +2159,7 @@ function bbp_topic_freshness_link( $topic_id = 0 ) {
 /**
  * Output the replies link of the topic
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_replies_link() To get the topic replies link
@@ -2168,7 +2171,7 @@ function bbp_topic_replies_link( $topic_id = 0 ) {
 	/**
 	 * Return the replies link of the topic
 	 *
-	 * @since bbPress (r2740)
+	 * @since 2.0.0 bbPress (r2740)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -2221,7 +2224,7 @@ function bbp_topic_replies_link( $topic_id = 0 ) {
 /**
  * Output total reply count of a topic
  *
- * @since bbPress (r2485)
+ * @since 2.0.0 bbPress (r2485)
  *
  * @param int $topic_id Optional. Topic id
  * @param boolean $integer Optional. Whether or not to format the result
@@ -2233,7 +2236,7 @@ function bbp_topic_reply_count( $topic_id = 0, $integer = false ) {
 	/**
 	 * Return total reply count of a topic
 	 *
-	 * @since bbPress (r2485)
+	 * @since 2.0.0 bbPress (r2485)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @param boolean $integer Optional. Whether or not to format the result
@@ -2254,7 +2257,7 @@ function bbp_topic_reply_count( $topic_id = 0, $integer = false ) {
 /**
  * Output total post count of a topic
  *
- * @since bbPress (r2954)
+ * @since 2.0.0 bbPress (r2954)
  *
  * @param int $topic_id Optional. Topic id
  * @param boolean $integer Optional. Whether or not to format the result
@@ -2266,7 +2269,7 @@ function bbp_topic_post_count( $topic_id = 0, $integer = false ) {
 	/**
 	 * Return total post count of a topic
 	 *
-	 * @since bbPress (r2954)
+	 * @since 2.0.0 bbPress (r2954)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @param boolean $integer Optional. Whether or not to format the result
@@ -2288,7 +2291,7 @@ function bbp_topic_post_count( $topic_id = 0, $integer = false ) {
  * Output total hidden reply count of a topic (hidden includes trashed and
  * spammed replies)
  *
- * @since bbPress (r2740)
+ * @since 2.0.0 bbPress (r2740)
  *
  * @param int $topic_id Optional. Topic id
  * @param boolean $integer Optional. Whether or not to format the result
@@ -2301,7 +2304,7 @@ function bbp_topic_reply_count_hidden( $topic_id = 0, $integer = false ) {
 	 * Return total hidden reply count of a topic (hidden includes trashed
 	 * and spammed replies)
 	 *
-	 * @since bbPress (r2740)
+	 * @since 2.0.0 bbPress (r2740)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @param boolean $integer Optional. Whether or not to format the result
@@ -2322,7 +2325,7 @@ function bbp_topic_reply_count_hidden( $topic_id = 0, $integer = false ) {
 /**
  * Output total voice count of a topic
  *
- * @since bbPress (r2567)
+ * @since 2.0.0 bbPress (r2567)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_voice_count() To get the topic voice count
@@ -2333,7 +2336,7 @@ function bbp_topic_voice_count( $topic_id = 0, $integer = false ) {
 	/**
 	 * Return total voice count of a topic
 	 *
-	 * @since bbPress (r2567)
+	 * @since 2.0.0 bbPress (r2567)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -2353,7 +2356,7 @@ function bbp_topic_voice_count( $topic_id = 0, $integer = false ) {
 /**
  * Output a the tags of a topic
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @param int $topic_id Optional. Topic id
  * @param array $args See {@link bbp_get_topic_tag_list()}
@@ -2365,7 +2368,7 @@ function bbp_topic_tag_list( $topic_id = 0, $args = array() ) {
 	/**
 	 * Return the tags of a topic
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @param array $args This function supports these arguments:
@@ -2422,7 +2425,7 @@ function bbp_topic_tag_list( $topic_id = 0, $args = array() ) {
 /**
  * Output the row class of a topic
  *
- * @since bbPress (r2667)
+ * @since 2.0.0 bbPress (r2667)
  *
  * @param int $topic_id Optional. Topic id
  * @param array Extra classes you can pass when calling this function
@@ -2434,7 +2437,7 @@ function bbp_topic_class( $topic_id = 0, $classes = array() ) {
 	/**
 	 * Return the row class of a topic
 	 *
-	 * @since bbPress (r2667)
+	 * @since 2.0.0 bbPress (r2667)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @param array Extra classes you can pass when calling this function
@@ -2550,7 +2553,7 @@ function bbp_topic_admin_links( $args = array() ) {
 /**
  * Output the edit link of the topic
  *
- * @since bbPress (r2727)
+ * @since 2.0.0 bbPress (r2727)
  *
  * @param array $args See {@link bbp_get_topic_edit_link()}
  * @uses bbp_get_topic_edit_link() To get the topic edit link
@@ -2562,7 +2565,7 @@ function bbp_topic_edit_link( $args = array() ) {
 	/**
 	 * Return the edit link of the topic
 	 *
-	 * @since bbPress (r2727)
+	 * @since 2.0.0 bbPress (r2727)
 	 *
 	 * @param array $args This function supports these args:
 	 *  - id: Optional. Topic id
@@ -2616,7 +2619,7 @@ function bbp_topic_edit_link( $args = array() ) {
 /**
  * Output URL to the topic edit page
  *
- * @since bbPress (r2753)
+ * @since 2.0.0 bbPress (r2753)
  *
  * @param int $topic_id Optional. Topic id
  * @uses bbp_get_topic_edit_url() To get the topic edit url
@@ -2627,7 +2630,7 @@ function bbp_topic_edit_url( $topic_id = 0 ) {
 	/**
 	 * Return URL to the topic edit page
 	 *
-	 * @since bbPress (r2753)
+	 * @since 2.0.0 bbPress (r2753)
 	 *
 	 * @param int $topic_id Optional. Topic id
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -2669,7 +2672,7 @@ function bbp_topic_edit_url( $topic_id = 0 ) {
 /**
  * Output the trash link of the topic
  *
- * @since bbPress (r2727)
+ * @since 2.0.0 bbPress (r2727)
  *
  * @param array $args See {@link bbp_get_topic_trash_link()}
  * @uses bbp_get_topic_trash_link() To get the topic trash link
@@ -2681,7 +2684,7 @@ function bbp_topic_trash_link( $args = array() ) {
 	/**
 	 * Return the trash link of the topic
 	 *
-	 * @since bbPress (r2727)
+	 * @since 2.0.0 bbPress (r2727)
 	 *
 	 * @param array $args This function supports these args:
 	 *  - id: Optional. Topic id
@@ -2744,7 +2747,7 @@ function bbp_topic_trash_link( $args = array() ) {
 /**
  * Output the close link of the topic
  *
- * @since bbPress (r2727)
+ * @since 2.0.0 bbPress (r2727)
  *
  * @param array $args See {@link bbp_get_topic_close_link()}
  * @uses bbp_get_topic_close_link() To get the topic close link
@@ -2756,7 +2759,7 @@ function bbp_topic_close_link( $args = array() ) {
 	/**
 	 * Return the close link of the topic
 	 *
-	 * @since bbPress (r2727)
+	 * @since 2.0.0 bbPress (r2727)
 	 *
 	 * @param array $args This function supports these args:
 	 *  - id: Optional. Topic id
@@ -2804,7 +2807,7 @@ function bbp_topic_close_link( $args = array() ) {
 /**
  * Output the approve link of the topic
  *
- * @since bbPress (r5504)
+ * @since 2.6.0 bbPress (r5504)
  *
  * @param array $args See {@link bbp_get_topic_approve_link()}
  * @uses bbp_get_topic_approve_link() To get the topic approve link
@@ -2816,7 +2819,7 @@ function bbp_topic_approve_link( $args = array() ) {
 	/**
 	 * Return the approve link of the topic
 	 *
-	 * @since bbPress (r5504)
+	 * @since 2.6.0 bbPress (r5504)
 	 *
 	 * @param array $args This function supports these args:
 	 *  - id: Optional. Topic id
@@ -2865,7 +2868,7 @@ function bbp_topic_approve_link( $args = array() ) {
 /**
  * Output the stick link of the topic
  *
- * @since bbPress (r2754)
+ * @since 2.0.0 bbPress (r2754)
  *
  * @param array $args See {@link bbp_get_topic_stick_link()}
  * @uses bbp_get_topic_stick_link() To get the topic stick link
@@ -2877,7 +2880,7 @@ function bbp_topic_stick_link( $args = array() ) {
 	/**
 	 * Return the stick link of the topic
 	 *
-	 * @since bbPress (r2754)
+	 * @since 2.0.0 bbPress (r2754)
 	 *
 	 * @param array $args This function supports these args:
 	 *  - id: Optional. Topic id
@@ -2942,7 +2945,7 @@ function bbp_topic_stick_link( $args = array() ) {
 /**
  * Output the merge link of the topic
  *
- * @since bbPress (r2756)
+ * @since 2.0.0 bbPress (r2756)
  *
  * @param array $args
  * @uses bbp_get_topic_merge_link() To get the topic merge link
@@ -2954,7 +2957,7 @@ function bbp_topic_merge_link( $args = array() ) {
 	/**
 	 * Return the merge link of the topic
 	 *
-	 * @since bbPress (r2756)
+	 * @since 2.0.0 bbPress (r2756)
 	 *
 	 * @param array $args This function supports these args:
 	 *  - id: Optional. Topic id
@@ -2995,7 +2998,7 @@ function bbp_topic_merge_link( $args = array() ) {
 /**
  * Output the spam link of the topic
  *
- * @since bbPress (r2727)
+ * @since 2.0.0 bbPress (r2727)
  *
  * @param array $args See {@link bbp_get_topic_spam_link()}
  * @uses bbp_get_topic_spam_link() Topic spam link
@@ -3007,7 +3010,7 @@ function bbp_topic_spam_link( $args = array() ) {
 	/**
 	 * Return the spam link of the topic
 	 *
-	 * @since bbPress (r2727)
+	 * @since 2.0.0 bbPress (r2727)
 	 *
 	 * @param array $args This function supports these args:
 	 *  - id: Optional. Topic id
@@ -3055,7 +3058,7 @@ function bbp_topic_spam_link( $args = array() ) {
 /**
  * Output the link to go directly to the reply form
  *
- * @since bbPress (r4966)
+ * @since 2.4.0 bbPress (r4966)
  *
  * @param array $args
  * @uses bbp_get_reply_to_link() To get the reply to link
@@ -3067,7 +3070,7 @@ function bbp_topic_reply_link( $args = array() ) {
 	/**
 	 * Return the link to go directly to the reply form
 	 *
-	 * @since bbPress (r4966)
+	 * @since 2.4.0 bbPress (r4966)
 	 *
 	 * @param array $args Arguments
 	 * @uses bbp_current_user_can_access_create_reply_form() To check permissions
@@ -3109,7 +3112,7 @@ function bbp_topic_reply_link( $args = array() ) {
 /**
  * Output the pagination count
  *
- * @since bbPress (r2519)
+ * @since 2.0.0 bbPress (r2519)
  *
  * @uses bbp_get_forum_pagination_count() To get the forum pagination count
  */
@@ -3119,7 +3122,7 @@ function bbp_forum_pagination_count() {
 	/**
 	 * Return the pagination count
 	 *
-	 * @since bbPress (r2519)
+	 * @since 2.0.0 bbPress (r2519)
 	 *
 	 * @uses bbp_number_format() To format the number value
 	 * @uses apply_filters() Calls 'bbp_get_forum_pagination_count' with the
@@ -3156,7 +3159,7 @@ function bbp_forum_pagination_count() {
 /**
  * Output pagination links
  *
- * @since bbPress (r2519)
+ * @since 2.0.0 bbPress (r2519)
  *
  * @uses bbp_get_forum_pagination_links() To get the pagination links
  */
@@ -3166,7 +3169,7 @@ function bbp_forum_pagination_links() {
 	/**
 	 * Return pagination links
 	 *
-	 * @since bbPress (r2519)
+	 * @since 2.0.0 bbPress (r2519)
 	 *
 	 * @uses bbPress::topic_query::pagination_links To get the links
 	 * @return string Pagination links
@@ -3184,7 +3187,7 @@ function bbp_forum_pagination_links() {
 /**
  * Displays topic notices
  *
- * @since bbPress (r2744)
+ * @since 2.0.0 bbPress (r2744)
  *
  * @uses bbp_is_single_topic() To check if it's a topic page
  * @uses bbp_get_topic_status() To get the topic status
@@ -3234,8 +3237,9 @@ function bbp_topic_notices() {
 /**
  * Displays topic type select box (normal/sticky/super sticky)
  *
- * @since bbPress (r5059)
- * @deprecated since bbPress (r5059)
+ * @since 2.0.0 bbPress (r2784)
+ *
+ * @deprecated 2.4.0 bbPress (r5059)
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_stick_topic
@@ -3250,7 +3254,7 @@ function bbp_topic_type_select( $args = array() ) {
 /**
  * Displays topic type select box (normal/sticky/super sticky)
  *
- * @since bbPress (r5059)
+ * @since 2.4.0 bbPress (r5059)
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_stick_topic
@@ -3264,7 +3268,7 @@ function bbp_form_topic_type_dropdown( $args = array() ) {
 	/**
 	 * Returns topic type select box (normal/sticky/super sticky)
 	 *
-	 * @since bbPress (r5059)
+	 * @since 2.4.0 bbPress (r5059)
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_stick_topic
@@ -3341,7 +3345,7 @@ function bbp_form_topic_type_dropdown( $args = array() ) {
 /**
  * Output value topic status dropdown
  *
- * @since bbPress (r5059)
+ * @since 2.4.0 bbPress (r5059)
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_topic_status
@@ -3359,7 +3363,7 @@ function bbp_form_topic_status_dropdown( $args = array() ) {
 	 * capability. Because of this, no additional capablitiy checks are performed
 	 * within this function to check available topic statuses.
 	 *
-	 * @since bbPress (r5059)
+	 * @since 2.4.0 bbPress (r5059)
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_topic_status
@@ -3428,7 +3432,7 @@ function bbp_form_topic_status_dropdown( $args = array() ) {
  * Output a fancy description of the current topic, including total topics,
  * total replies, and last activity.
  *
- * @since bbPress (r2860)
+ * @since 2.0.0 bbPress (r2860)
  *
  * @param array $args See {@link bbp_get_single_topic_description()}
  * @uses bbp_get_single_topic_description() Return the eventual output
@@ -3440,7 +3444,7 @@ function bbp_single_topic_description( $args = array() ) {
 	 * Return a fancy description of the current topic, including total topics,
 	 * total replies, and last activity.
 	 *
-	 * @since bbPress (r2860)
+	 * @since 2.0.0 bbPress (r2860)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - topic_id: Topic id
@@ -3512,7 +3516,7 @@ function bbp_single_topic_description( $args = array() ) {
 /**
  * Output the unique id of the topic tag taxonomy
  *
- * @since bbPress (r3348)
+ * @since 2.0.0 bbPress (r3348)
  *
  * @uses bbp_get_topic_post_type() To get the topic post type
  */
@@ -3522,7 +3526,7 @@ function bbp_topic_tag_tax_id() {
 	/**
 	 * Return the unique id of the topic tag taxonomy
 	 *
-	 * @since bbPress (r3348)
+	 * @since 2.0.0 bbPress (r3348)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_topic_tag_tax_id' with the topic tax id
 	 * @return string The unique topic tag taxonomy
@@ -3534,7 +3538,7 @@ function bbp_topic_tag_tax_id() {
 /**
  * Return array of labels used by the topic-tag taxonomy
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -3557,7 +3561,7 @@ function bbp_get_topic_tag_tax_labels() {
 /**
  * Return an array of topic-tag taxonomy rewrite settings
  *
- * @since bbPress (r5129)
+ * @since 2.5.0 bbPress (r5129)
  *
  * @return array
  */
@@ -3571,7 +3575,7 @@ function bbp_get_topic_tag_tax_rewrite() {
 /**
  * Output the id of the current tag
  *
- * @since bbPress (r3109)
+ * @since 2.0.0 bbPress (r3109)
  *
  * @uses bbp_get_topic_tag_id()
  */
@@ -3581,7 +3585,7 @@ function bbp_topic_tag_id( $tag = '' ) {
 	/**
 	 * Return the id of the current tag
 	 *
-	 * @since bbPress (r3109)
+	 * @since 2.0.0 bbPress (r3109)
 	 *
 	 * @uses get_term_by()
 	 * @uses get_queried_object()
@@ -3615,7 +3619,7 @@ function bbp_topic_tag_id( $tag = '' ) {
 /**
  * Output the name of the current tag
  *
- * @since bbPress (r3109)
+ * @since 2.0.0 bbPress (r3109)
  *
  * @uses bbp_get_topic_tag_name()
  */
@@ -3625,7 +3629,7 @@ function bbp_topic_tag_name( $tag = '' ) {
 	/**
 	 * Return the name of the current tag
 	 *
-	 * @since bbPress (r3109)
+	 * @since 2.0.0 bbPress (r3109)
 	 *
 	 * @uses get_term_by()
 	 * @uses get_queried_object()
@@ -3659,7 +3663,7 @@ function bbp_topic_tag_name( $tag = '' ) {
 /**
  * Output the slug of the current tag
  *
- * @since bbPress (r3109)
+ * @since 2.0.0 bbPress (r3109)
  *
  * @uses bbp_get_topic_tag_slug()
  */
@@ -3669,7 +3673,7 @@ function bbp_topic_tag_slug( $tag = '' ) {
 	/**
 	 * Return the slug of the current tag
 	 *
-	 * @since bbPress (r3109)
+	 * @since 2.0.0 bbPress (r3109)
 	 *
 	 * @uses get_term_by()
 	 * @uses get_queried_object()
@@ -3703,7 +3707,7 @@ function bbp_topic_tag_slug( $tag = '' ) {
 /**
  * Output the link of the current tag
  *
- * @since bbPress (r3348)
+ * @since 2.0.0 bbPress (r3348)
  *
  * @uses bbp_get_topic_tag_link()
  */
@@ -3713,7 +3717,7 @@ function bbp_topic_tag_link( $tag = '' ) {
 	/**
 	 * Return the link of the current tag
 	 *
-	 * @since bbPress (r3348)
+	 * @since 2.0.0 bbPress (r3348)
 	 *
 	 * @uses get_term_by()
 	 * @uses get_queried_object()
@@ -3747,7 +3751,7 @@ function bbp_topic_tag_link( $tag = '' ) {
 /**
  * Output the link of the current tag
  *
- * @since bbPress (r3348)
+ * @since 2.0.0 bbPress (r3348)
  *
  * @uses bbp_get_topic_tag_edit_link()
  */
@@ -3757,7 +3761,7 @@ function bbp_topic_tag_edit_link( $tag = '' ) {
 	/**
 	 * Return the link of the current tag
 	 *
-	 * @since bbPress (r3348)
+	 * @since 2.0.0 bbPress (r3348)
 	 *
 	 * @uses get_term_by()
 	 * @uses get_queried_object()
@@ -3799,7 +3803,7 @@ function bbp_topic_tag_edit_link( $tag = '' ) {
 /**
  * Output the description of the current tag
  *
- * @since bbPress (r3109)
+ * @since 2.0.0 bbPress (r3109)
  *
  * @uses bbp_get_topic_tag_description()
  */
@@ -3809,7 +3813,7 @@ function bbp_topic_tag_description( $args = array() ) {
 	/**
 	 * Return the description of the current tag
 	 *
-	 * @since bbPress (r3109)
+	 * @since 2.0.0 bbPress (r3109)
 	 *
 	 * @uses get_term_by()
 	 * @uses get_queried_object()
@@ -3854,7 +3858,7 @@ function bbp_topic_tag_description( $args = array() ) {
 /**
  * Output the value of topic title field
  *
- * @since bbPress (r2976)
+ * @since 2.0.0 bbPress (r2976)
  *
  * @uses bbp_get_form_topic_title() To get the value of topic title field
  */
@@ -3864,7 +3868,7 @@ function bbp_form_topic_title() {
 	/**
 	 * Return the value of topic title field
 	 *
-	 * @since bbPress (r2976)
+	 * @since 2.0.0 bbPress (r2976)
 	 *
 	 * @uses bbp_is_topic_edit() To check if it's topic edit page
 	 * @uses apply_filters() Calls 'bbp_get_form_topic_title' with the title
@@ -3891,7 +3895,7 @@ function bbp_form_topic_title() {
 /**
  * Output the value of topic content field
  *
- * @since bbPress (r2976)
+ * @since 2.0.0 bbPress (r2976)
  *
  * @uses bbp_get_form_topic_content() To get value of topic content field
  */
@@ -3901,7 +3905,7 @@ function bbp_form_topic_content() {
 	/**
 	 * Return the value of topic content field
 	 *
-	 * @since bbPress (r2976)
+	 * @since 2.0.0 bbPress (r2976)
 	 *
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
 	 * @uses apply_filters() Calls 'bbp_get_form_topic_content' with the content
@@ -3928,7 +3932,8 @@ function bbp_form_topic_content() {
 /**
  * Allow topic rows to have adminstrative actions
  *
- * @since bbPress (r3653)
+ * @since 2.1.0 bbPress (r3653)
+ *
  * @uses do_action()
  * @todo Links and filter
  */
@@ -3939,7 +3944,8 @@ function bbp_topic_row_actions() {
 /**
  * Output value of topic tags field
  *
- * @since bbPress (r2976)
+ * @since 2.0.0 bbPress (r2976)
+ *
  * @uses bbp_get_form_topic_tags() To get the value of topic tags field
  */
 function bbp_form_topic_tags() {
@@ -3948,7 +3954,7 @@ function bbp_form_topic_tags() {
 	/**
 	 * Return value of topic tags field
 	 *
-	 * @since bbPress (r2976)
+	 * @since 2.0.0 bbPress (r2976)
 	 *
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
 	 * @uses apply_filters() Calls 'bbp_get_form_topic_tags' with the tags
@@ -4003,7 +4009,7 @@ function bbp_form_topic_tags() {
 /**
  * Output value of topic forum
  *
- * @since bbPress (r2976)
+ * @since 2.0.0 bbPress (r2976)
  *
  * @uses bbp_get_form_topic_forum() To get the topic's forum id
  */
@@ -4013,7 +4019,7 @@ function bbp_form_topic_forum() {
 	/**
 	 * Return value of topic forum
 	 *
-	 * @since bbPress (r2976)
+	 * @since 2.0.0 bbPress (r2976)
 	 *
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
 	 * @uses bbp_get_topic_forum_id() To get the topic forum id
@@ -4041,7 +4047,7 @@ function bbp_form_topic_forum() {
 /**
  * Output checked value of topic subscription
  *
- * @since bbPress (r2976)
+ * @since 2.0.0 bbPress (r2976)
  *
  * @uses bbp_get_form_topic_subscribed() To get the subscribed checkbox value
  */
@@ -4051,7 +4057,7 @@ function bbp_form_topic_subscribed() {
 	/**
 	 * Return checked value of topic subscription
 	 *
-	 * @since bbPress (r2976)
+	 * @since 2.0.0 bbPress (r2976)
 	 *
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
 	 * @uses bbp_is_user_subscribed_to_topic() To check if the user is
@@ -4099,7 +4105,7 @@ function bbp_form_topic_subscribed() {
 /**
  * Output checked value of topic log edit field
  *
- * @since bbPress (r2976)
+ * @since 2.0.0 bbPress (r2976)
  *
  * @uses bbp_get_form_topic_log_edit() To get the topic log edit value
  */
@@ -4109,7 +4115,7 @@ function bbp_form_topic_log_edit() {
 	/**
 	 * Return checked value of topic log edit field
 	 *
-	 * @since bbPress (r2976)
+	 * @since 2.0.0 bbPress (r2976)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_form_topic_log_edit' with the
 	 *                        log edit value
@@ -4135,7 +4141,7 @@ function bbp_form_topic_log_edit() {
 /**
  * Output the value of the topic edit reason
  *
- * @since bbPress (r2976)
+ * @since 2.0.0 bbPress (r2976)
  *
  * @uses bbp_get_form_topic_edit_reason() To get the topic edit reason value
  */
@@ -4145,7 +4151,7 @@ function bbp_form_topic_edit_reason() {
 	/**
 	 * Return the value of the topic edit reason
 	 *
-	 * @since bbPress (r2976)
+	 * @since 2.0.0 bbPress (r2976)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_form_topic_edit_reason' with the
 	 *                        topic edit reason value
@@ -4173,7 +4179,8 @@ function bbp_form_topic_edit_reason() {
  *
  * @see bbp_topic_form_fields()
  *
- * @since bbPress (r5558)
+ * @since 2.6.0 bbPress (r5558)
+ *
  * @return boolean True if is a post request with valid nonce
  */
 function bbp_is_topic_form_post_request() {
diff --git src/includes/users/capabilities.php src/includes/users/capabilities.php
index 8e1cca4..d3157ac 100644
--- src/includes/users/capabilities.php
+++ src/includes/users/capabilities.php
@@ -12,7 +12,7 @@
 /**
  * Maps primary capabilities
  *
- * @since bbPress (r4242)
+ * @since 2.2.0 bbPress (r4242)
  *
  * @param array  $caps Capabilities for meta capability.
  * @param string $cap Capability name.
@@ -123,7 +123,7 @@ function bbp_map_primary_meta_caps( $caps = array(), $cap = '', $user_id = 0, $a
 /**
  * Return a user's main role
  *
- * @since bbPress (r3860)
+ * @since 2.1.0 bbPress (r3860)
  *
  * @param int $user_id
  * @uses bbp_get_user_id() To get the user id
@@ -176,7 +176,7 @@ function bbp_set_user_role( $user_id = 0, $new_role = '' ) {
 /**
  * Return a user's forums role
  *
- * @since bbPress (r3860)
+ * @since 2.1.0 bbPress (r3860)
  *
  * @param int $user_id
  * @uses bbp_get_user_id() To get the user id
@@ -214,7 +214,7 @@ function bbp_get_user_role( $user_id = 0 ) {
 /**
  * Return a user's blog role
  *
- * @since bbPress (r4446)
+ * @since 2.3.0 bbPress (r4446)
  *
  * @param int $user_id
  * @uses bbp_get_user_id() To get the user id
@@ -256,7 +256,7 @@ function bbp_get_user_blog_role( $user_id = 0 ) {
  * Helper function hooked to 'bbp_profile_update' action to save or
  * update user roles and capabilities.
  *
- * @since bbPress (r4235)
+ * @since 2.2.0 bbPress (r4235)
  *
  * @param int $user_id
  * @uses bbp_reset_user_caps() to reset caps
@@ -303,7 +303,7 @@ function bbp_profile_update_role( $user_id = 0 ) {
  * This function will bail if the forum is not global in a multisite
  * installation of WordPress, or if the user is marked as spam or deleted.
  *
- * @since bbPress (r3380)
+ * @since 2.0.0 bbPress (r3380)
  *
  * @uses is_user_logged_in() To bail if user is not logged in
  * @uses bbp_get_user_role() To bail if user already has a role
@@ -394,7 +394,7 @@ function bbp_set_current_user_default_role() {
  * appropriate bbPress roles to WordPress users that wouldn't already have a
  * role in the forums. Also guarantees WordPress admins get the Keymaster role.
  *
- * @since bbPress (r4334)
+ * @since 2.2.0 bbPress (r4334)
  *
  * @return array Filtered array of WordPress roles to bbPress roles
  */
@@ -418,7 +418,7 @@ function bbp_get_user_role_map() {
 /**
  * Checks if the user has been marked as a spammer.
  *
- * @since bbPress (r3355)
+ * @since 2.0.0 bbPress (r3355)
  *
  * @param int $user_id int The ID for the user.
  * @return bool True if spammer, False if not.
@@ -456,7 +456,7 @@ function bbp_is_user_spammer( $user_id = 0 ) {
 /**
  * Mark a users topics and replies as spam when the user is marked as spam
  *
- * @since bbPress (r3405)
+ * @since 2.0.0 bbPress (r3405)
  *
  * @param int $user_id Optional. User ID to spam. Defaults to displayed user.
 
@@ -548,7 +548,7 @@ function bbp_make_spam_user( $user_id = 0 ) {
 /**
  * Mark a users topics and replies as spam when the user is marked as spam
  *
- * @since bbPress (r3405)
+ * @since 2.0.0 bbPress (r3405)
  *
  * @param int $user_id Optional. User ID to unspam. Defaults to displayed user.
  *
@@ -639,7 +639,7 @@ function bbp_make_ham_user( $user_id = 0 ) {
 /**
  * Checks if the user has been marked as deleted.
  *
- * @since bbPress (r3355)
+ * @since 2.0.0 bbPress (r3355)
  *
  * @param int $user_id int The ID for the user.
  * @return bool True if deleted, False if not.
@@ -677,7 +677,7 @@ function bbp_is_user_deleted( $user_id = 0 ) {
 /**
  * Checks if user is active
  *
- * @since bbPress (r3502)
+ * @since 2.0.0 bbPress (r3502)
  *
  * @uses is_user_logged_in() To check if user is logged in
  * @uses bbp_get_displayed_user_id() To get current user ID
@@ -716,7 +716,7 @@ function bbp_is_user_active( $user_id = 0 ) {
 /**
  * Checks if user is not active.
  *
- * @since bbPress (r3502)
+ * @since 2.0.0 bbPress (r3502)
  *
  * @uses is_user_logged_in() To check if user is logged in
  * @uses bbp_get_displayed_user_id() To get current user ID
@@ -744,7 +744,7 @@ function bbp_is_user_inactive( $user_id = 0 ) {
 /**
  * Checks if user is a keymaster
  *
- * @since bbPress (r4783)
+ * @since 2.3.0 bbPress (r4783)
  *
  * @param int $user_id
  * @return bool True if keymaster, false if not
@@ -761,7 +761,7 @@ function bbp_is_user_keymaster( $user_id = 0 ) {
 /**
  * Does a user have a profile for the current site
  *
- * @since bbPress (r4362)
+ * @since 2.2.0 bbPress (r4362)
  *
  * @param int $user_id User ID to check
  * @param int $blog_id Blog ID to check
diff --git src/includes/users/functions.php src/includes/users/functions.php
index 569970b..310f825 100644
--- src/includes/users/functions.php
+++ src/includes/users/functions.php
@@ -13,7 +13,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Redirect back to $url when attempting to use the login page
  *
- * @since bbPress (r2815)
+ * @since 2.0.0 bbPress (r2815)
  *
  * @param string $url The url
  * @param string $raw_url Raw url
@@ -45,7 +45,7 @@ function bbp_redirect_login( $url = '', $raw_url = '', $user = '' ) {
 /**
  * Is an anonymous topic/reply being made?
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @uses is_user_logged_in() Is the user logged in?
  * @uses bbp_allow_anonymous() Is anonymous posting allowed?
@@ -66,7 +66,7 @@ function bbp_is_anonymous() {
 /**
  * Echoes the values for current poster (uses WP comment cookies)
  *
- * @since bbPress (r2734)
+ * @since 2.0.0 bbPress (r2734)
  *
  * @param string $key Which value to echo?
  * @uses bbp_get_current_anonymous_user_data() To get the current anonymous user
@@ -79,7 +79,7 @@ function bbp_current_anonymous_user_data( $key = '' ) {
 	/**
 	 * Get the cookies for current poster (uses WP comment cookies).
 	 *
-	 * @since bbPress (r2734)
+	 * @since 2.0.0 bbPress (r2734)
 	 *
 	 * @param string $key Optional. Which value to get? If not given, then
 	 *                     an array is returned.
@@ -113,7 +113,7 @@ function bbp_current_anonymous_user_data( $key = '' ) {
 /**
  * Set the cookies for current poster (uses WP comment cookies)
  *
- * @since bbPress (r2734)
+ * @since 2.0.0 bbPress (r2734)
  *
  * @param array $anonymous_data With keys 'bbp_anonymous_name',
  *                               'bbp_anonymous_email', 'bbp_anonymous_website'.
@@ -138,7 +138,7 @@ function bbp_set_current_anonymous_user_data( $anonymous_data = array() ) {
 /**
  * Get the poster IP address
  *
- * @since bbPress (r3120)
+ * @since 2.0.0 bbPress (r3120)
  *
  * @return string
  */
@@ -158,7 +158,7 @@ function bbp_current_author_ip() {
 /**
  * Get the poster user agent
  *
- * @since bbPress (r3446)
+ * @since 2.0.0 bbPress (r3446)
  *
  * @return string
  */
@@ -173,7 +173,7 @@ function bbp_current_author_ua() {
 /**
  * Get the users who have made the topic favorite
  *
- * @since bbPress (r2658)
+ * @since 2.0.0 bbPress (r2658)
  *
  * @param int $topic_id Optional. Topic id
  * @uses wpdb::get_col() To execute our query and get the column back
@@ -201,7 +201,7 @@ function bbp_get_topic_favoriters( $topic_id = 0 ) {
 /**
  * Get a user's favorite topics
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_favorites_topic_ids() To get the user's favorites
@@ -230,7 +230,7 @@ function bbp_get_user_favorites( $user_id = 0 ) {
 /**
  * Get a user's favorite topics' ids
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_id() To get the user id
@@ -254,7 +254,7 @@ function bbp_get_user_favorites_topic_ids( $user_id = 0 ) {
 /**
  * Check if a topic is in user's favorites or not
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param int $user_id Optional. User id
  * @param int $topic_id Optional. Topic id
@@ -304,7 +304,7 @@ function bbp_is_user_favorite( $user_id = 0, $topic_id = 0 ) {
 /**
  * Add a topic to user's favorites
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param int $user_id Optional. User id
  * @param int $topic_id Optional. Topic id
@@ -341,7 +341,7 @@ function bbp_add_user_favorite( $user_id = 0, $topic_id = 0 ) {
 /**
  * Remove a topic from user's favorites
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param int $user_id Optional. User id
  * @param int $topic_id Optional. Topic id
@@ -490,7 +490,7 @@ function bbp_favorites_handler( $action = '' ) {
 /**
  * Get the users who have subscribed to the forum
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $forum_id Optional. forum id
  * @uses wpdb::get_col() To execute our query and get the column back
@@ -517,7 +517,7 @@ function bbp_get_forum_subscribers( $forum_id = 0 ) {
 /**
  * Get the users who have subscribed to the topic
  *
- * @since bbPress (r2668)
+ * @since 2.0.0 bbPress (r2668)
  *
  * @param int $topic_id Optional. Topic id
  * @uses wpdb::get_col() To execute our query and get the column back
@@ -544,9 +544,9 @@ function bbp_get_topic_subscribers( $topic_id = 0 ) {
 /**
  * Get a user's subscribed topics
  *
- * @since bbPress (r2668)
+ * @since 2.0.0 bbPress (r2668)
  *
- * @deprecated since bbPress (r5156)
+ * @deprecated 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_topic_subscriptions() To get the user's subscriptions
@@ -561,7 +561,7 @@ function bbp_get_user_subscriptions( $user_id = 0 ) {
 /**
  * Get a user's subscribed topics
  *
- * @since bbPress (r2668)
+ * @since 2.0.0 bbPress (r2668)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_subscribed_topic_ids() To get the user's subscriptions
@@ -592,7 +592,7 @@ function bbp_get_user_topic_subscriptions( $user_id = 0 ) {
 /**
  * Get a user's subscribed forums
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_subscribed_forum_ids() To get the user's subscriptions
@@ -623,7 +623,7 @@ function bbp_get_user_forum_subscriptions( $user_id = 0 ) {
 /**
  * Get a user's subscribed forum ids
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_id() To get the user id
@@ -647,7 +647,7 @@ function bbp_get_user_subscribed_forum_ids( $user_id = 0 ) {
 /**
  * Get a user's subscribed topics' ids
  *
- * @since bbPress (r2668)
+ * @since 2.0.0 bbPress (r2668)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_id() To get the user id
@@ -671,7 +671,7 @@ function bbp_get_user_subscribed_topic_ids( $user_id = 0 ) {
 /**
  * Check if a topic or forum is in user's subscription list or not
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @param int $object_id Optional. Topic id
@@ -725,7 +725,7 @@ function bbp_is_user_subscribed( $user_id = 0, $object_id = 0 ) {
 /**
  * Check if a forum is in user's subscription list or not
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @param int $forum_id Optional. Topic id
@@ -782,7 +782,7 @@ function bbp_is_user_subscribed_to_forum( $user_id = 0, $forum_id = 0, $subscrib
 /**
  * Check if a topic is in user's subscription list or not
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @param int $topic_id Optional. Topic id
@@ -839,7 +839,7 @@ function bbp_is_user_subscribed_to_topic( $user_id = 0, $topic_id = 0, $subscrib
 /**
  * Add a topic to user's subscriptions
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @param int $object_id Optional. Topic id
@@ -885,7 +885,7 @@ function bbp_add_user_subscription( $user_id = 0, $object_id = 0 ) {
 /**
  * Add a forum to user's subscriptions
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @param int $forum_id Optional. forum id
@@ -922,7 +922,7 @@ function bbp_add_user_forum_subscription( $user_id = 0, $forum_id = 0 ) {
 /**
  * Add a topic to user's subscriptions
  *
- * @since bbPress (r2668)
+ * @since 2.0.0 bbPress (r2668)
  *
  * @param int $user_id Optional. User id
  * @param int $topic_id Optional. Topic id
@@ -959,7 +959,7 @@ function bbp_add_user_topic_subscription( $user_id = 0, $topic_id = 0 ) {
 /**
  * Remove a topic from user's subscriptions
  *
- * @since bbPress (r2668)
+ * @since 2.0.0 bbPress (r2668)
  *
  * @param int $user_id Optional. User id
  * @param int $object_id Optional. Topic id
@@ -1005,7 +1005,7 @@ function bbp_remove_user_subscription( $user_id = 0, $object_id = 0 ) {
 /**
  * Remove a forum from user's subscriptions
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @param int $forum_id Optional. forum id
@@ -1052,7 +1052,7 @@ function bbp_remove_user_forum_subscription( $user_id, $forum_id ) {
 /**
  * Remove a topic from user's subscriptions
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param int $user_id Optional. User id
  * @param int $topic_id Optional. Topic id
@@ -1099,7 +1099,7 @@ function bbp_remove_user_topic_subscription( $user_id, $topic_id ) {
 /**
  * Handles the front end subscribing and unsubscribing forums
  *
- * @since bbPress (r5156)
+ * @since 2.5.0 bbPress (r5156)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_is_subscriptions_active() To check if the subscriptions are active
@@ -1204,7 +1204,7 @@ function bbp_forum_subscriptions_handler( $action = '' ) {
 /**
  * Handles the front end subscribing and unsubscribing topics
  *
- * @since bbPress (r2790)
+ * @since 2.0.0 bbPress (r2790)
  *
  * @param string $action The requested action to compare this function to
  * @uses bbp_is_subscriptions_active() To check if the subscriptions are active
@@ -1311,7 +1311,7 @@ function bbp_subscriptions_handler( $action = '' ) {
 /**
  * Handles the front end user editing from POST requests
  *
- * @since bbPress (r2790)
+ * @since 2.0.0 bbPress (r2790)
  *
  * @param string $action The requested action to compare this function to
  * @uses is_multisite() To check if it's a multisite
@@ -1445,7 +1445,7 @@ function bbp_edit_user_handler( $action = '' ) {
 /**
  * Handles user email address updating from GET requests
  *
- * @since bbPress (r5660)
+ * @since 2.6.0 bbPress (r5660)
  *
  * @param string $action
  *
@@ -1555,7 +1555,7 @@ function bbp_user_email_change_handler( $action = '' ) {
 /**
  * Sends an email when an email address change occurs on POST requests
  *
- * @since bbPress (r5660)
+ * @since 2.6.0 bbPress (r5660)
  *
  * @see send_confirmation_on_profile_email()
  *
@@ -1637,7 +1637,7 @@ The %4$s Team
  * output actions if they don't want any unexpected junk to appear there, and
  * also avoids needing to pollute the templates with additional logic and actions.
  *
- * @since bbPress (r4273)
+ * @since 2.2.0 bbPress (r4273)
  *
  * @uses bbp_is_user_home_edit() To switch the action fired
  * @uses get_userdata() To get the current user's data
@@ -1654,7 +1654,7 @@ function bbp_user_edit_after() {
 /**
  * Get the topics that a user created
  *
- * @since bbPress (r2660)
+ * @since 2.0.0 bbPress (r2660)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_id() To get the topic id
@@ -1680,7 +1680,7 @@ function bbp_get_user_topics_started( $user_id = 0 ) {
 /**
  * Get the replies that a user created
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_id() To get the topic id
@@ -1708,7 +1708,8 @@ function bbp_get_user_replies_created( $user_id = 0 ) {
 /**
  * Get the total number of users on the forums
  *
- * @since bbPress (r2769)
+ * @since 2.0.0 bbPress (r2769)
+ *
  * @uses count_users() To execute our query and get the var back
  * @uses apply_filters() Calls 'bbp_get_total_users' with number of users
  * @return int Total number of users
@@ -1723,7 +1724,7 @@ function bbp_get_total_users() {
 /**
  * Return the raw database count of topics by a user
  *
- * @since bbPress (r3633)
+ * @since 2.1.0 bbPress (r3633)
  *
  * @param int $user_id User ID to get count for
  *
@@ -1750,7 +1751,7 @@ function bbp_get_user_topic_count_raw( $user_id = 0 ) {
 /**
  * Return the raw database count of replies by a user
  *
- * @since bbPress (r3633)
+ * @since 2.1.0 bbPress (r3633)
  *
  * @param int $user_id User ID to get count for
  *
@@ -1777,7 +1778,7 @@ function bbp_get_user_reply_count_raw( $user_id = 0 ) {
 /**
  * Bump the topic count for a user by a certain amount.
  *
- * @since bbPress (r5309)
+ * @since 2.6.0 bbPress (r5309)
  *
  * @param int $user_id
  * @param int $difference
@@ -1815,7 +1816,7 @@ function bbp_bump_user_topic_count( $user_id = 0, $difference = 1 ) {
 /**
  * Bump the reply count for a user by a certain amount.
  *
- * @since bbPress (r5309)
+ * @since 2.6.0 bbPress (r5309)
  *
  * @param int $user_id
  * @param int $difference
@@ -1854,7 +1855,7 @@ function bbp_bump_user_reply_count( $user_id = 0, $difference = 1 ) {
  * Helper function used to increase (by one) the count of topics for a user when
  * a topic is published.
  *
- * @since bbPress (r5309)
+ * @since 2.6.0 bbPress (r5309)
  *
  * @access
  * @param $topic_id
@@ -1873,7 +1874,7 @@ function bbp_increase_user_topic_count( $topic_id = 0 ) {
  *
  * This is a helper function, hooked to `bbp_new_reply`
  *
- * @since bbPress (r5309)
+ * @since 2.6.0 bbPress (r5309)
  *
  * @param $topic_id
  * @param $forum_id
@@ -1889,7 +1890,7 @@ function bbp_increase_user_reply_count( $reply_id = 0 ) {
  * Helper function used to decrease (by one) the count of topics for a user when
  * a topic is unpublished.
  *
- * @since bbPress (r5309)
+ * @since 2.6.0 bbPress (r5309)
  *
  * @param $topic_id
  */
@@ -1902,7 +1903,7 @@ function bbp_decrease_user_topic_count( $topic_id = 0 ) {
  * Helper function used to increase (by one) the count of replies for a user when
  * a topic is unpublished.
  *
- * @since bbPress (r5309)
+ * @since 2.6.0 bbPress (r5309)
  *
  * @param $reply_id
  */
@@ -1916,7 +1917,7 @@ function bbp_decrease_user_reply_count( $reply_id = 0 ) {
 /**
  * Return the term id for a given user id and taxonomy
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @param int    $user_id User id.
  * @param string $taxonomy Taxonomy.
@@ -1956,7 +1957,7 @@ function bbp_get_user_taxonomy_term_id( $user_id = 0, $taxonomy = '' ) {
 /**
  * Return the user id for a given term id and taxonomy
  *
- * @since bbPress (r5834)
+ * @since 2.6.0 bbPress (r5834)
  *
  * @param int    $term_id Term id.
  * @param string $taxonomy Taxonomy.
@@ -2042,7 +2043,7 @@ function bbp_filter_forum_mod_term_link( $termlink = '', $term = '', $taxonomy =
  * met, we assume a user cannot perform this task, and look for ways they can
  * earn the ability to access this template.
  *
- * @since bbPress (r3605)
+ * @since 2.1.0 bbPress (r3605)
  *
  * @uses bbp_is_single_user_edit()
  * @uses current_user_can()
@@ -2093,7 +2094,7 @@ function bbp_check_user_edit() {
 /**
  * Check if a user is blocked, or cannot spectate the forums.
  *
- * @since bbPress (r2996)
+ * @since 2.0.0 bbPress (r2996)
  *
  * @uses is_user_logged_in() To check if user is logged in
  * @uses bbp_is_user_keymaster() To check if user is a keymaster
@@ -2131,7 +2132,7 @@ function bbp_forum_enforce_blocked() {
  *    a backwards compatible approach like this one was necessary to protect
  *    existing installations that may have custom template parts.
  *
- * @since bbPress (r5368)
+ * @since 2.6.0 bbPress (r5368)
  *
  * @param string $value
  * @param string $field
@@ -2188,7 +2189,7 @@ function bbp_sanitize_displayed_user_field( $value = '', $field = '', $context =
 /**
  * Convert passwords from previous platfrom encryption to WordPress encryption.
  *
- * @since bbPress (r3813)
+ * @since 2.1.0 bbPress (r3813)
  */
 function bbp_user_maybe_convert_pass() {
 
diff --git src/includes/users/options.php src/includes/users/options.php
index e420113..794cebb 100644
--- src/includes/users/options.php
+++ src/includes/users/options.php
@@ -13,7 +13,8 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Get the default user options and their values
  *
- * @since bbPress (r3910)
+ * @since 2.1.0 bbPress (r3910)
+ *
  * @return array Filtered user option names and values
  */
 function bbp_get_default_user_options() {
@@ -33,7 +34,8 @@ function bbp_get_default_user_options() {
  *
  * This is destructive, so existing bbPress user options will be overridden.
  *
- * @since bbPress (r3910)
+ * @since 2.1.0 bbPress (r3910)
+ *
  * @uses bbp_get_default_user_options() To get default options
  * @uses update_user_option() Adds default options
  * @uses do_action() Calls 'bbp_add_user_options'
@@ -61,7 +63,8 @@ function bbp_add_user_options( $user_id = 0 ) {
  * Hooked to bbp_uninstall, it is only called once when bbPress is uninstalled.
  * This is destructive, so existing bbPress user options will be destroyed.
  *
- * @since bbPress (r3910)
+ * @since 2.1.0 bbPress (r3910)
+ *
  * @uses bbp_get_default_user_options() To get default options
  * @uses delete_user_option() Removes default options
  * @uses do_action() Calls 'bbp_delete_options'
@@ -87,7 +90,8 @@ function bbp_delete_user_options( $user_id = 0 ) {
  * Add filters to each bbPress option and allow them to be overloaded from
  * inside the $bbp->options array.
  *
- * @since bbPress (r3910)
+ * @since 2.1.0 bbPress (r3910)
+ *
  * @uses bbp_get_default_user_options() To get default options
  * @uses add_filter() To add filters to 'pre_option_{$key}'
  * @uses do_action() Calls 'bbp_add_option_filters'
@@ -107,7 +111,8 @@ function bbp_setup_user_option_filters() {
  * Filter default options and allow them to be overloaded from inside the
  * $bbp->user_options array.
  *
- * @since bbPress (r3910)
+ * @since 2.1.0 bbPress (r3910)
+ *
  * @param bool $value Optional. Default value false
  * @return mixed false if not overloaded, mixed if set
  */
@@ -128,7 +133,7 @@ function bbp_filter_get_user_option( $value = false, $option = '', $user = 0 ) {
 /**
  * Update the topic count for a user
  *
- * @since bbPress (r5309)
+ * @since 2.6.0 bbPress (r5309)
  *
  * @param int $user_id
  * @param mixed $count
@@ -157,7 +162,7 @@ function bbp_update_user_topic_count( $user_id = 0, $count = false ) {
 /**
  * Update the reply count for a user
  *
- * @since bbPress (r5309)
+ * @since 2.6.0 bbPress (r5309)
  *
  * @param int $user_id
  * @param mixed $count
@@ -186,7 +191,7 @@ function bbp_update_user_reply_count( $user_id = 0, $count = false ) {
 /**
  * Output a users topic count
  *
- * @since bbPress (r3632)
+ * @since 2.1.0 bbPress (r3632)
  *
  * @param int $user_id
  * @param boolean $integer Optional. Whether or not to format the result
@@ -199,7 +204,7 @@ function bbp_user_topic_count( $user_id = 0, $integer = false ) {
 	/**
 	 * Return a users reply count
 	 *
-	 * @since bbPress (r3632)
+	 * @since 2.1.0 bbPress (r3632)
 	 *
 	 * @param int $user_id
 	 * @param boolean $integer Optional. Whether or not to format the result
@@ -225,7 +230,7 @@ function bbp_user_topic_count( $user_id = 0, $integer = false ) {
 /**
  * Output a users reply count
  *
- * @since bbPress (r3632)
+ * @since 2.1.0 bbPress (r3632)
  *
  * @param int $user_id
  * @param boolean $integer Optional. Whether or not to format the result
@@ -238,7 +243,7 @@ function bbp_user_reply_count( $user_id = 0, $integer = false ) {
 	/**
 	 * Return a users reply count
 	 *
-	 * @since bbPress (r3632)
+	 * @since 2.1.0 bbPress (r3632)
 	 *
 	 * @param int $user_id
 	 * @param boolean $integer Optional. Whether or not to format the result
@@ -264,7 +269,7 @@ function bbp_user_reply_count( $user_id = 0, $integer = false ) {
 /**
  * Output a users total post count
  *
- * @since bbPress (r3632)
+ * @since 2.1.0 bbPress (r3632)
  *
  * @param int $user_id
  * @param boolean $integer Optional. Whether or not to format the result
@@ -277,7 +282,7 @@ function bbp_user_post_count( $user_id = 0, $integer = false ) {
 	/**
 	 * Return a users total post count
 	 *
-	 * @since bbPress (r3632)
+	 * @since 2.1.0 bbPress (r3632)
 	 *
 	 * @param int $user_id
 	 * @param boolean $integer Optional. Whether or not to format the result
@@ -307,7 +312,8 @@ function bbp_user_post_count( $user_id = 0, $integer = false ) {
 /**
  * Update a users last posted time, for use with post throttling
  *
- * @since bbPress (r3910)
+ * @since 2.1.0 bbPress (r3910)
+ *
  * @param int $user_id User ID to update
  * @param int $time Time in time() format
  * @return bool False if no user or failure, true if successful
@@ -331,7 +337,8 @@ function bbp_update_user_last_posted( $user_id = 0, $time = 0 ) {
 /**
  * Output the raw value of the last posted time.
  *
- * @since bbPress (r3910)
+ * @since 2.1.0 bbPress (r3910)
+ *
  * @param int $user_id User ID to retrieve value for
  * @uses bbp_get_user_last_posted() To output the last posted time
  */
@@ -342,7 +349,8 @@ function bbp_user_last_posted( $user_id = 0 ) {
 	/**
 	 * Return the raw value of teh last posted time.
 	 *
-	 * @since bbPress (r3910)
+	 * @since 2.1.0 bbPress (r3910)
+	 *
 	 * @param int $user_id User ID to retrieve value for
 	 * @return mixed False if no user, time() format if exists
 	 */
diff --git src/includes/users/template.php src/includes/users/template.php
index fd76f4a..6191d3c 100644
--- src/includes/users/template.php
+++ src/includes/users/template.php
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit;
 /**
  * Output a validated user id
  *
- * @since bbPress (r2729)
+ * @since 2.0.0 bbPress (r2729)
  *
  * @param int $user_id Optional. User id
  * @param bool $displayed_user_fallback Fallback on displayed user?
@@ -28,7 +28,7 @@ function bbp_user_id( $user_id = 0, $displayed_user_fallback = true, $current_us
 	/**
 	 * Return a validated user id
 	 *
-	 * @since bbPress (r2729)
+	 * @since 2.0.0 bbPress (r2729)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @param bool $displayed_user_fallback Fallback on displayed user?
@@ -63,7 +63,7 @@ function bbp_user_id( $user_id = 0, $displayed_user_fallback = true, $current_us
 /**
  * Output ID of current user
  *
- * @since bbPress (r2574)
+ * @since 2.0.0 bbPress (r2574)
  *
  * @uses bbp_get_current_user_id() To get the current user id
  */
@@ -73,7 +73,7 @@ function bbp_current_user_id() {
 	/**
 	 * Return ID of current user
 	 *
-	 * @since bbPress (r2574)
+	 * @since 2.0.0 bbPress (r2574)
 	 *
 	 * @uses bbp_get_user_id() To get the current user id
 	 * @uses apply_filters() Calls 'bbp_get_current_user_id' with the id
@@ -86,7 +86,7 @@ function bbp_current_user_id() {
 /**
  * Output ID of displayed user
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @uses bbp_get_displayed_user_id() To get the displayed user id
  */
@@ -96,7 +96,7 @@ function bbp_displayed_user_id() {
 	/**
 	 * Return ID of displayed user
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
 	 *
 	 * @uses bbp_get_user_id() To get the displayed user id
 	 * @uses apply_filters() Calls 'bbp_get_displayed_user_id' with the id
@@ -113,7 +113,7 @@ function bbp_displayed_user_id() {
  * the field value that it finds. Since it uses the WP_User object's magic
  * __get() method, it can also be used to get user_meta values.
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @param string $field Field to get
  * @param string $filter How to filter the field value (null|raw|db|display|edit)
@@ -129,7 +129,7 @@ function bbp_displayed_user_field( $field = '', $filter = 'display' ) {
 	 * the field value that it finds. Since it uses the WP_User object's magic
 	 * __get() method, it can also be used to get user_meta values.
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
 	 *
 	 * @param string $field Field to get
 	 * @param string $filter How to filter the field value (null|raw|db|display|edit)
@@ -162,7 +162,7 @@ function bbp_displayed_user_field( $field = '', $filter = 'display' ) {
 /**
  * Output name of current user
  *
- * @since bbPress (r2574)
+ * @since 2.0.0 bbPress (r2574)
  *
  * @uses bbp_get_current_user_name() To get the current user name
  */
@@ -172,7 +172,7 @@ function bbp_current_user_name() {
 	/**
 	 * Return name of current user
 	 *
-	 * @since bbPress (r2574)
+	 * @since 2.0.0 bbPress (r2574)
 	 *
 	 * @uses apply_filters() Calls 'bbp_get_current_user_name' with the
 	 *                        current user name
@@ -189,7 +189,7 @@ function bbp_current_user_name() {
 /**
  * Output avatar of current user
  *
- * @since bbPress (r2574)
+ * @since 2.0.0 bbPress (r2574)
  *
  * @param int $size Size of the avatar. Defaults to 40
  * @uses bbp_get_current_user_avatar() To get the current user avatar
@@ -201,7 +201,7 @@ function bbp_current_user_avatar( $size = 40 ) {
 	/**
 	 * Return avatar of current user
 	 *
-	 * @since bbPress (r2574)
+	 * @since 2.0.0 bbPress (r2574)
 	 *
 	 * @param int $size Size of the avatar. Defaults to 40
 	 * @uses bbp_get_current_user_id() To get the current user id
@@ -227,7 +227,7 @@ function bbp_current_user_avatar( $size = 40 ) {
 /**
  * Output link to the profile page of a user
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_profile_link() To get user profile link
@@ -238,7 +238,7 @@ function bbp_user_profile_link( $user_id = 0 ) {
 	/**
 	 * Return link to the profile page of a user
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @uses bbp_get_user_id() To get user id
@@ -265,7 +265,7 @@ function bbp_user_profile_link( $user_id = 0 ) {
 /**
  * Output a users nicename to the screen
  *
- * @since bbPress (r4671)
+ * @since 2.3.0 bbPress (r4671)
  *
  * @param int $user_id User ID whose nicename to get
  * @param array $args before|after|user_id|force
@@ -276,7 +276,7 @@ function bbp_user_nicename( $user_id = 0, $args = array() ) {
 	/**
 	 * Return a users nicename to the screen
 	 *
-	 * @since bbPress (r4671)
+	 * @since 2.3.0 bbPress (r4671)
 	 *
 	 * @param int $user_id User ID whose nicename to get
 	 * @param array $args before|after|user_id|force
@@ -318,7 +318,7 @@ function bbp_user_nicename( $user_id = 0, $args = array() ) {
 /**
  * Output URL to the profile page of a user
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @param int $user_id Optional. User id
  * @param string $user_nicename Optional. User nicename
@@ -330,7 +330,7 @@ function bbp_user_profile_url( $user_id = 0, $user_nicename = '' ) {
 	/**
 	 * Return URL to the profile page of a user
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @param string $user_nicename Optional. User nicename
@@ -381,7 +381,7 @@ function bbp_user_profile_url( $user_id = 0, $user_nicename = '' ) {
 /**
  * Output link to the profile edit page of a user
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_user_profile_edit_link() To get user profile edit link
@@ -392,7 +392,7 @@ function bbp_user_profile_edit_link( $user_id = 0 ) {
 	/**
 	 * Return link to the profile edit page of a user
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @uses bbp_get_user_id() To get user id
@@ -418,7 +418,7 @@ function bbp_user_profile_edit_link( $user_id = 0 ) {
 /**
  * Output URL to the profile edit page of a user
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @param int $user_id Optional. User id
  * @param string $user_nicename Optional. User nicename
@@ -430,7 +430,7 @@ function bbp_user_profile_edit_url( $user_id = 0, $user_nicename = '' ) {
 	/**
 	 * Return URL to the profile edit page of a user
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @param string $user_nicename Optional. User nicename
@@ -478,7 +478,7 @@ function bbp_user_profile_edit_url( $user_id = 0, $user_nicename = '' ) {
 /**
  * Output a user's main role for display
  *
- * @since bbPress (r3860)
+ * @since 2.1.0 bbPress (r3860)
  *
  * @param int $user_id
  * @uses bbp_get_user_display_role To get the user display role
@@ -489,7 +489,7 @@ function bbp_user_display_role( $user_id = 0 ) {
 	/**
 	 * Return a user's main role for display
 	 *
-	 * @since bbPress (r3860)
+	 * @since 2.1.0 bbPress (r3860)
 	 *
 	 * @param int $user_id
 	 * @uses bbp_get_user_id() to verify the user ID
@@ -529,7 +529,7 @@ function bbp_user_display_role( $user_id = 0 ) {
 /**
  * Output the link to the admin section
  *
- * @since bbPress (r2827)
+ * @since 2.0.0 bbPress (r2827)
  *
  * @param array $args Optional. See {@link bbp_get_admin_link()}
  * @uses bbp_get_admin_link() To get the admin link
@@ -540,7 +540,7 @@ function bbp_admin_link( $args = array() ) {
 	/**
 	 * Return the link to the admin section
 	 *
-	 * @since bbPress (r2827)
+	 * @since 2.0.0 bbPress (r2827)
 	 *
 	 * @param array $args Optional. This function supports these arguments:
 	 *  - text: The text
@@ -577,7 +577,7 @@ function bbp_admin_link( $args = array() ) {
 /**
  * Output the author IP address of a post
  *
- * @since bbPress (r3120)
+ * @since 2.0.0 bbPress (r3120)
  *
  * @param array $args Optional. If it is an integer, it is used as post id.
  * @uses bbp_get_author_ip() To get the post author link
@@ -588,7 +588,7 @@ function bbp_author_ip( $args = array() ) {
 	/**
 	 * Return the author IP address of a post
 	 *
-	 * @since bbPress (r3120)
+	 * @since 2.0.0 bbPress (r3120)
 	 *
 	 * @param array $args Optional. If an integer, it is used as reply id.
 	 * @uses get_post_meta() To check if it's a topic page
@@ -628,7 +628,7 @@ function bbp_author_ip( $args = array() ) {
  * and correct filters are executed. Used primarily to display topic
  * and reply author information in the anonymous form template-part.
  *
- * @since bbPress (r5119)
+ * @since 2.5.0 bbPress (r5119)
  *
  * @param int $post_id
  * @uses bbp_get_author_display_name() to get the author name
@@ -644,7 +644,7 @@ function bbp_author_display_name( $post_id = 0 ) {
 	 * and correct filters are executed. Used primarily to display topic
 	 * and reply author information in the anonymous form template-part.
 	 *
-	 * @since bbPress (r5119)
+	 * @since 2.5.0 bbPress (r5119)
 	 *
 	 * @param int $post_id
 	 *
@@ -684,7 +684,7 @@ function bbp_author_display_name( $post_id = 0 ) {
  * and correct filters are executed. Used primarily to display topic
  * and reply author information in the anonymous user form template-part.
  *
- * @since bbPress (r5119)
+ * @since 2.5.0 bbPress (r5119)
  *
  * @param int $post_id
  * @uses bbp_get_author_email() to get the author email
@@ -700,7 +700,7 @@ function bbp_author_email( $post_id = 0 ) {
 	 * and correct filters are executed. Used primarily to display topic
 	 * and reply author information in the anonymous user form template-part.
 	 *
-	 * @since bbPress (r5119)
+	 * @since 2.5.0 bbPress (r5119)
 	 *
 	 * @param int $post_id
 	 *
@@ -740,7 +740,7 @@ function bbp_author_email( $post_id = 0 ) {
  * and correct filters are executed. Used primarily to display topic
  * and reply author information in the anonymous user form template-part.
  *
- * @since bbPress (r5119)
+ * @since 2.5.0 bbPress (r5119)
  *
  * @param int $post_id
  * @uses bbp_get_author_url() to get the author url
@@ -756,7 +756,7 @@ function bbp_author_url( $post_id = 0 ) {
 	 * and correct filters are executed. Used primarily to display topic
 	 * and reply author information in the anonymous user form template-part.
 	 *
-	 * @since bbPress (r5119)
+	 * @since 2.5.0 bbPress (r5119)
 	 *
 	 * @param int $post_id
 	 *
@@ -794,7 +794,7 @@ function bbp_author_url( $post_id = 0 ) {
 /**
  * Output the link to the user's favorites page (profile page)
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_favorites_permalink() To get the favorites permalink
@@ -805,7 +805,7 @@ function bbp_favorites_permalink( $user_id = 0 ) {
 	/**
 	 * Return the link to the user's favorites page (profile page)
 	 *
-	 * @since bbPress (r2652)
+	 * @since 2.0.0 bbPress (r2652)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @uses bbp_get_user_profile_url() To get the user profile url
@@ -848,7 +848,7 @@ function bbp_favorites_permalink( $user_id = 0 ) {
 /**
  * Output the link to make a topic favorite/remove a topic from favorites
  *
- * @since bbPress (r2652)
+ * @since 2.0.0 bbPress (r2652)
  *
  * @param array $args See {@link bbp_get_user_favorites_link()}
  * @param int $user_id Optional. User id
@@ -864,7 +864,7 @@ function bbp_user_favorites_link( $args = array(), $user_id = 0, $wrap = true )
 	 * Return the link to make a topic favorite/remove a topic from
 	 * favorites
 	 *
-	 * @since bbPress (r2652)
+	 * @since 2.0.0 bbPress (r2652)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - subscribe: Favorite text
@@ -952,7 +952,7 @@ function bbp_user_favorites_link( $args = array(), $user_id = 0, $wrap = true )
 /**
  * Output the link to the user's subscriptions page (profile page)
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_subscriptions_permalink() To get the subscriptions link
@@ -963,7 +963,7 @@ function bbp_subscriptions_permalink( $user_id = 0 ) {
 	/**
 	 * Return the link to the user's subscriptions page (profile page)
 	 *
-	 * @since bbPress (r2688)
+	 * @since 2.0.0 bbPress (r2688)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @uses bbp_get_user_profile_url() To get the user profile url
@@ -1006,7 +1006,7 @@ function bbp_subscriptions_permalink( $user_id = 0 ) {
 /**
  * Output the link to subscribe/unsubscribe from a topic
  *
- * @since bbPress (r2668)
+ * @since 2.0.0 bbPress (r2668)
  *
  * @param array $args See {@link bbp_get_user_subscribe_link()}
  * @param int $user_id Optional. User id
@@ -1019,7 +1019,7 @@ function bbp_user_subscribe_link( $args = array(), $user_id = 0, $wrap = true )
 	/**
 	 * Return the link to subscribe/unsubscribe from a forum or topic
 	 *
-	 * @since bbPress (r2668)
+	 * @since 2.0.0 bbPress (r2668)
 	 *
 	 * @param array $args This function supports these arguments:
 	 *  - subscribe: Subscribe text
@@ -1149,7 +1149,7 @@ function bbp_user_subscribe_link( $args = array(), $user_id = 0, $wrap = true )
 /**
  * Display profile edit success notice on user edit page
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @uses bbp_is_single_user() To check if it's the profile page
  * @uses bbp_is_single_user_edit() To check if it's the profile edit page
@@ -1178,7 +1178,7 @@ function bbp_notice_edit_user_success() {
 /**
  * Display pending email change notice on user edit page
  *
- * @since bbPress (r5660)
+ * @since 2.6.0 bbPress (r5660)
  *
  * @uses bbp_get_displayed_user_id()     To get the displayed user ID
  * @uses bbp_is_single_user_edit()       To check if it's the profile edit page
@@ -1228,7 +1228,7 @@ function bbp_notice_edit_user_pending_email() {
 /**
  * Super admin privileges notice
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @uses is_multisite() To check if the blog is multisite
  * @uses bbp_is_single_user() To check if it's the profile page
@@ -1255,7 +1255,7 @@ function bbp_notice_edit_user_is_super_admin() {
 /**
  * Drop down for selecting the user's display name
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  */
 function bbp_edit_user_display_name() {
 	$bbp            = bbpress();
@@ -1303,7 +1303,7 @@ function bbp_edit_user_display_name() {
 /**
  * Output blog role selector (for user edit)
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  */
 function bbp_edit_user_blog_role() {
 
@@ -1335,7 +1335,7 @@ function bbp_edit_user_blog_role() {
 /**
  * Output forum role selector (for user edit)
  *
- * @since bbPress (r4284)
+ * @since 2.2.0 bbPress (r4284)
  */
 function bbp_edit_user_forums_role() {
 
@@ -1372,7 +1372,7 @@ function bbp_edit_user_forums_role() {
 /**
  * Return user contact methods Selectbox
  *
- * @since bbPress (r2688)
+ * @since 2.0.0 bbPress (r2688)
  *
  * @uses _wp_get_user_contactmethods() To get the contact methods
  * @uses apply_filters() Calls 'bbp_edit_user_contact_methods' with the methods
@@ -1391,7 +1391,7 @@ function bbp_edit_user_contact_methods() {
 /**
  * Output the link to the user's topics
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_favorites_permalink() To get the favorites permalink
@@ -1402,7 +1402,7 @@ function bbp_user_topics_created_url( $user_id = 0 ) {
 	/**
 	 * Return the link to the user's topics
 	 *
-	 * @since bbPress (r4225)
+	 * @since 2.2.0 bbPress (r4225)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @uses bbp_get_user_profile_url() To get the user profile url
@@ -1447,7 +1447,7 @@ function bbp_user_topics_created_url( $user_id = 0 ) {
 /**
  * Output the link to the user's replies
  *
- * @since bbPress (r4225)
+ * @since 2.2.0 bbPress (r4225)
  *
  * @param int $user_id Optional. User id
  * @uses bbp_get_favorites_permalink() To get the favorites permalink
@@ -1458,7 +1458,7 @@ function bbp_user_replies_created_url( $user_id = 0 ) {
 	/**
 	 * Return the link to the user's replies
 	 *
-	 * @since bbPress (r4225)
+	 * @since 2.2.0 bbPress (r4225)
 	 *
 	 * @param int $user_id Optional. User id
 	 * @uses bbp_get_user_profile_url() To get the user profile url
@@ -1503,7 +1503,7 @@ function bbp_user_replies_created_url( $user_id = 0 ) {
 /**
  * Handle the login and registration template notices
  *
- * @since bbPress (r2970)
+ * @since 2.0.0 bbPress (r2970)
  *
  * @uses WP_Error bbPress::errors::add() To add an error or message
  */
@@ -1546,7 +1546,7 @@ function bbp_login_notices() {
  * This should be used before {@link get_header()} is called in template files
  * where the user should never have access to the contents of that file.
  *
- * @since bbPress (r2815)
+ * @since 2.0.0 bbPress (r2815)
  *
  * @param string $url The URL to redirect to
  * @uses is_user_logged_in() Check if user is logged in
@@ -1571,7 +1571,7 @@ function bbp_logged_in_redirect( $url = '' ) {
 /**
  * Output the required hidden fields when logging in
  *
- * @since bbPress (r2815)
+ * @since 2.0.0 bbPress (r2815)
  *
  * @uses apply_filters() To allow custom redirection
  * @uses bbp_redirect_to_field() To output the hidden request url field
@@ -1597,7 +1597,7 @@ function bbp_user_login_fields() {
 /**
  * Output the required hidden fields when registering
  *
- * @since bbPress (r2815)
+ * @since 2.0.0 bbPress (r2815)
  *
  * @uses add_query_arg() To add query args
  * @uses bbp_login_url() To get the login url
@@ -1626,7 +1626,7 @@ function bbp_user_register_fields() {
 /**
  * Output the required hidden fields when user lost password
  *
- * @since bbPress (r2815)
+ * @since 2.0.0 bbPress (r2815)
  *
  * @uses apply_filters() To allow custom redirection
  * @uses bbp_redirect_to_field() Set referer
@@ -1652,7 +1652,7 @@ function bbp_user_lost_pass_fields() {
 /**
  * Output the author link of a post
  *
- * @since bbPress (r2875)
+ * @since 2.0.0 bbPress (r2875)
  *
  * @param array $args Optional. If it is an integer, it is used as post id.
  * @uses bbp_get_author_link() To get the post author link
@@ -1663,7 +1663,7 @@ function bbp_author_link( $args = array() ) {
 	/**
 	 * Return the author link of the post
 	 *
-	 * @since bbPress (r2875)
+	 * @since 2.0.0 bbPress (r2875)
 	 *
 	 * @param array $args Optional. If an integer, it is used as reply id.
 	 * @uses bbp_is_topic() To check if it's a topic page
@@ -1752,7 +1752,7 @@ function bbp_author_link( $args = array() ) {
 /**
  * Check if the user can access a specific forum
  *
- * @since bbPress (r3127)
+ * @since 2.0.0 bbPress (r3127)
  *
  * @uses bbp_get_current_user_id()
  * @uses bbp_get_forum_id()
@@ -1806,7 +1806,7 @@ function bbp_user_can_view_forum( $args = array() ) {
 /**
  * Check if the current user can publish topics
  *
- * @since bbPress (r3127)
+ * @since 2.0.0 bbPress (r3127)
  *
  * @uses bbp_is_user_keymaster()
  * @uses is_user_logged_in()
@@ -1842,7 +1842,7 @@ function bbp_current_user_can_publish_topics() {
 /**
  * Check if the current user can publish forums
  *
- * @since bbPress (r3549)
+ * @since 2.1.0 bbPress (r3549)
  *
  * @uses bbp_is_user_keymaster()
  * @uses bbp_is_user_active()
@@ -1872,7 +1872,7 @@ function bbp_current_user_can_publish_forums() {
 /**
  * Check if the current user can publish replies
  *
- * @since bbPress (r3127)
+ * @since 2.0.0 bbPress (r3127)
  *
  * @uses bbp_is_user_keymaster()
  * @uses is_user_logged_in()
@@ -1916,7 +1916,7 @@ function bbp_current_user_can_publish_replies() {
 /**
  * Get the forums the current user has the ability to see and post to
  *
- * @since bbPress (r3127)
+ * @since 2.0.0 bbPress (r3127)
  *
  * @uses bbp_get_forum_post_type()
  * @uses get_posts()
@@ -1969,7 +1969,7 @@ function bbp_get_forums_for_current_user( $args = array() ) {
 /**
  * Performs a series of checks to ensure the current user can create forums.
  *
- * @since bbPress (r3549)
+ * @since 2.1.0 bbPress (r3549)
  *
  * @uses bbp_is_user_keymaster()
  * @uses bbp_is_forum_edit()
@@ -2003,7 +2003,7 @@ function bbp_current_user_can_access_create_forum_form() {
 /**
  * Performs a series of checks to ensure the current user can create topics.
  *
- * @since bbPress (r3127)
+ * @since 2.0.0 bbPress (r3127)
  *
  * @uses bbp_is_user_keymaster()
  * @uses bbp_is_topic_edit()
@@ -2039,7 +2039,7 @@ function bbp_current_user_can_access_create_topic_form() {
 /**
  * Performs a series of checks to ensure the current user can create replies.
  *
- * @since bbPress (r3127)
+ * @since 2.0.0 bbPress (r3127)
  *
  * @uses bbp_is_user_keymaster()
  * @uses bbp_is_topic_edit()
@@ -2076,7 +2076,7 @@ function bbp_current_user_can_access_create_reply_form() {
  * Performs a series of checks to ensure the current user should see the
  * anonymous user form fields.
  *
- * @since bbPress (r5119)
+ * @since 2.5.0 bbPress (r5119)
  *
  * @uses bbp_is_anonymous()
  * @uses bbp_is_topic_edit()
diff --git src/templates/default/bbpress-functions.php src/templates/default/bbpress-functions.php
index 1a00f46..833e54e 100644
--- src/templates/default/bbpress-functions.php
+++ src/templates/default/bbpress-functions.php
@@ -5,7 +5,7 @@
  *
  * @package bbPress
  * @subpackage BBP_Theme_Compat
- * @since bbPress (r3732)
+ * @since 2.1.0 bbPress (r3732)
  */
 
 // Exit if accessed directly
@@ -27,7 +27,7 @@ if ( !class_exists( 'BBP_Default' ) ) :
  *
  * See @link BBP_Theme_Compat() for more.
  *
- * @since bbPress (r3732)
+ * @since 2.1.0 bbPress (r3732)
  *
  * @package bbPress
  * @subpackage BBP_Theme_Compat
@@ -39,7 +39,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	/**
 	 * The main bbPress (Default) Loader
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
 	 *
 	 * @uses BBP_Default::setup_globals()
 	 * @uses BBP_Default::setup_actions()
@@ -60,7 +60,8 @@ class BBP_Default extends BBP_Theme_Compat {
 	/**
 	 * Setup the theme hooks
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
+	 *
 	 * @access private
 	 *
 	 * @uses add_filter() To add various filters
@@ -91,7 +92,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	 * Inserts HTML at the top of the main content area to be compatible with
 	 * the Twenty Twelve theme.
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
 	 */
 	public function before_main_content() {
 	?>
@@ -106,7 +107,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	 * Inserts HTML at the bottom of the main content area to be compatible with
 	 * the Twenty Twelve theme.
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
 	 */
 	public function after_main_content() {
 	?>
@@ -120,7 +121,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	/**
 	 * Load the theme CSS
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
 	 *
 	 * @uses wp_enqueue_style() To enqueue the styles
 	 */
@@ -147,7 +148,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	/**
 	 * Enqueue the required Javascript files
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
 	 *
 	 * @uses bbp_is_single_forum() To check if it's the forum page
 	 * @uses bbp_is_single_topic() To check if it's the topic page
@@ -219,7 +220,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	 *
 	 * These localizations require information that may not be loaded even by init.
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
 	 *
 	 * @uses bbp_is_single_forum() To check if it's the forum page
 	 * @uses bbp_is_single_topic() To check if it's the topic page
@@ -260,7 +261,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	/**
 	 * AJAX handler to Subscribe/Unsubscribe a user from a forum
 	 *
-	 * @since bbPress (r5155)
+	 * @since 2.5.0 bbPress (r5155)
 	 *
 	 * @uses bbp_is_subscriptions_active() To check if the subscriptions are active
 	 * @uses bbp_is_user_logged_in() To check if user is logged in
@@ -328,7 +329,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	/**
 	 * AJAX handler to add or remove a topic from a user's favorites
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
 	 *
 	 * @uses bbp_is_favorites_active() To check if favorites are active
 	 * @uses bbp_is_user_logged_in() To check if user is logged in
@@ -396,7 +397,7 @@ class BBP_Default extends BBP_Theme_Compat {
 	/**
 	 * AJAX handler to Subscribe/Unsubscribe a user from a topic
 	 *
-	 * @since bbPress (r3732)
+	 * @since 2.1.0 bbPress (r3732)
 	 *
 	 * @uses bbp_is_subscriptions_active() To check if the subscriptions are active
 	 * @uses bbp_is_user_logged_in() To check if user is logged in
