From a83814e6882313f1950ec4eedf05053525166cc2 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 11 Jan 2013 13:46:53 -0500
Subject: [PATCH] Updated wiki links throughout code.

---
 README.md                                     | 43 +------------------
 config/vufind/searches.ini                    |  4 +-
 install.php                                   |  2 +-
 module/VuFind/src/VuFind/Auth/Database.php    |  4 +-
 module/VuFind/src/VuFind/Auth/ILS.php         |  4 +-
 module/VuFind/src/VuFind/Auth/LDAP.php        |  4 +-
 module/VuFind/src/VuFind/Auth/MultiAuth.php   |  4 +-
 module/VuFind/src/VuFind/Auth/SIP2.php        |  4 +-
 .../Autocomplete/AutocompleteInterface.php    |  4 +-
 .../VuFind/src/VuFind/Autocomplete/None.php   |  4 +-
 .../VuFind/Autocomplete/OCLCIdentities.php    |  4 +-
 .../src/VuFind/Autocomplete/PluginFactory.php |  4 +-
 .../src/VuFind/Autocomplete/PluginManager.php |  4 +-
 .../VuFind/src/VuFind/Autocomplete/Solr.php   |  4 +-
 .../src/VuFind/Autocomplete/SolrAuth.php      |  4 +-
 .../VuFind/src/VuFind/Autocomplete/SolrCN.php |  4 +-
 .../src/VuFind/Autocomplete/SolrReserves.php  |  4 +-
 module/VuFind/src/VuFind/Autocomplete/Tag.php |  4 +-
 module/VuFind/src/VuFind/Cart.php             |  4 +-
 .../VuFind/src/VuFind/Connection/Manager.php  |  4 +-
 .../src/VuFind/Connection/OpenLibrary.php     |  4 +-
 .../VuFind/src/VuFind/Connection/Oracle.php   |  4 +-
 module/VuFind/src/VuFind/Connection/SRU.php   |  4 +-
 module/VuFind/src/VuFind/Connection/Solr.php  |  4 +-
 .../VuFind/src/VuFind/Connection/SolrAuth.php |  4 +-
 .../src/VuFind/Connection/SolrReserves.php    |  4 +-
 .../src/VuFind/Connection/SolrStats.php       |  4 +-
 .../VuFind/src/VuFind/Connection/WorldCat.php |  4 +-
 .../src/VuFind/Connection/WorldCatUtils.php   |  4 +-
 .../src/VuFind/Controller/AbstractBase.php    |  4 +-
 .../src/VuFind/Controller/AbstractRecord.php  |  4 +-
 .../src/VuFind/Controller/AjaxController.php  |  4 +-
 .../VuFind/Controller/BrowseController.php    |  4 +-
 .../VuFind/Controller/HierarchyController.php |  4 +-
 .../VuFind/Controller/InstallController.php   |  6 +--
 .../src/VuFind/Controller/OaiController.php   |  4 +-
 .../Controller/Plugin/ResultScroller.php      |  4 +-
 module/VuFind/src/VuFind/Cookie/Container.php |  4 +-
 module/VuFind/src/VuFind/Crypt/HMAC.php       |  4 +-
 module/VuFind/src/VuFind/Date/Converter.php   |  4 +-
 .../src/VuFind/Db/Table/PluginFactory.php     |  4 +-
 .../src/VuFind/Db/Table/PluginManager.php     |  4 +-
 module/VuFind/src/VuFind/Exception/Auth.php   |  4 +-
 module/VuFind/src/VuFind/Exception/Date.php   |  4 +-
 .../src/VuFind/Exception/FileAccess.php       |  4 +-
 .../VuFind/src/VuFind/Exception/Forbidden.php |  4 +-
 module/VuFind/src/VuFind/Exception/ILS.php    |  4 +-
 .../src/VuFind/Exception/ListPermission.php   |  4 +-
 .../src/VuFind/Exception/LoginRequired.php    |  4 +-
 module/VuFind/src/VuFind/Exception/Mail.php   |  4 +-
 .../src/VuFind/Exception/MissingField.php     |  4 +-
 .../src/VuFind/Exception/PasswordSecurity.php |  4 +-
 .../src/VuFind/Exception/RecordMissing.php    |  4 +-
 .../src/VuFind/Exception/SessionExpired.php   |  4 +-
 .../Writer/Extension/DublinCore/Entry.php     |  4 +-
 .../Extension/DublinCore/Renderer/Entry.php   |  4 +-
 module/VuFind/src/VuFind/Harvester/NAF.php    |  4 +-
 .../VuFind/Hierarchy/Driver/AbstractBase.php  |  4 +-
 .../Hierarchy/Driver/ConfigurationBased.php   |  4 +-
 .../src/VuFind/Hierarchy/Driver/Factory.php   |  4 +-
 .../VuFind/Hierarchy/Driver/PluginManager.php |  4 +-
 .../Hierarchy/TreeDataSource/AbstractBase.php |  4 +-
 .../TreeDataSource/PluginManager.php          |  4 +-
 .../VuFind/Hierarchy/TreeDataSource/Solr.php  |  4 +-
 .../Hierarchy/TreeDataSource/XMLFile.php      |  4 +-
 .../Hierarchy/TreeRenderer/AbstractBase.php   |  4 +-
 .../VuFind/Hierarchy/TreeRenderer/JSTree.php  |  4 +-
 module/VuFind/src/VuFind/ILS/Connection.php   |  4 +-
 .../src/VuFind/ILS/Driver/AbstractBase.php    |  4 +-
 module/VuFind/src/VuFind/ILS/Driver/Aleph.php |  8 ++--
 .../VuFind/src/VuFind/ILS/Driver/Amicus.php   |  4 +-
 .../src/VuFind/ILS/Driver/ClaviusSQL.php      |  2 +-
 module/VuFind/src/VuFind/ILS/Driver/DAIA.php  |  4 +-
 module/VuFind/src/VuFind/ILS/Driver/Demo.php  |  4 +-
 .../src/VuFind/ILS/Driver/DriverInterface.php |  4 +-
 .../src/VuFind/ILS/Driver/Evergreen.php       |  4 +-
 .../VuFind/src/VuFind/ILS/Driver/Horizon.php  |  4 +-
 .../src/VuFind/ILS/Driver/HorizonXMLAPI.php   |  4 +-
 .../src/VuFind/ILS/Driver/Innovative.php      |  4 +-
 module/VuFind/src/VuFind/ILS/Driver/Koha.php  |  4 +-
 .../src/VuFind/ILS/Driver/NewGenLib.php       |  4 +-
 module/VuFind/src/VuFind/ILS/Driver/NoILS.php |  4 +-
 module/VuFind/src/VuFind/ILS/Driver/PICA.php  |  4 +-
 .../src/VuFind/ILS/Driver/PluginFactory.php   |  4 +-
 .../src/VuFind/ILS/Driver/PluginManager.php   |  4 +-
 .../VuFind/src/VuFind/ILS/Driver/Sample.php   |  4 +-
 .../VuFind/src/VuFind/ILS/Driver/Symphony.php |  4 +-
 .../VuFind/src/VuFind/ILS/Driver/Virtua.php   |  4 +-
 .../VuFind/src/VuFind/ILS/Driver/Voyager.php  |  4 +-
 .../src/VuFind/ILS/Driver/VoyagerRestful.php  |  4 +-
 .../VuFind/src/VuFind/ILS/Driver/XCNCIP.php   |  4 +-
 .../VuFind/src/VuFind/ILS/Driver/XCNCIP2.php  |  4 +-
 module/VuFind/src/VuFind/ILS/Logic/Holds.php  |  4 +-
 .../src/VuFind/ILS/Logic/TitleHolds.php       |  4 +-
 module/VuFind/src/VuFind/Mailer.php           |  4 +-
 module/VuFind/src/VuFind/OAI/Server.php       |  4 +-
 module/VuFind/src/VuFind/OAI/Server/Auth.php  |  4 +-
 .../AbstractSearchManagerAwareModule.php      |  4 +-
 .../src/VuFind/Recommend/AuthorFacets.php     |  4 +-
 .../src/VuFind/Recommend/AuthorInfo.php       |  4 +-
 .../src/VuFind/Recommend/CatalogResults.php   |  4 +-
 .../VuFind/Recommend/CollectionSideFacets.php |  4 +-
 .../src/VuFind/Recommend/EuropeanaResults.php |  4 +-
 .../Recommend/EuropeanaResultsDeferred.php    |  4 +-
 .../src/VuFind/Recommend/FavoriteFacets.php   |  4 +-
 .../VuFind/Recommend/OpenLibrarySubjects.php  |  4 +-
 .../Recommend/OpenLibrarySubjectsDeferred.php |  4 +-
 .../src/VuFind/Recommend/PluginFactory.php    |  4 +-
 .../src/VuFind/Recommend/PluginManager.php    |  4 +-
 .../src/VuFind/Recommend/PubDateVisAjax.php   |  4 +-
 .../VuFind/Recommend/RecommendInterface.php   |  4 +-
 .../VuFind/Recommend/ResultGoogleMapAjax.php  |  4 +-
 .../src/VuFind/Recommend/SearchObject.php     |  4 +-
 .../src/VuFind/Recommend/SideFacets.php       |  4 +-
 .../src/VuFind/Recommend/SummonDatabases.php  |  4 +-
 .../src/VuFind/Recommend/SummonResults.php    |  4 +-
 .../src/VuFind/Recommend/SwitchType.php       |  4 +-
 .../VuFind/src/VuFind/Recommend/TopFacets.php |  4 +-
 .../VuFind/Recommend/WorldCatIdentities.php   |  4 +-
 .../src/VuFind/Recommend/WorldCatTerms.php    |  4 +-
 .../src/VuFind/RecordDriver/Missing.php       |  4 +-
 .../src/VuFind/RecordDriver/PluginFactory.php |  4 +-
 .../src/VuFind/RecordDriver/PluginManager.php |  4 +-
 .../src/VuFind/RecordDriver/SolrAuth.php      |  4 +-
 .../src/VuFind/RecordDriver/SolrDefault.php   |  4 +-
 .../src/VuFind/RecordDriver/SolrMarc.php      |  4 +-
 .../src/VuFind/RecordDriver/SolrReserves.php  |  4 +-
 .../src/VuFind/RecordDriver/SolrVudl.php      |  4 +-
 .../VuFind/src/VuFind/RecordDriver/Summon.php |  4 +-
 .../src/VuFind/RecordDriver/WorldCat.php      |  4 +-
 .../src/VuFind/RecordTab/AbstractBase.php     |  4 +-
 .../RecordTab/CollectionHierarchyTree.php     |  4 +-
 .../src/VuFind/RecordTab/CollectionList.php   |  4 +-
 .../src/VuFind/RecordTab/Description.php      |  4 +-
 .../VuFind/src/VuFind/RecordTab/Excerpt.php   |  4 +-
 .../src/VuFind/RecordTab/HierarchyTree.php    |  4 +-
 .../src/VuFind/RecordTab/HoldingsILS.php      |  4 +-
 .../src/VuFind/RecordTab/HoldingsWorldCat.php |  4 +-
 module/VuFind/src/VuFind/RecordTab/Map.php    |  4 +-
 .../src/VuFind/RecordTab/PluginFactory.php    |  4 +-
 .../src/VuFind/RecordTab/PluginManager.php    |  4 +-
 .../VuFind/src/VuFind/RecordTab/Reviews.php   |  4 +-
 .../src/VuFind/RecordTab/StaffViewArray.php   |  4 +-
 .../src/VuFind/RecordTab/StaffViewMARC.php    |  4 +-
 module/VuFind/src/VuFind/RecordTab/TOC.php    |  4 +-
 .../src/VuFind/RecordTab/TabInterface.php     |  4 +-
 .../src/VuFind/RecordTab/UserComments.php     |  4 +-
 .../VuFind/Related/AbstractServiceLocator.php |  4 +-
 module/VuFind/src/VuFind/Related/Editions.php |  4 +-
 .../src/VuFind/Related/PluginFactory.php      |  4 +-
 .../src/VuFind/Related/PluginManager.php      |  4 +-
 .../src/VuFind/Related/RelatedInterface.php   |  4 +-
 module/VuFind/src/VuFind/Related/Similar.php  |  4 +-
 .../src/VuFind/Related/WorldCatEditions.php   |  4 +-
 .../src/VuFind/Related/WorldCatSimilar.php    |  4 +-
 .../VuFind/src/VuFind/Reserves/CsvReader.php  |  2 +-
 .../VuFind/src/VuFind/Resolver/Connection.php |  4 +-
 .../Resolver/Driver/DriverInterface.php       |  4 +-
 .../VuFind/src/VuFind/Resolver/Driver/Ezb.php |  4 +-
 .../VuFind/Resolver/Driver/PluginFactory.php  |  4 +-
 .../VuFind/Resolver/Driver/PluginManager.php  |  4 +-
 .../VuFind/src/VuFind/Resolver/Driver/Sfx.php |  4 +-
 .../VuFind/Resolver/Driver/Threesixtylink.php |  4 +-
 module/VuFind/src/VuFind/SMS/AbstractBase.php |  4 +-
 module/VuFind/src/VuFind/SMS/Clickatell.php   |  4 +-
 module/VuFind/src/VuFind/SMS/Factory.php      |  4 +-
 module/VuFind/src/VuFind/SMS/Mailer.php       |  4 +-
 module/VuFind/src/VuFind/SMS/SMSInterface.php |  4 +-
 module/VuFind/src/VuFind/Search/Minified.php  |  4 +-
 module/VuFind/src/VuFind/Search/minSO.php     |  2 +-
 .../ServiceManager/AbstractPluginFactory.php  |  4 +-
 .../ServiceManager/AbstractPluginManager.php  |  4 +-
 .../src/VuFind/ServiceManager/Initializer.php |  4 +-
 .../src/VuFind/Session/AbstractBase.php       |  4 +-
 module/VuFind/src/VuFind/Session/Database.php |  4 +-
 module/VuFind/src/VuFind/Session/File.php     |  4 +-
 module/VuFind/src/VuFind/Session/Memcache.php |  4 +-
 .../src/VuFind/Session/PluginFactory.php      |  4 +-
 .../src/VuFind/Session/PluginManager.php      |  4 +-
 module/VuFind/src/VuFind/SimpleXML.php        |  4 +-
 module/VuFind/src/VuFind/Solr/Utils.php       |  4 +-
 .../Statistics/Driver/PluginFactory.php       |  4 +-
 .../Statistics/Driver/PluginManager.php       |  4 +-
 .../VuFind/src/VuFind/Statistics/Record.php   |  4 +-
 .../VuFind/src/VuFind/Statistics/Search.php   |  4 +-
 .../View/Helper/Blueprint/LayoutClass.php     |  4 +-
 .../VuFind/View/Helper/Blueprint/Search.php   |  4 +-
 .../View/Helper/Root/AbstractSyndetics.php    |  4 +-
 .../src/VuFind/View/Helper/Root/Auth.php      |  4 +-
 .../VuFind/View/Helper/Root/AuthorNotes.php   |  4 +-
 .../src/VuFind/View/Helper/Root/Browse.php    |  4 +-
 .../src/VuFind/View/Helper/Root/Cart.php      |  4 +-
 .../src/VuFind/View/Helper/Root/Citation.php  |  4 +-
 .../src/VuFind/View/Helper/Root/Context.php   |  4 +-
 .../VuFind/View/Helper/Root/CurrentPath.php   |  4 +-
 .../src/VuFind/View/Helper/Root/DateTime.php  |  4 +-
 .../Helper/Root/DisplayLanguageOption.php     |  4 +-
 .../src/VuFind/View/Helper/Root/Excerpt.php   |  4 +-
 .../VuFind/View/Helper/Root/Flashmessages.php |  4 +-
 .../View/Helper/Root/GetLastSearchLink.php    |  4 +-
 .../src/VuFind/View/Helper/Root/Highlight.php |  4 +-
 .../src/VuFind/View/Helper/Root/Ils.php       |  4 +-
 .../src/VuFind/View/Helper/Root/OpenUrl.php   |  4 +-
 .../src/VuFind/View/Helper/Root/Printms.php   |  4 +-
 .../src/VuFind/View/Helper/Root/ProxyUrl.php  |  4 +-
 .../src/VuFind/View/Helper/Root/Recommend.php |  4 +-
 .../src/VuFind/View/Helper/Root/Record.php    |  4 +-
 .../VuFind/View/Helper/Root/RecordLink.php    |  4 +-
 .../src/VuFind/View/Helper/Root/Related.php   |  4 +-
 .../VuFind/View/Helper/Root/RenderArray.php   |  4 +-
 .../VuFind/View/Helper/Root/ResultFeed.php    |  4 +-
 .../src/VuFind/View/Helper/Root/Reviews.php   |  4 +-
 .../View/Helper/Root/SafeMoneyFormat.php      |  4 +-
 .../VuFind/View/Helper/Root/SearchOptions.php |  4 +-
 .../VuFind/View/Helper/Root/SortFacetList.php |  4 +-
 .../VuFind/View/Helper/Root/SystemEmail.php   |  4 +-
 .../src/VuFind/View/Helper/Root/TransEsc.php  |  4 +-
 .../src/VuFind/View/Helper/Root/Translate.php |  4 +-
 .../src/VuFind/View/Helper/Root/Truncate.php  |  4 +-
 .../src/VuFind/View/Helper/Root/UserList.php  |  4 +-
 .../VuFind/View/Helper/Root/VideoClips.php    |  4 +-
 .../View/Helper/jQueryMobile/MobileMenu.php   |  4 +-
 .../VuFindTest/RecordDriver/TestHarness.php   |  4 +-
 .../VuFind/src/VuFindTest/Unit/DbTestCase.php |  4 +-
 .../VuFind/src/VuFindTest/Unit/TestCase.php   |  4 +-
 .../VuFindTest/Unit/ViewHelperTestCase.php    |  4 +-
 .../src/Connection/SolrTest.php               |  4 +-
 .../src/View/Helper/Root/ResultFeedTest.php   |  4 +-
 .../tests/unit-tests/src/Code/ISBNTest.php    |  4 +-
 .../src/Config/Reader/CacheDecoratorTest.php  |  4 +-
 .../unit-tests/src/Config/ReaderTest.php      |  4 +-
 .../src/Config/SearchSpecsReaderTest.php      |  4 +-
 .../unit-tests/src/Config/UpgradeTest.php     |  4 +-
 .../unit-tests/src/Cookie/ContainerTest.php   |  4 +-
 .../src/Db/Table/ChangeTrackerTest.php        |  4 +-
 .../unit-tests/src/Db/Table/UserListTest.php  |  4 +-
 .../src/RecordDriver/SolrMarcTest.php         |  4 +-
 .../unit-tests/src/Search/Base/ParamsTest.php |  4 +-
 .../tests/unit-tests/src/Solr/UtilsTest.php   |  4 +-
 .../src/View/Helper/Root/CitationTest.php     |  4 +-
 .../VuFindConsole/Controller/AbstractBase.php |  4 +-
 .../Controller/HarvestController.php          |  4 +-
 .../Controller/ImportController.php           |  4 +-
 .../Controller/UtilController.php             |  4 +-
 .../src/VuFindTheme/View/Helper/HeadLink.php  |  4 +-
 .../VuFindTheme/View/Helper/HeadScript.php    |  4 +-
 .../View/Helper/HeadThemeResources.php        |  4 +-
 .../src/VuFindTheme/View/Helper/MobileUrl.php |  4 +-
 themes/blueprint/templates/upgrade/home.phtml |  2 +-
 249 files changed, 495 insertions(+), 536 deletions(-)

diff --git a/README.md b/README.md
index 5f13d4b65ed..c029e40d3a4 100644
--- a/README.md
+++ b/README.md
@@ -10,45 +10,4 @@ records.  To learn more, visit http://vufind.org.
 Installation
 ------------
 
-WARNING: VuFind 2.0 is a work in progress.
-
-Instructions
-------------
-
-1. Install PHP 5.3 and MySQL; the existing installation instructions for VuFind 1.x
-will help you set up these dependencies (see http://vufind.org/wiki/installation).
-
-2. Copy the VuFind 2 code to /usr/local/vufind2 (or another directory of your
-choice).
-
-3. Run the VuFind2 install script:
-
-cd /usr/local/vufind2
-php install.php
-
-If you are testing VuFind 2 on a server that is also running VuFind 1.x, be sure you
-choose a base path for the URL that does not conflict with VuFind 1.x (/vufind2
-is a good choice).
-
-4. Load VuFind2's Apache configuration file using the instructions displayed by the
-install script.
-
-5. Ensure that your web server can write to the "local" directories
-
-sudo chown -R www-data:www-data /usr/local/vufind2/local
-
-(Note that this step may vary depending on your operating system -- you may need to
-replace www-data with apache).
-
-6. To finish configuration, navigate to http://your-vufind-server/vufind2/Install and
-follow the on-screen instructions.  If you are upgrading from VuFind 1.x, navigate to
-http://your-vufind-server/vufind2/Upgrade instead.
-
-7. If you run into problems, uncomment the "SetEnv VUFIND_ENV development" line in
-/usr/local/vufind2/local/httpd-vufind.conf and restart Apache to see more detailed
-error messages.
-
---------------------------------
-
-You should now have a working VuFind 2.0 instance running at
-http://your-vufind-server/vufind2
+See online documentation at http://vufind.org/wiki/vufind2:installation_notes
\ No newline at end of file
diff --git a/config/vufind/searches.ini b/config/vufind/searches.ini
index d6f5f4d77ef..3ed96c12103 100644
--- a/config/vufind/searches.ini
+++ b/config/vufind/searches.ini
@@ -259,7 +259,7 @@ CallNumber = callnumber
 ; You can build your own recommendations modules if you wish.  See the developer's
 ; guide here:
 ;
-;       http://vufind.org/wiki/building_a_recommendations_module
+;       http://vufind.org/wiki/vufind2:recommendation_modules
 [SideRecommendations]
 ; No search-specific settings by default -- add your own here.
 ;Subject[]          = SideFacets
@@ -347,7 +347,7 @@ sort = "last_indexed desc"
 ; You can build your own autocomplete modules if you wish.  See the developer's
 ; guide here:
 ;
-;       http://vufind.org/wiki/autocomplete
+;       http://vufind.org/wiki/vufind2:autosuggesters
 [Autocomplete]
 ; Set this to false to disable all autocomplete behavior
 enabled = true
diff --git a/install.php b/install.php
index d3d7bef5d06..07571a59431 100644
--- a/install.php
+++ b/install.php
@@ -23,7 +23,7 @@
  * @package  Installer
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/automation Wiki
+ * @link     http://vufind.org/wiki/vufind2:installation_notes Wiki
  */
 define('MULTISITE_NONE', 0);
 define('MULTISITE_DIR_BASED', 1);
diff --git a/module/VuFind/src/VuFind/Auth/Database.php b/module/VuFind/src/VuFind/Auth/Database.php
index ee57e90cb2b..5f6b24de291 100644
--- a/module/VuFind/src/VuFind/Auth/Database.php
+++ b/module/VuFind/src/VuFind/Auth/Database.php
@@ -25,7 +25,7 @@
  * @author   Franck Borel <franck.borel@gbv.de>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 namespace VuFind\Auth;
 use VuFind\Exception\Auth as AuthException, Zend\Crypt\Password\Bcrypt;
@@ -39,7 +39,7 @@ use VuFind\Exception\Auth as AuthException, Zend\Crypt\Password\Bcrypt;
  * @author   Franck Borel <franck.borel@gbv.de>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 class Database extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Auth/ILS.php b/module/VuFind/src/VuFind/Auth/ILS.php
index 074b5013f05..fdbfe22cd77 100644
--- a/module/VuFind/src/VuFind/Auth/ILS.php
+++ b/module/VuFind/src/VuFind/Auth/ILS.php
@@ -24,7 +24,7 @@
  * @author   Franck Borel <franck.borel@gbv.de>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 namespace VuFind\Auth;
 use VuFind\Exception\Auth as AuthException;
@@ -37,7 +37,7 @@ use VuFind\Exception\Auth as AuthException;
  * @author   Franck Borel <franck.borel@gbv.de>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 class ILS extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Auth/LDAP.php b/module/VuFind/src/VuFind/Auth/LDAP.php
index 33a9b729e68..c907870bd3e 100644
--- a/module/VuFind/src/VuFind/Auth/LDAP.php
+++ b/module/VuFind/src/VuFind/Auth/LDAP.php
@@ -24,7 +24,7 @@
  * @author   Franck Borel <franck.borel@gbv.de>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 namespace VuFind\Auth;
 use VuFind\Exception\Auth as AuthException;
@@ -37,7 +37,7 @@ use VuFind\Exception\Auth as AuthException;
  * @author   Franck Borel <franck.borel@gbv.de>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 class LDAP extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Auth/MultiAuth.php b/module/VuFind/src/VuFind/Auth/MultiAuth.php
index dcc1a8cf5fa..055ed057843 100644
--- a/module/VuFind/src/VuFind/Auth/MultiAuth.php
+++ b/module/VuFind/src/VuFind/Auth/MultiAuth.php
@@ -23,7 +23,7 @@
  * @package  Authentication
  * @author   Sam Moffatt <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 namespace VuFind\Auth;
 use VuFind\Exception\Auth as AuthException;
@@ -59,7 +59,7 @@ use VuFind\Exception\Auth as AuthException;
  * @package  Authentication
  * @author   Sam Moffatt <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 class MultiAuth extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Auth/SIP2.php b/module/VuFind/src/VuFind/Auth/SIP2.php
index 931889bfeaf..a64404243fd 100644
--- a/module/VuFind/src/VuFind/Auth/SIP2.php
+++ b/module/VuFind/src/VuFind/Auth/SIP2.php
@@ -24,7 +24,7 @@
  * @author   Franck Borel <franck.borel@gbv.de>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 namespace VuFind\Auth;
 use VuFind\Exception\Auth as AuthException;
@@ -37,7 +37,7 @@ use VuFind\Exception\Auth as AuthException;
  * @author   Franck Borel <franck.borel@gbv.de>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:authentication_handlers Wiki
  */
 class SIP2 extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/AutocompleteInterface.php b/module/VuFind/src/VuFind/Autocomplete/AutocompleteInterface.php
index 96b18a39464..4df2eb046fa 100644
--- a/module/VuFind/src/VuFind/Autocomplete/AutocompleteInterface.php
+++ b/module/VuFind/src/VuFind/Autocomplete/AutocompleteInterface.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 
@@ -38,7 +38,7 @@ namespace VuFind\Autocomplete;
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 interface AutocompleteInterface
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/None.php b/module/VuFind/src/VuFind/Autocomplete/None.php
index dbee88328fd..05985433e94 100644
--- a/module/VuFind/src/VuFind/Autocomplete/None.php
+++ b/module/VuFind/src/VuFind/Autocomplete/None.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 
@@ -37,7 +37,7 @@ namespace VuFind\Autocomplete;
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class None implements AutocompleteInterface
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/OCLCIdentities.php b/module/VuFind/src/VuFind/Autocomplete/OCLCIdentities.php
index 74eff8e736d..7560508befd 100644
--- a/module/VuFind/src/VuFind/Autocomplete/OCLCIdentities.php
+++ b/module/VuFind/src/VuFind/Autocomplete/OCLCIdentities.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 
@@ -37,7 +37,7 @@ namespace VuFind\Autocomplete;
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class OCLCIdentities implements AutocompleteInterface
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/PluginFactory.php b/module/VuFind/src/VuFind/Autocomplete/PluginFactory.php
index 5e3025670cc..0968949966f 100644
--- a/module/VuFind/src/VuFind/Autocomplete/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Autocomplete/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 
@@ -34,7 +34,7 @@ namespace VuFind\Autocomplete;
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/PluginManager.php b/module/VuFind/src/VuFind/Autocomplete/PluginManager.php
index 24e60d4d9b8..90a9b3854d9 100644
--- a/module/VuFind/src/VuFind/Autocomplete/PluginManager.php
+++ b/module/VuFind/src/VuFind/Autocomplete/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 use VuFind\Config\Reader as ConfigReader;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/Solr.php b/module/VuFind/src/VuFind/Autocomplete/Solr.php
index 690b5d48017..969455f9983 100644
--- a/module/VuFind/src/VuFind/Autocomplete/Solr.php
+++ b/module/VuFind/src/VuFind/Autocomplete/Solr.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 use Zend\ServiceManager\ServiceLocatorAwareInterface,
@@ -39,7 +39,7 @@ use Zend\ServiceManager\ServiceLocatorAwareInterface,
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class Solr implements AutocompleteInterface, ServiceLocatorAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/SolrAuth.php b/module/VuFind/src/VuFind/Autocomplete/SolrAuth.php
index b8efbcda43d..3ddce9ea7da 100644
--- a/module/VuFind/src/VuFind/Autocomplete/SolrAuth.php
+++ b/module/VuFind/src/VuFind/Autocomplete/SolrAuth.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 
@@ -37,7 +37,7 @@ namespace VuFind\Autocomplete;
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class SolrAuth extends Solr
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/SolrCN.php b/module/VuFind/src/VuFind/Autocomplete/SolrCN.php
index aa8c3de625a..48f7df2918d 100644
--- a/module/VuFind/src/VuFind/Autocomplete/SolrCN.php
+++ b/module/VuFind/src/VuFind/Autocomplete/SolrCN.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 
@@ -37,7 +37,7 @@ namespace VuFind\Autocomplete;
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class SolrCN extends Solr
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/SolrReserves.php b/module/VuFind/src/VuFind/Autocomplete/SolrReserves.php
index 73851191d25..7ac779b68d5 100644
--- a/module/VuFind/src/VuFind/Autocomplete/SolrReserves.php
+++ b/module/VuFind/src/VuFind/Autocomplete/SolrReserves.php
@@ -24,7 +24,7 @@
  * @author   Tuan Nguyen <tuan@yorku.ca>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 
@@ -37,7 +37,7 @@ namespace VuFind\Autocomplete;
  * @package  Autocomplete
  * @author   Tuan Nguyen <tuan@yorku.ca>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class SolrReserves extends Solr
 {
diff --git a/module/VuFind/src/VuFind/Autocomplete/Tag.php b/module/VuFind/src/VuFind/Autocomplete/Tag.php
index f3fa0192af7..db7366e46d6 100644
--- a/module/VuFind/src/VuFind/Autocomplete/Tag.php
+++ b/module/VuFind/src/VuFind/Autocomplete/Tag.php
@@ -23,7 +23,7 @@
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 namespace VuFind\Autocomplete;
 
@@ -36,7 +36,7 @@ namespace VuFind\Autocomplete;
  * @package  Autocomplete
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/autocomplete Wiki
+ * @link     http://vufind.org/wiki/vufind2:autosuggesters Wiki
  */
 class Tag implements AutocompleteInterface, \VuFind\Db\Table\DbTableAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/Cart.php b/module/VuFind/src/VuFind/Cart.php
index a6bae49ac2e..1772970f714 100644
--- a/module/VuFind/src/VuFind/Cart.php
+++ b/module/VuFind/src/VuFind/Cart.php
@@ -23,7 +23,7 @@
  * @package  Cart
  * @author   Tuan Nguyen <tuan@yorku.ca>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind;
 
@@ -36,7 +36,7 @@ namespace VuFind;
  * @package  Cart
  * @author   Tuan Nguyen <tuan@yorku.ca>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Cart
 {
diff --git a/module/VuFind/src/VuFind/Connection/Manager.php b/module/VuFind/src/VuFind/Connection/Manager.php
index f6db71da771..8e13b84201c 100644
--- a/module/VuFind/src/VuFind/Connection/Manager.php
+++ b/module/VuFind/src/VuFind/Connection/Manager.php
@@ -23,7 +23,7 @@
  * @package  Connection
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\ILS\Connection as ILSConnection
  * @package  Connection
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Manager
 {
diff --git a/module/VuFind/src/VuFind/Connection/OpenLibrary.php b/module/VuFind/src/VuFind/Connection/OpenLibrary.php
index b2aeca1c1c9..2e27d5d4e34 100644
--- a/module/VuFind/src/VuFind/Connection/OpenLibrary.php
+++ b/module/VuFind/src/VuFind/Connection/OpenLibrary.php
@@ -23,7 +23,7 @@
  * @package  OpenLibrary
  * @author   Eoghan Ó Carragáin <eoghan.ocarragain@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 
@@ -36,7 +36,7 @@ namespace VuFind\Connection;
  * @package  OpenLibrary
  * @author   Eoghan Ó Carragáin <eoghan.ocarragain@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class OpenLibrary
 {
diff --git a/module/VuFind/src/VuFind/Connection/Oracle.php b/module/VuFind/src/VuFind/Connection/Oracle.php
index 1ef9926d307..7f7d8d0b894 100644
--- a/module/VuFind/src/VuFind/Connection/Oracle.php
+++ b/module/VuFind/src/VuFind/Connection/Oracle.php
@@ -23,7 +23,7 @@
  * @package  Oracle
  * @author   Greg Pendlebury <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 
@@ -34,7 +34,7 @@ namespace VuFind\Connection;
  * @package  Oracle
  * @author   Greg Pendlebury <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Oracle
 {
diff --git a/module/VuFind/src/VuFind/Connection/SRU.php b/module/VuFind/src/VuFind/Connection/SRU.php
index db414b43aa3..14f59f53be5 100644
--- a/module/VuFind/src/VuFind/Connection/SRU.php
+++ b/module/VuFind/src/VuFind/Connection/SRU.php
@@ -23,7 +23,7 @@
  * @package  SRU
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#searching Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 use VuFind\XSLT\Processor as XSLTProcessor, Zend\Log\LoggerInterface;
@@ -35,7 +35,7 @@ use VuFind\XSLT\Processor as XSLTProcessor, Zend\Log\LoggerInterface;
  * @package  SRU
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#searching Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SRU implements \Zend\Log\LoggerAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/Connection/Solr.php b/module/VuFind/src/VuFind/Connection/Solr.php
index 71a3d7da5c6..096ead89384 100644
--- a/module/VuFind/src/VuFind/Connection/Solr.php
+++ b/module/VuFind/src/VuFind/Connection/Solr.php
@@ -24,7 +24,7 @@
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\Solr as SolrException,
@@ -39,7 +39,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\Solr as SolrException
  * @package  Solr
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Solr implements ServiceLocatorAwareInterface,
     \VuFindHttp\HttpServiceAwareInterface, \Zend\Log\LoggerAwareInterface
diff --git a/module/VuFind/src/VuFind/Connection/SolrAuth.php b/module/VuFind/src/VuFind/Connection/SolrAuth.php
index c2d3be4e53b..e480e20f4b4 100644
--- a/module/VuFind/src/VuFind/Connection/SolrAuth.php
+++ b/module/VuFind/src/VuFind/Connection/SolrAuth.php
@@ -24,7 +24,7 @@
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 
@@ -38,7 +38,7 @@ namespace VuFind\Connection;
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SolrAuth extends Solr
 {
diff --git a/module/VuFind/src/VuFind/Connection/SolrReserves.php b/module/VuFind/src/VuFind/Connection/SolrReserves.php
index 937d5b9a509..3008eed952e 100644
--- a/module/VuFind/src/VuFind/Connection/SolrReserves.php
+++ b/module/VuFind/src/VuFind/Connection/SolrReserves.php
@@ -23,7 +23,7 @@
  * @package  Solr
  * @author   Tuan Nguyen <tuan@yorku.ca>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 
@@ -36,7 +36,7 @@ namespace VuFind\Connection;
  * @package  Solr
  * @author   Tuan Nguyen <tuan@yorku.ca>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SolrReserves extends Solr
 {
diff --git a/module/VuFind/src/VuFind/Connection/SolrStats.php b/module/VuFind/src/VuFind/Connection/SolrStats.php
index 4b759ea66a2..e66f9ba4e55 100644
--- a/module/VuFind/src/VuFind/Connection/SolrStats.php
+++ b/module/VuFind/src/VuFind/Connection/SolrStats.php
@@ -24,7 +24,7 @@
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 
@@ -38,7 +38,7 @@ namespace VuFind\Connection;
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SolrStats extends Solr
 {
diff --git a/module/VuFind/src/VuFind/Connection/WorldCat.php b/module/VuFind/src/VuFind/Connection/WorldCat.php
index e486229c824..862c939454e 100644
--- a/module/VuFind/src/VuFind/Connection/WorldCat.php
+++ b/module/VuFind/src/VuFind/Connection/WorldCat.php
@@ -24,7 +24,7 @@
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 use VuFind\Config\Reader as ConfigReader;
@@ -36,7 +36,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  WorldCat
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class WorldCat extends SRU
 {
diff --git a/module/VuFind/src/VuFind/Connection/WorldCatUtils.php b/module/VuFind/src/VuFind/Connection/WorldCatUtils.php
index 04e6456489a..a5668984969 100644
--- a/module/VuFind/src/VuFind/Connection/WorldCatUtils.php
+++ b/module/VuFind/src/VuFind/Connection/WorldCatUtils.php
@@ -23,7 +23,7 @@
  * @package  WorldCat
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Connection;
 use File_MARCXML, VuFind\Config\Reader as ConfigReader,
@@ -38,7 +38,7 @@ use File_MARCXML, VuFind\Config\Reader as ConfigReader,
  * @package  WorldCat
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class WorldCatUtils implements \Zend\Log\LoggerAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index 601308f226f..4734427500e 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -24,7 +24,7 @@
  * @package  Controller
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFind\Controller;
 use Zend\Mvc\Controller\AbstractActionController, Zend\View\Model\ViewModel;
@@ -37,7 +37,7 @@ use Zend\Mvc\Controller\AbstractActionController, Zend\View\Model\ViewModel;
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class AbstractBase extends AbstractActionController
 {
diff --git a/module/VuFind/src/VuFind/Controller/AbstractRecord.php b/module/VuFind/src/VuFind/Controller/AbstractRecord.php
index d74b9bf194a..0a592eaa3cd 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractRecord.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractRecord.php
@@ -23,7 +23,7 @@
  * @package  Controller
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFind\Controller;
 use VuFind\Exception\Mail as MailException, VuFind\Export,
@@ -36,7 +36,7 @@ use VuFind\Exception\Mail as MailException, VuFind\Export,
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class AbstractRecord extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Controller/AjaxController.php b/module/VuFind/src/VuFind/Controller/AjaxController.php
index 41d714f1b58..f70d4416c36 100644
--- a/module/VuFind/src/VuFind/Controller/AjaxController.php
+++ b/module/VuFind/src/VuFind/Controller/AjaxController.php
@@ -23,7 +23,7 @@
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFind\Controller;
 use VuFind\Config\Reader as ConfigReader,
@@ -36,7 +36,7 @@ use VuFind\Config\Reader as ConfigReader,
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class AjaxController extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Controller/BrowseController.php b/module/VuFind/src/VuFind/Controller/BrowseController.php
index 31fa42b72c7..36738cd5e89 100644
--- a/module/VuFind/src/VuFind/Controller/BrowseController.php
+++ b/module/VuFind/src/VuFind/Controller/BrowseController.php
@@ -23,7 +23,7 @@
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/alphabetical_heading_browse Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFind\Controller;
 use VuFind\Config\Reader as ConfigReader;
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/alphabetical_heading_browse Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class BrowseController extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Controller/HierarchyController.php b/module/VuFind/src/VuFind/Controller/HierarchyController.php
index ec8109bd65c..a1b6c5a3c3f 100644
--- a/module/VuFind/src/VuFind/Controller/HierarchyController.php
+++ b/module/VuFind/src/VuFind/Controller/HierarchyController.php
@@ -23,7 +23,7 @@
  * @package  Controller
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFind\Controller;
 
@@ -34,7 +34,7 @@ namespace VuFind\Controller;
  * @package  Controller
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class HierarchyController extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Controller/InstallController.php b/module/VuFind/src/VuFind/Controller/InstallController.php
index 618240308d7..ad4edf7ad89 100644
--- a/module/VuFind/src/VuFind/Controller/InstallController.php
+++ b/module/VuFind/src/VuFind/Controller/InstallController.php
@@ -270,7 +270,7 @@ class InstallController extends AbstractBase
                 = "Your PHP installation appears to be missing the mbstring plug-in."
                 ." For better language support, it is recommended that you add this."
                 ." For details on how to do this, see "
-                ."http://vufind.org/wiki/installation "
+                ."http://vufind.org/wiki/vufind2:installation_notes "
                 ."and look at the PHP installation instructions for your platform.";
             $this->flashMessenger()->setNamespace('error')->addMessage($msg);
             $problems++;
@@ -282,7 +282,7 @@ class InstallController extends AbstractBase
                 = "Your PHP installation appears to be missing the GD plug-in. "
                 . "For better graphics support, it is recommended that you add this."
                 . " For details on how to do this, see "
-                . "http://vufind.org/wiki/installation "
+                . "http://vufind.org/wiki/vufind2:installation_notes "
                 . "and look at the PHP installation instructions for your platform.";
             $this->flashMessenger()->setNamespace('error')->addMessage($msg);
             $problems++;
@@ -294,7 +294,7 @@ class InstallController extends AbstractBase
                 = "Your PHP installation appears to be missing the mcrypt plug-in."
                 ." For better security support, it is recommended that you add this."
                 ." For details on how to do this, see "
-                ."http://vufind.org/wiki/installation "
+                ."http://vufind.org/wiki/vufind2:installation_notes "
                 ."and look at the PHP installation instructions for your platform.";
         }
 
diff --git a/module/VuFind/src/VuFind/Controller/OaiController.php b/module/VuFind/src/VuFind/Controller/OaiController.php
index a8bc183c923..653d714df0c 100644
--- a/module/VuFind/src/VuFind/Controller/OaiController.php
+++ b/module/VuFind/src/VuFind/Controller/OaiController.php
@@ -23,7 +23,7 @@
  * @package  Controller
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/alphabetical_heading_browse Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFind\Controller;
 use VuFind\Config\Reader as ConfigReader;
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  Controller
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/alphabetical_heading_browse Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class OaiController extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Controller/Plugin/ResultScroller.php b/module/VuFind/src/VuFind/Controller/Plugin/ResultScroller.php
index cc6caabf64a..cfa60d88d2e 100644
--- a/module/VuFind/src/VuFind/Controller/Plugin/ResultScroller.php
+++ b/module/VuFind/src/VuFind/Controller/Plugin/ResultScroller.php
@@ -23,7 +23,7 @@
  * @package  Controller_Plugins
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Controller\Plugin;
 use VuFind\Config\Reader as ConfigReader, VuFind\Search\Memory,
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Search\Memory,
  * @package  Controller_Plugins
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class ResultScroller extends AbstractPlugin
 {
diff --git a/module/VuFind/src/VuFind/Cookie/Container.php b/module/VuFind/src/VuFind/Cookie/Container.php
index ac274214da5..0504e047b02 100644
--- a/module/VuFind/src/VuFind/Cookie/Container.php
+++ b/module/VuFind/src/VuFind/Cookie/Container.php
@@ -24,7 +24,7 @@
  * @package  Cookie
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Cookie;
 
@@ -36,7 +36,7 @@ namespace VuFind\Cookie;
  * @package  Cookie
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Container
 {
diff --git a/module/VuFind/src/VuFind/Crypt/HMAC.php b/module/VuFind/src/VuFind/Crypt/HMAC.php
index 71526ee9c8a..0725c8a9ae1 100644
--- a/module/VuFind/src/VuFind/Crypt/HMAC.php
+++ b/module/VuFind/src/VuFind/Crypt/HMAC.php
@@ -23,7 +23,7 @@
  * @package  Crypt
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Crypt;
 use VuFind\Config\Reader as ConfigReader;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  Crypt
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class HMAC
 {
diff --git a/module/VuFind/src/VuFind/Date/Converter.php b/module/VuFind/src/VuFind/Date/Converter.php
index 221b4d35170..8daf6d34c28 100644
--- a/module/VuFind/src/VuFind/Date/Converter.php
+++ b/module/VuFind/src/VuFind/Date/Converter.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/Date_And_Time_Functions Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Date;
 use DateTime, VuFind\Config\Reader as ConfigReader,
@@ -38,7 +38,7 @@ use DateTime, VuFind\Config\Reader as ConfigReader,
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/Date_And_Time_Functions Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Converter
 {
diff --git a/module/VuFind/src/VuFind/Db/Table/PluginFactory.php b/module/VuFind/src/VuFind/Db/Table/PluginFactory.php
index 2a7b7d458e4..04c475c8c46 100644
--- a/module/VuFind/src/VuFind/Db/Table/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Db/Table/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  Db_Table
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:database_gateways Wiki
  */
 namespace VuFind\Db\Table;
 
@@ -34,7 +34,7 @@ namespace VuFind\Db\Table;
  * @package  Db_Table
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:database_gateways Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/Db/Table/PluginManager.php b/module/VuFind/src/VuFind/Db/Table/PluginManager.php
index 346b028350b..057ce03e371 100644
--- a/module/VuFind/src/VuFind/Db/Table/PluginManager.php
+++ b/module/VuFind/src/VuFind/Db/Table/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  Db_Table
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:database_gateways Wiki
  */
 namespace VuFind\Db\Table;
 
@@ -34,7 +34,7 @@ namespace VuFind\Db\Table;
  * @package  Db_Table
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:database_gateways Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/Exception/Auth.php b/module/VuFind/src/VuFind/Exception/Auth.php
index aea31d38b56..decd8efbeb0 100644
--- a/module/VuFind/src/VuFind/Exception/Auth.php
+++ b/module/VuFind/src/VuFind/Exception/Auth.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Auth extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/Date.php b/module/VuFind/src/VuFind/Exception/Date.php
index acbb01a97cb..e3901ecb85e 100644
--- a/module/VuFind/src/VuFind/Exception/Date.php
+++ b/module/VuFind/src/VuFind/Exception/Date.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Date extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/FileAccess.php b/module/VuFind/src/VuFind/Exception/FileAccess.php
index fa96a6c6c1c..a82ceb1e35d 100644
--- a/module/VuFind/src/VuFind/Exception/FileAccess.php
+++ b/module/VuFind/src/VuFind/Exception/FileAccess.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class FileAccess extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/Forbidden.php b/module/VuFind/src/VuFind/Exception/Forbidden.php
index ba218cea3ba..8d747ea2e99 100644
--- a/module/VuFind/src/VuFind/Exception/Forbidden.php
+++ b/module/VuFind/src/VuFind/Exception/Forbidden.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Forbidden extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/ILS.php b/module/VuFind/src/VuFind/Exception/ILS.php
index 636cba14430..d2d7e6a6910 100644
--- a/module/VuFind/src/VuFind/Exception/ILS.php
+++ b/module/VuFind/src/VuFind/Exception/ILS.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class ILS extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/ListPermission.php b/module/VuFind/src/VuFind/Exception/ListPermission.php
index a97ec8647de..8c942fb277f 100644
--- a/module/VuFind/src/VuFind/Exception/ListPermission.php
+++ b/module/VuFind/src/VuFind/Exception/ListPermission.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class ListPermission extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/LoginRequired.php b/module/VuFind/src/VuFind/Exception/LoginRequired.php
index d8540a5cd0b..16d4c49b72b 100644
--- a/module/VuFind/src/VuFind/Exception/LoginRequired.php
+++ b/module/VuFind/src/VuFind/Exception/LoginRequired.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class LoginRequired extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/Mail.php b/module/VuFind/src/VuFind/Exception/Mail.php
index 2c9f02abd3f..a08217cb05e 100644
--- a/module/VuFind/src/VuFind/Exception/Mail.php
+++ b/module/VuFind/src/VuFind/Exception/Mail.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Mail extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/MissingField.php b/module/VuFind/src/VuFind/Exception/MissingField.php
index 21b54be5cd1..f06d8378e50 100644
--- a/module/VuFind/src/VuFind/Exception/MissingField.php
+++ b/module/VuFind/src/VuFind/Exception/MissingField.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class MissingField extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/PasswordSecurity.php b/module/VuFind/src/VuFind/Exception/PasswordSecurity.php
index 8223d5c50b2..0a710f8e315 100644
--- a/module/VuFind/src/VuFind/Exception/PasswordSecurity.php
+++ b/module/VuFind/src/VuFind/Exception/PasswordSecurity.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class PasswordSecurity extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/RecordMissing.php b/module/VuFind/src/VuFind/Exception/RecordMissing.php
index fdb3571792b..29e57ea54aa 100644
--- a/module/VuFind/src/VuFind/Exception/RecordMissing.php
+++ b/module/VuFind/src/VuFind/Exception/RecordMissing.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class RecordMissing extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Exception/SessionExpired.php b/module/VuFind/src/VuFind/Exception/SessionExpired.php
index 92180190d0b..e1998f8ac8e 100644
--- a/module/VuFind/src/VuFind/Exception/SessionExpired.php
+++ b/module/VuFind/src/VuFind/Exception/SessionExpired.php
@@ -23,7 +23,7 @@
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Exception;
 
@@ -34,7 +34,7 @@ namespace VuFind\Exception;
  * @package  Exceptions
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SessionExpired extends \Exception
 {
diff --git a/module/VuFind/src/VuFind/Feed/Writer/Extension/DublinCore/Entry.php b/module/VuFind/src/VuFind/Feed/Writer/Extension/DublinCore/Entry.php
index a92eb588862..cca2eacc80c 100644
--- a/module/VuFind/src/VuFind/Feed/Writer/Extension/DublinCore/Entry.php
+++ b/module/VuFind/src/VuFind/Feed/Writer/Extension/DublinCore/Entry.php
@@ -23,7 +23,7 @@
  * @package  Feed_Plugins
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Feed\Writer\Extension\DublinCore;
 use Zend\Feed\Writer\Extension\ITunes\Entry as ParentEntry;
@@ -41,7 +41,7 @@ use Zend\Feed\Writer\Extension\ITunes\Entry as ParentEntry;
  * @package  Feed_Plugins
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Entry extends ParentEntry
 {
diff --git a/module/VuFind/src/VuFind/Feed/Writer/Extension/DublinCore/Renderer/Entry.php b/module/VuFind/src/VuFind/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
index 7700c1c380c..c1384601e53 100644
--- a/module/VuFind/src/VuFind/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/module/VuFind/src/VuFind/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -23,7 +23,7 @@
  * @package  Feed_Plugins
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Feed\Writer\Extension\DublinCore\Renderer;
 use DOMDocument, DOMElement,
@@ -36,7 +36,7 @@ use DOMDocument, DOMElement,
  * @package  Feed_Plugins
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Entry extends ParentEntry
 {
diff --git a/module/VuFind/src/VuFind/Harvester/NAF.php b/module/VuFind/src/VuFind/Harvester/NAF.php
index 2ce27c279f1..870feab09d3 100644
--- a/module/VuFind/src/VuFind/Harvester/NAF.php
+++ b/module/VuFind/src/VuFind/Harvester/NAF.php
@@ -23,7 +23,7 @@
  * @package  Harvest_Tools
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/authority_control Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Harvester;
 use VuFind\Connection\SRU, Zend\Console\Console;
@@ -38,7 +38,7 @@ use VuFind\Connection\SRU, Zend\Console\Console;
  * @package  Harvest_Tools
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/authority_control Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class NAF
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/Driver/AbstractBase.php b/module/VuFind/src/VuFind/Hierarchy/Driver/AbstractBase.php
index 353f1d32ae3..1e0b136e082 100644
--- a/module/VuFind/src/VuFind/Hierarchy/Driver/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Hierarchy/Driver/AbstractBase.php
@@ -23,7 +23,7 @@
  * @package  Hierarchy
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_search_object Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\Driver;
 use VuFind\Hierarchy\TreeDataSource\PluginManager as DataManager,
@@ -40,7 +40,7 @@ use VuFind\Hierarchy\TreeDataSource\PluginManager as DataManager,
  * @package  Hierarchy
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_search_object Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 abstract class AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBased.php b/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBased.php
index 7261af65c22..6f90eb07f3b 100644
--- a/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBased.php
+++ b/module/VuFind/src/VuFind/Hierarchy/Driver/ConfigurationBased.php
@@ -23,7 +23,7 @@
  * @package  Hierarchy_Drivers
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\Hierarchy\Driver;
  * @package  Hierarchy_Drivers
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 class ConfigurationBased extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/Driver/Factory.php b/module/VuFind/src/VuFind/Hierarchy/Driver/Factory.php
index 9cf273e8747..e7f2feef12b 100644
--- a/module/VuFind/src/VuFind/Hierarchy/Driver/Factory.php
+++ b/module/VuFind/src/VuFind/Hierarchy/Driver/Factory.php
@@ -23,7 +23,7 @@
  * @package  Hierarchy_Drivers
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_search_object Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\Driver;
 
@@ -36,7 +36,7 @@ namespace VuFind\Hierarchy\Driver;
  * @package  Hierarchy_Drivers
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_search_object Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 class Factory
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/Driver/PluginManager.php b/module/VuFind/src/VuFind/Hierarchy/Driver/PluginManager.php
index 5dfda51ca92..f561eb89472 100644
--- a/module/VuFind/src/VuFind/Hierarchy/Driver/PluginManager.php
+++ b/module/VuFind/src/VuFind/Hierarchy/Driver/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  Hierarchy_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\Hierarchy\Driver;
  * @package  Hierarchy_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/AbstractBase.php b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/AbstractBase.php
index 3fe3dfd3c1b..35a45cda242 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/AbstractBase.php
@@ -23,7 +23,7 @@
  * @package  HierarchyTree_DataSource
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\TreeDataSource;
 use Zend\Log\LoggerInterface;
@@ -37,7 +37,7 @@ use Zend\Log\LoggerInterface;
  * @package  HierarchyTree_DataSource
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 abstract class AbstractBase implements \Zend\Log\LoggerAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/PluginManager.php b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/PluginManager.php
index f3a6b4cd028..f4defe968eb 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/PluginManager.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  HierarchyTree_DataSource
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\TreeDataSource;
 
@@ -34,7 +34,7 @@ namespace VuFind\Hierarchy\TreeDataSource;
  * @package  HierarchyTree_DataSource
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Solr.php b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Solr.php
index f5d200a31b5..de14969a036 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Solr.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Solr.php
@@ -23,7 +23,7 @@
  * @package  HierarchyTree_DataSource
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\TreeDataSource;
 use VuFind\Connection\Manager as ConnectionManager;
@@ -37,7 +37,7 @@ use VuFind\Connection\Manager as ConnectionManager;
  * @package  HierarchyTree_DataSource
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 class Solr extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/XMLFile.php b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/XMLFile.php
index 238451b5b29..0892f15ffe7 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/XMLFile.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/XMLFile.php
@@ -23,7 +23,7 @@
  * @package  HierarchyTree_DataSource
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\TreeDataSource;
 
@@ -36,7 +36,7 @@ namespace VuFind\Hierarchy\TreeDataSource;
  * @package  HierarchyTree_DataSource
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 class XMLFile extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/AbstractBase.php b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/AbstractBase.php
index 4cc44dd4063..37b97ec79c5 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/AbstractBase.php
@@ -23,7 +23,7 @@
  * @package  HierarchyTree_Renderer
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\TreeRenderer;
 
@@ -36,7 +36,7 @@ namespace VuFind\Hierarchy\TreeRenderer;
  * @package  HierarchyTree_Renderer
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 abstract class AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
index 476b2ef7d37..b7e52d28784 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
@@ -23,7 +23,7 @@
  * @package  HierarchyTree_Renderer
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 namespace VuFind\Hierarchy\TreeRenderer;
 
@@ -36,7 +36,7 @@ namespace VuFind\Hierarchy\TreeRenderer;
  * @package  HierarchyTree_Renderer
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_authentication_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
  */
 
 class JSTree extends AbstractBase
diff --git a/module/VuFind/src/VuFind/ILS/Connection.php b/module/VuFind/src/VuFind/ILS/Connection.php
index 2f5d9aa5e57..e4a6f390365 100644
--- a/module/VuFind/src/VuFind/ILS/Connection.php
+++ b/module/VuFind/src/VuFind/ILS/Connection.php
@@ -27,7 +27,7 @@
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException,
@@ -44,7 +44,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException,
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Connection
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/AbstractBase.php b/module/VuFind/src/VuFind/ILS/Driver/AbstractBase.php
index fa394ab5fa0..2a02e237a65 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/AbstractBase.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/AbstractBase.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\ILS\Driver;
  * @package  ILS_Drivers
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 abstract class AbstractBase implements DriverInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
index 3dcdad8b8be..64d758fbe9c 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
@@ -33,7 +33,7 @@
  * @author   Kun Lin <vufind-tech@lists.sourceforge.net>
  * @author   Vaclav Rosecky <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException,
@@ -47,7 +47,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException,
  * @package  ILS_Drivers
  * @author   Vaclav Rosecky <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class AlephTranslator
 {
@@ -253,7 +253,7 @@ class AlephTranslator
  * @package  Exceptions
  * @author   Vaclav Rosecky <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class AlephRestfulException extends \Exception
 {
@@ -270,7 +270,7 @@ class AlephRestfulException extends \Exception
  * @author   Kun Lin <vufind-tech@lists.sourceforge.net>
  * @author   Vaclav Rosecky <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Aleph extends AbstractBase implements ServiceLocatorAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Amicus.php b/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
index de76acf7a6b..2fc91b6fc7e 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Josu Moreno <jmoreno@scanbit.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
@@ -37,7 +37,7 @@ use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
  * @package  ILS_Drivers
  * @author   Josu Moreno <jmoreno@scanbit.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Amicus extends AbstractBase implements TranslatorAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php b/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
index 6fd1107b993..5c93ba809a7 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Josef Moravec <josef.moravec@knihovna-uo.cz>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
diff --git a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
index fcde26241c7..fe5af6040ee 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
@@ -25,7 +25,7 @@
  * @package  ILS_Drivers
  * @author   Oliver Goldschmidt <o.goldschmidt@tu-harburg.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use DOMDocument, VuFind\Config\Reader as ConfigReader,
@@ -40,7 +40,7 @@ use DOMDocument, VuFind\Config\Reader as ConfigReader,
  * @package  ILS_Drivers
  * @author   Oliver Goldschmidt <o.goldschmidt@tu-harburg.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class DAIA extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Demo.php b/module/VuFind/src/VuFind/ILS/Driver/Demo.php
index 88fb82d6d2e..b9c431e1542 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Demo.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Demo.php
@@ -27,7 +27,7 @@
  * @package  ILS_Drivers
  * @author   Greg Pendlebury <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use ArrayObject, VuFind\Config\Reader as ConfigReader,
@@ -44,7 +44,7 @@ use ArrayObject, VuFind\Config\Reader as ConfigReader,
  * @package  ILS_Drivers
  * @author   Greg Pendlebury <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Demo extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/DriverInterface.php b/module/VuFind/src/VuFind/ILS/Driver/DriverInterface.php
index 67958a7d801..5dd9a76f25a 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/DriverInterface.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/DriverInterface.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 
@@ -42,7 +42,7 @@ namespace VuFind\ILS\Driver;
  * @package  ILS_Drivers
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 interface DriverInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Evergreen.php b/module/VuFind/src/VuFind/ILS/Driver/Evergreen.php
index b39275096b3..dfda2d7b21f 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Evergreen.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Evergreen.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Warren Layton, NRCan Library <warren.layton@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
@@ -39,7 +39,7 @@ use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
  * @package  ILS_Drivers
  * @author   Warren Layton, NRCan Library <warren.layton@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Evergreen extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Horizon.php b/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
index b4ba3c0367f..14efc0d8ed8 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
@@ -24,7 +24,7 @@
  * @author   Matt Mackey <vufind-tech@lists.sourceforge.net>
  * @author   Ray Cummins <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
  * @author   Matt Mackey <vufind-tech@lists.sourceforge.net>
  * @author   Ray Cummins <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Horizon extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php b/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
index 7385d8dfa34..298448dfb58 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
@@ -24,7 +24,7 @@
  * @author   Matt Mackey <vufind-tech@lists.sourceforge.net>
  * @author   Ray Cummins <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use VuFind\Exception\ILS as ILSException;
@@ -37,7 +37,7 @@ use VuFind\Exception\ILS as ILSException;
  * @author   Matt Mackey <vufind-tech@lists.sourceforge.net>
  * @author   Ray Cummins <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class HorizonXMLAPI extends Horizon implements \VuFindHttp\HttpServiceAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Innovative.php b/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
index e673e0b0e6f..bbe7ebb9a8b 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Adam Brin <abrin@brynmawr.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
@@ -38,7 +38,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
  * @package  ILS_Drivers
  * @author   Adam Brin <abrin@brynmawr.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Innovative extends AbstractBase implements
     \VuFindHttp\HttpServiceAwareInterface
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Koha.php b/module/VuFind/src/VuFind/ILS/Driver/Koha.php
index eeac7c0725a..add59c55bc9 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Koha.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Koha.php
@@ -24,7 +24,7 @@
  * @author   Altaf Mahmud, System Programmer <altaf.mahmud@gmail.com>
  * @author   David Maus <maus@hab.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
@@ -40,7 +40,7 @@ use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
  * @author   Altaf Mahmud, System Programmer <altaf.mahmud@gmail.com>
  * @author   David Maus <maus@hab.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Koha extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php b/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
index a4af49c3363..e6034cafca2 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Verus Solutions <info@verussolutions.biz>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
@@ -36,7 +36,7 @@ use PDO, PDOException, VuFind\Config\Reader as ConfigReader,
  * @package  ILS_Drivers
  * @author   Verus Solutions <info@verussolutions.biz>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class NewGenLib extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/NoILS.php b/module/VuFind/src/VuFind/ILS/Driver/NoILS.php
index df16e6b178f..84fa0730bc1 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/NoILS.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/NoILS.php
@@ -24,7 +24,7 @@
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException,
@@ -40,7 +40,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException,
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class NoILS extends AbstractBase implements ServiceLocatorAwareInterface,
     TranslatorAwareInterface
diff --git a/module/VuFind/src/VuFind/ILS/Driver/PICA.php b/module/VuFind/src/VuFind/ILS/Driver/PICA.php
index 22bcfbed233..3fff7cc4b11 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/PICA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/PICA.php
@@ -27,7 +27,7 @@
  * @package  ILS_Drivers
  * @author   Oliver Goldschmidt <o.goldschmidt@tu-harburg.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use DOMDocument, VuFind\Config\Reader as ConfigReader,
@@ -43,7 +43,7 @@ use DOMDocument, VuFind\Config\Reader as ConfigReader,
  * @package  ILS_Drivers
  * @author   Oliver Goldschmidt <o.goldschmidt@tu-harburg.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class PICA extends DAIA
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/PluginFactory.php b/module/VuFind/src/VuFind/ILS/Driver/PluginFactory.php
index a92408cda50..4e95bf38319 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/PluginFactory.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\ILS\Driver;
  * @package  ILS_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/PluginManager.php b/module/VuFind/src/VuFind/ILS/Driver/PluginManager.php
index ac27f6cb162..c4d0c6b454e 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/PluginManager.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\ILS\Driver;
  * @package  ILS_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Sample.php b/module/VuFind/src/VuFind/ILS/Driver/Sample.php
index 1375814e8cc..31f2d1fe19b 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Sample.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Sample.php
@@ -24,7 +24,7 @@
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 
@@ -36,7 +36,7 @@ namespace VuFind\ILS\Driver;
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Sample extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Symphony.php b/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
index 9a14251654d..c0e31ef62f6 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
@@ -24,7 +24,7 @@
  * @author   Steven Hild <sjhild@wm.edu>
  * @author   Michael Gillen <mlgillen@sfasu.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use SoapClient, SoapFault, SoapHeader, VuFind\Config\Reader as ConfigReader,
@@ -40,7 +40,7 @@ use SoapClient, SoapFault, SoapHeader, VuFind\Config\Reader as ConfigReader,
  * @author   Steven Hild <sjhild@wm.edu>
  * @author   Michael Gillen <mlgillen@sfasu.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 
 class Symphony extends AbstractBase implements ServiceLocatorAwareInterface
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
index e54a7d49364..41cb98b64ed 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Greg Pendlebury <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
  * @package  ILS_Drivers
  * @author   Greg Pendlebury <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Virtua extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
index 83cb957f653..6c7414b9a9f 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
@@ -24,7 +24,7 @@
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use File_MARC, PDO, PDOException, VuFind\Config\Reader as ConfigReader,
@@ -41,7 +41,7 @@ use File_MARC, PDO, PDOException, VuFind\Config\Reader as ConfigReader,
  * @author   Andrew S. Nagy <vufind-tech@lists.sourceforge.net>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class Voyager extends AbstractBase implements TranslatorAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
index 2c889c7613f..92d06d534b8 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
@@ -25,7 +25,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use PDOException, VuFind\Exception\Date as DateException,
@@ -40,7 +40,7 @@ use PDOException, VuFind\Exception\Date as DateException,
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class VoyagerRestful extends Voyager implements \VuFindHttp\HttpServiceAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP.php b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP.php
index 3f2599bde0b..024f2c3686f 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
  * @package  ILS_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class XCNCIP extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
index 13518c9907f..6285f3393b6 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
@@ -23,7 +23,7 @@
  * @package  ILS_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 namespace VuFind\ILS\Driver;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\ILS as ILSException;
  * @package  ILS_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_an_ils_driver Wiki
  */
 class XCNCIP2 extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/ILS/Logic/Holds.php b/module/VuFind/src/VuFind/ILS/Logic/Holds.php
index c71dec29370..1e1aabdf2d6 100644
--- a/module/VuFind/src/VuFind/ILS/Logic/Holds.php
+++ b/module/VuFind/src/VuFind/ILS/Logic/Holds.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\ILS\Logic;
 use VuFind\Config\Reader as ConfigReader, VuFind\Crypt\HMAC,
@@ -38,7 +38,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Crypt\HMAC,
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Holds
 {
diff --git a/module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php b/module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php
index 68b08c504eb..cdaf97d05ee 100644
--- a/module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php
+++ b/module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\ILS\Logic;
 use VuFind\Config\Reader as ConfigReader, VuFind\Crypt\HMAC,
@@ -38,7 +38,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Crypt\HMAC,
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Luke O'Sullivan <l.osullivan@swansea.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes#index_interface Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class TitleHolds
 {
diff --git a/module/VuFind/src/VuFind/Mailer.php b/module/VuFind/src/VuFind/Mailer.php
index 19b3ecea530..b98943a71f8 100644
--- a/module/VuFind/src/VuFind/Mailer.php
+++ b/module/VuFind/src/VuFind/Mailer.php
@@ -23,7 +23,7 @@
  * @package  Mailer
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind;
 use VuFind\Config\Reader as ConfigReader, VuFind\Exception\Mail as MailException,
@@ -36,7 +36,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Exception\Mail as MailException
  * @package  Mailer
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Mailer implements \VuFind\I18n\Translator\TranslatorAwareInterface
 {
diff --git a/module/VuFind/src/VuFind/OAI/Server.php b/module/VuFind/src/VuFind/OAI/Server.php
index 2029f7a812c..ad4cb3b0284 100644
--- a/module/VuFind/src/VuFind/OAI/Server.php
+++ b/module/VuFind/src/VuFind/OAI/Server.php
@@ -23,7 +23,7 @@
  * @package  OAI_Server
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/tracking_record_changes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\OAI;
 use SimpleXMLElement, VuFind\Config\Reader as ConfigReader,
@@ -38,7 +38,7 @@ use SimpleXMLElement, VuFind\Config\Reader as ConfigReader,
  * @package  OAI_Server
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/tracking_record_changes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Server
 {
diff --git a/module/VuFind/src/VuFind/OAI/Server/Auth.php b/module/VuFind/src/VuFind/OAI/Server/Auth.php
index 8f66da1e651..761a9bec172 100644
--- a/module/VuFind/src/VuFind/OAI/Server/Auth.php
+++ b/module/VuFind/src/VuFind/OAI/Server/Auth.php
@@ -23,7 +23,7 @@
  * @package  OAI_Server
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/tracking_record_changes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\OAI\Server;
 use VuFind\OAI\Server as Base;
@@ -37,7 +37,7 @@ use VuFind\OAI\Server as Base;
  * @package  OAI_Server
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/tracking_record_changes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Auth extends Base
 {
diff --git a/module/VuFind/src/VuFind/Recommend/AbstractSearchManagerAwareModule.php b/module/VuFind/src/VuFind/Recommend/AbstractSearchManagerAwareModule.php
index d9b732acf5d..cba98fa4337 100644
--- a/module/VuFind/src/VuFind/Recommend/AbstractSearchManagerAwareModule.php
+++ b/module/VuFind/src/VuFind/Recommend/AbstractSearchManagerAwareModule.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use Zend\ServiceManager\ServiceLocatorInterface,
@@ -38,7 +38,7 @@ use Zend\ServiceManager\ServiceLocatorInterface,
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 abstract class AbstractSearchManagerAwareModule implements RecommendInterface,
     ServiceLocatorAwareInterface
diff --git a/module/VuFind/src/VuFind/Recommend/AuthorFacets.php b/module/VuFind/src/VuFind/Recommend/AuthorFacets.php
index 9183257677a..579b088ab9e 100644
--- a/module/VuFind/src/VuFind/Recommend/AuthorFacets.php
+++ b/module/VuFind/src/VuFind/Recommend/AuthorFacets.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use Zend\Http\Request, Zend\StdLib\Parameters;
@@ -40,7 +40,7 @@ use Zend\Http\Request, Zend\StdLib\Parameters;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class AuthorFacets extends AbstractSearchManagerAwareModule
 {
diff --git a/module/VuFind/src/VuFind/Recommend/AuthorInfo.php b/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
index 34d2705732d..de0e938429c 100644
--- a/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
+++ b/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use VuFind\Config\Reader as ConfigReader,
@@ -39,7 +39,7 @@ use VuFind\Config\Reader as ConfigReader,
  * @package  Recommendations
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  * @view     AuthorInfoFacets.phtml
  */
 class AuthorInfo implements RecommendInterface, TranslatorAwareInterface
diff --git a/module/VuFind/src/VuFind/Recommend/CatalogResults.php b/module/VuFind/src/VuFind/Recommend/CatalogResults.php
index 5c621c7058d..f8c235655ee 100644
--- a/module/VuFind/src/VuFind/Recommend/CatalogResults.php
+++ b/module/VuFind/src/VuFind/Recommend/CatalogResults.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -37,7 +37,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class CatalogResults extends SearchObject
 {
diff --git a/module/VuFind/src/VuFind/Recommend/CollectionSideFacets.php b/module/VuFind/src/VuFind/Recommend/CollectionSideFacets.php
index dc986154531..eac193a1c94 100644
--- a/module/VuFind/src/VuFind/Recommend/CollectionSideFacets.php
+++ b/module/VuFind/src/VuFind/Recommend/CollectionSideFacets.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -36,7 +36,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class CollectionSideFacets extends SideFacets
 {
diff --git a/module/VuFind/src/VuFind/Recommend/EuropeanaResults.php b/module/VuFind/src/VuFind/Recommend/EuropeanaResults.php
index 09132b5ee65..beb0178100e 100644
--- a/module/VuFind/src/VuFind/Recommend/EuropeanaResults.php
+++ b/module/VuFind/src/VuFind/Recommend/EuropeanaResults.php
@@ -24,7 +24,7 @@
  * @author   Lutz Biedinger <lutz.biedinger@gmail.com>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use VuFind\Config\Reader as ConfigReader, Zend\Feed\Reader\Reader as FeedReader,
@@ -40,7 +40,7 @@ use VuFind\Config\Reader as ConfigReader, Zend\Feed\Reader\Reader as FeedReader,
  * @author   Lutz Biedinger <lutz.biedinger@gmail.com>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class EuropeanaResults implements RecommendInterface,
     \VuFindHttp\HttpServiceAwareInterface, \Zend\Log\LoggerAwareInterface
diff --git a/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php b/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
index e4afb7ccd22..f0d8ba54e42 100644
--- a/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
+++ b/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
@@ -24,7 +24,7 @@
  * @author   Lutz Biedinger <lutz.biedinger@gmail.com>
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -38,7 +38,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Lutz Biedinger <lutz.biedigner@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class EuropeanaResultsDeferred implements RecommendInterface
 {
diff --git a/module/VuFind/src/VuFind/Recommend/FavoriteFacets.php b/module/VuFind/src/VuFind/Recommend/FavoriteFacets.php
index 69a050f56de..a8032f5f38f 100644
--- a/module/VuFind/src/VuFind/Recommend/FavoriteFacets.php
+++ b/module/VuFind/src/VuFind/Recommend/FavoriteFacets.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -36,7 +36,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class FavoriteFacets extends SideFacets
 {
diff --git a/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php b/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php
index f76e1b264ad..f04650c7f08 100644
--- a/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php
+++ b/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Eoghan Ó Carragáin <eoghan.ocarragain@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use VuFind\Connection\OpenLibrary, VuFind\Solr\Utils as SolrUtils;
@@ -40,7 +40,7 @@ use VuFind\Connection\OpenLibrary, VuFind\Solr\Utils as SolrUtils;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Eoghan Ó Carragáin <eoghan.ocarragain@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class OpenLibrarySubjects implements RecommendInterface,
     \VuFindHttp\HttpServiceAwareInterface
diff --git a/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjectsDeferred.php b/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjectsDeferred.php
index bed5ccdb8dc..c5aaef4ae9e 100644
--- a/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjectsDeferred.php
+++ b/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjectsDeferred.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Eoghan Ó Carragáin <eoghan.ocarragain@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -39,7 +39,7 @@ namespace VuFind\Recommend;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Eoghan Ó Carragáin <eoghan.ocarragain@gmail.com>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class OpenLibrarySubjectsDeferred extends OpenLibrarySubjects
 {
diff --git a/module/VuFind/src/VuFind/Recommend/PluginFactory.php b/module/VuFind/src/VuFind/Recommend/PluginFactory.php
index a6bec132de0..aeb9368fba8 100644
--- a/module/VuFind/src/VuFind/Recommend/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Recommend/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -34,7 +34,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/Recommend/PluginManager.php b/module/VuFind/src/VuFind/Recommend/PluginManager.php
index 59f22afe7e8..0235173620f 100644
--- a/module/VuFind/src/VuFind/Recommend/PluginManager.php
+++ b/module/VuFind/src/VuFind/Recommend/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -34,7 +34,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/Recommend/PubDateVisAjax.php b/module/VuFind/src/VuFind/Recommend/PubDateVisAjax.php
index a4b32042b8b..d9c144e8f3f 100644
--- a/module/VuFind/src/VuFind/Recommend/PubDateVisAjax.php
+++ b/module/VuFind/src/VuFind/Recommend/PubDateVisAjax.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Till Kinstler <kinstler@gbv.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -36,7 +36,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Till Kinstler <kinstler@gbv.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class PubDateVisAjax implements RecommendInterface
 {
diff --git a/module/VuFind/src/VuFind/Recommend/RecommendInterface.php b/module/VuFind/src/VuFind/Recommend/RecommendInterface.php
index 47a3e59b09e..3bdf5e690de 100644
--- a/module/VuFind/src/VuFind/Recommend/RecommendInterface.php
+++ b/module/VuFind/src/VuFind/Recommend/RecommendInterface.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -44,7 +44,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 interface RecommendInterface
 {
diff --git a/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php b/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php
index 3c775f8bfb9..0bbb3996828 100644
--- a/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php
+++ b/module/VuFind/src/VuFind/Recommend/ResultGoogleMapAjax.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use VuFind\I18n\Translator\TranslatorAwareInterface;
@@ -39,7 +39,7 @@ use VuFind\I18n\Translator\TranslatorAwareInterface;
  * @author   Lutz Biedinger <lutz.biedinger@gmail.com>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  * @view     AuthorInfoFacets.phtml
  */
 class ResultGoogleMapAjax implements RecommendInterface, TranslatorAwareInterface
diff --git a/module/VuFind/src/VuFind/Recommend/SearchObject.php b/module/VuFind/src/VuFind/Recommend/SearchObject.php
index 470f3ccf0eb..af8ddf7a3a0 100644
--- a/module/VuFind/src/VuFind/Recommend/SearchObject.php
+++ b/module/VuFind/src/VuFind/Recommend/SearchObject.php
@@ -24,7 +24,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -36,7 +36,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 abstract class SearchObject extends AbstractSearchManagerAwareModule
 {
diff --git a/module/VuFind/src/VuFind/Recommend/SideFacets.php b/module/VuFind/src/VuFind/Recommend/SideFacets.php
index 20e3c29d917..5c274c81285 100644
--- a/module/VuFind/src/VuFind/Recommend/SideFacets.php
+++ b/module/VuFind/src/VuFind/Recommend/SideFacets.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use VuFind\Config\Reader as ConfigReader, VuFind\Solr\Utils as SolrUtils;
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Solr\Utils as SolrUtils;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class SideFacets implements RecommendInterface
 {
diff --git a/module/VuFind/src/VuFind/Recommend/SummonDatabases.php b/module/VuFind/src/VuFind/Recommend/SummonDatabases.php
index 954279f29a9..97548917684 100644
--- a/module/VuFind/src/VuFind/Recommend/SummonDatabases.php
+++ b/module/VuFind/src/VuFind/Recommend/SummonDatabases.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -36,7 +36,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class SummonDatabases extends AbstractSearchManagerAwareModule
 {
diff --git a/module/VuFind/src/VuFind/Recommend/SummonResults.php b/module/VuFind/src/VuFind/Recommend/SummonResults.php
index 586ffaecd5f..4896325ad7a 100644
--- a/module/VuFind/src/VuFind/Recommend/SummonResults.php
+++ b/module/VuFind/src/VuFind/Recommend/SummonResults.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -36,7 +36,7 @@ namespace VuFind\Recommend;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class SummonResults extends SearchObject
 {
diff --git a/module/VuFind/src/VuFind/Recommend/SwitchType.php b/module/VuFind/src/VuFind/Recommend/SwitchType.php
index 1ff9cc97b45..9198fd8d936 100644
--- a/module/VuFind/src/VuFind/Recommend/SwitchType.php
+++ b/module/VuFind/src/VuFind/Recommend/SwitchType.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 
@@ -38,7 +38,7 @@ namespace VuFind\Recommend;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class SwitchType implements RecommendInterface
 {
diff --git a/module/VuFind/src/VuFind/Recommend/TopFacets.php b/module/VuFind/src/VuFind/Recommend/TopFacets.php
index 1570e76d2ad..1d934e3b8f5 100644
--- a/module/VuFind/src/VuFind/Recommend/TopFacets.php
+++ b/module/VuFind/src/VuFind/Recommend/TopFacets.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use VuFind\Config\Reader as ConfigReader;
@@ -39,7 +39,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class TopFacets implements RecommendInterface
 {
diff --git a/module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php b/module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php
index d07c3cf03b8..a834384d22f 100644
--- a/module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php
+++ b/module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use VuFind\Connection\WorldCatUtils;
@@ -37,7 +37,7 @@ use VuFind\Connection\WorldCatUtils;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class WorldCatIdentities implements RecommendInterface
 {
diff --git a/module/VuFind/src/VuFind/Recommend/WorldCatTerms.php b/module/VuFind/src/VuFind/Recommend/WorldCatTerms.php
index 07dfd42d1fc..1d82f770c8c 100644
--- a/module/VuFind/src/VuFind/Recommend/WorldCatTerms.php
+++ b/module/VuFind/src/VuFind/Recommend/WorldCatTerms.php
@@ -23,7 +23,7 @@
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 namespace VuFind\Recommend;
 use VuFind\Connection\WorldCatUtils;
@@ -37,7 +37,7 @@ use VuFind\Connection\WorldCatUtils;
  * @package  Recommendations
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:recommendation_modules Wiki
  */
 class WorldCatTerms implements RecommendInterface
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/Missing.php b/module/VuFind/src/VuFind/RecordDriver/Missing.php
index f0d2ed40ef8..9f56b568b5d 100644
--- a/module/VuFind/src/VuFind/RecordDriver/Missing.php
+++ b/module/VuFind/src/VuFind/RecordDriver/Missing.php
@@ -24,7 +24,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 
@@ -36,7 +36,7 @@ namespace VuFind\RecordDriver;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class Missing extends SolrDefault
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/PluginFactory.php b/module/VuFind/src/VuFind/RecordDriver/PluginFactory.php
index a53f12045bf..a1b745d5849 100644
--- a/module/VuFind/src/VuFind/RecordDriver/PluginFactory.php
+++ b/module/VuFind/src/VuFind/RecordDriver/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordDriver;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/PluginManager.php b/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
index 5dc071a5496..6a2bbd2462b 100644
--- a/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
+++ b/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordDriver;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrAuth.php b/module/VuFind/src/VuFind/RecordDriver/SolrAuth.php
index da979b6a631..1c406340838 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrAuth.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrAuth.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordDriver;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class SolrAuth extends SolrMarc
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php b/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php
index d06fb32fe55..ef6a71f889a 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php
@@ -24,7 +24,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 use VuFind\Code\ISBN, VuFind\Config\Reader as ConfigReader;
@@ -39,7 +39,7 @@ use VuFind\Code\ISBN, VuFind\Config\Reader as ConfigReader;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class SolrDefault extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
index 04558660896..b016935fb0e 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 use VuFind\Config\Reader as ConfigReader,
@@ -40,7 +40,7 @@ use VuFind\Config\Reader as ConfigReader,
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class SolrMarc extends SolrDefault
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrReserves.php b/module/VuFind/src/VuFind/RecordDriver/SolrReserves.php
index 1e58350b140..b0f1ed9302d 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrReserves.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrReserves.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordDriver;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class SolrReserves extends SolrDefault
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrVudl.php b/module/VuFind/src/VuFind/RecordDriver/SolrVudl.php
index eb65949cf46..b8eb201a121 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrVudl.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrVudl.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordDriver;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class SolrVudl extends SolrDefault
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/Summon.php b/module/VuFind/src/VuFind/RecordDriver/Summon.php
index 9e294449021..fdb7ecd5874 100644
--- a/module/VuFind/src/VuFind/RecordDriver/Summon.php
+++ b/module/VuFind/src/VuFind/RecordDriver/Summon.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 use VuFind\Config\Reader as ConfigReader, VuFind\Date\Converter as DateConverter;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Date\Converter as DateConverter
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class Summon extends SolrDefault
 {
diff --git a/module/VuFind/src/VuFind/RecordDriver/WorldCat.php b/module/VuFind/src/VuFind/RecordDriver/WorldCat.php
index f4ffe1ce46b..87aca4d0959 100644
--- a/module/VuFind/src/VuFind/RecordDriver/WorldCat.php
+++ b/module/VuFind/src/VuFind/RecordDriver/WorldCat.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace VuFind\RecordDriver;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordDriver;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 class WorldCat extends SolrMarc
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/AbstractBase.php b/module/VuFind/src/VuFind/RecordTab/AbstractBase.php
index db509b6a067..6e38dfa9f6e 100644
--- a/module/VuFind/src/VuFind/RecordTab/AbstractBase.php
+++ b/module/VuFind/src/VuFind/RecordTab/AbstractBase.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 abstract class AbstractBase implements TabInterface
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/CollectionHierarchyTree.php b/module/VuFind/src/VuFind/RecordTab/CollectionHierarchyTree.php
index f0f275ae37f..6ce6fdb5c80 100644
--- a/module/VuFind/src/VuFind/RecordTab/CollectionHierarchyTree.php
+++ b/module/VuFind/src/VuFind/RecordTab/CollectionHierarchyTree.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class CollectionHierarchyTree extends HierarchyTree
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/CollectionList.php b/module/VuFind/src/VuFind/RecordTab/CollectionList.php
index 41076b4a21a..50170e0b53c 100644
--- a/module/VuFind/src/VuFind/RecordTab/CollectionList.php
+++ b/module/VuFind/src/VuFind/RecordTab/CollectionList.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class CollectionList extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/Description.php b/module/VuFind/src/VuFind/RecordTab/Description.php
index d5cfe8a7060..da87d0ebd19 100644
--- a/module/VuFind/src/VuFind/RecordTab/Description.php
+++ b/module/VuFind/src/VuFind/RecordTab/Description.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class Description extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/Excerpt.php b/module/VuFind/src/VuFind/RecordTab/Excerpt.php
index 0c166d7c6f5..9532efdcd55 100644
--- a/module/VuFind/src/VuFind/RecordTab/Excerpt.php
+++ b/module/VuFind/src/VuFind/RecordTab/Excerpt.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 use VuFind\Config\Reader as ConfigReader;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class Excerpt extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/HierarchyTree.php b/module/VuFind/src/VuFind/RecordTab/HierarchyTree.php
index 93cb4db462b..ec17018ba3d 100644
--- a/module/VuFind/src/VuFind/RecordTab/HierarchyTree.php
+++ b/module/VuFind/src/VuFind/RecordTab/HierarchyTree.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 use VuFind\Config\Reader as ConfigReader;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class HierarchyTree extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/HoldingsILS.php b/module/VuFind/src/VuFind/RecordTab/HoldingsILS.php
index 2c4d17f8c67..cc089fe8b6a 100644
--- a/module/VuFind/src/VuFind/RecordTab/HoldingsILS.php
+++ b/module/VuFind/src/VuFind/RecordTab/HoldingsILS.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class HoldingsILS extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/HoldingsWorldCat.php b/module/VuFind/src/VuFind/RecordTab/HoldingsWorldCat.php
index a3777d1931d..1242c6b37d2 100644
--- a/module/VuFind/src/VuFind/RecordTab/HoldingsWorldCat.php
+++ b/module/VuFind/src/VuFind/RecordTab/HoldingsWorldCat.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class HoldingsWorldCat extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/Map.php b/module/VuFind/src/VuFind/RecordTab/Map.php
index 99f07849a8d..b3a72940252 100644
--- a/module/VuFind/src/VuFind/RecordTab/Map.php
+++ b/module/VuFind/src/VuFind/RecordTab/Map.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 use VuFind\Config\Reader as ConfigReader;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class Map extends AbstractBase
     implements \VuFind\I18n\Translator\TranslatorAwareInterface
diff --git a/module/VuFind/src/VuFind/RecordTab/PluginFactory.php b/module/VuFind/src/VuFind/RecordTab/PluginFactory.php
index 9b8b86a2320..1210cc33009 100644
--- a/module/VuFind/src/VuFind/RecordTab/PluginFactory.php
+++ b/module/VuFind/src/VuFind/RecordTab/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/PluginManager.php b/module/VuFind/src/VuFind/RecordTab/PluginManager.php
index cfaf2925679..c5ff9869a39 100644
--- a/module/VuFind/src/VuFind/RecordTab/PluginManager.php
+++ b/module/VuFind/src/VuFind/RecordTab/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/Reviews.php b/module/VuFind/src/VuFind/RecordTab/Reviews.php
index e0b7d61d4ce..3b00d37c3d3 100644
--- a/module/VuFind/src/VuFind/RecordTab/Reviews.php
+++ b/module/VuFind/src/VuFind/RecordTab/Reviews.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 use VuFind\Config\Reader as ConfigReader;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class Reviews extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/StaffViewArray.php b/module/VuFind/src/VuFind/RecordTab/StaffViewArray.php
index cf67d370a55..cf58f712718 100644
--- a/module/VuFind/src/VuFind/RecordTab/StaffViewArray.php
+++ b/module/VuFind/src/VuFind/RecordTab/StaffViewArray.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class StaffViewArray extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/StaffViewMARC.php b/module/VuFind/src/VuFind/RecordTab/StaffViewMARC.php
index 42852e58500..575980955b5 100644
--- a/module/VuFind/src/VuFind/RecordTab/StaffViewMARC.php
+++ b/module/VuFind/src/VuFind/RecordTab/StaffViewMARC.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class StaffViewMARC extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/TOC.php b/module/VuFind/src/VuFind/RecordTab/TOC.php
index cac1b033280..84ab8667334 100644
--- a/module/VuFind/src/VuFind/RecordTab/TOC.php
+++ b/module/VuFind/src/VuFind/RecordTab/TOC.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class TOC extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/TabInterface.php b/module/VuFind/src/VuFind/RecordTab/TabInterface.php
index 5813d335b7e..786875e95d9 100644
--- a/module/VuFind/src/VuFind/RecordTab/TabInterface.php
+++ b/module/VuFind/src/VuFind/RecordTab/TabInterface.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 interface TabInterface
 {
diff --git a/module/VuFind/src/VuFind/RecordTab/UserComments.php b/module/VuFind/src/VuFind/RecordTab/UserComments.php
index 33580341a4a..77db6c86bec 100644
--- a/module/VuFind/src/VuFind/RecordTab/UserComments.php
+++ b/module/VuFind/src/VuFind/RecordTab/UserComments.php
@@ -23,7 +23,7 @@
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
 
@@ -34,7 +34,7 @@ namespace VuFind\RecordTab;
  * @package  RecordTabs
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 class UserComments extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Related/AbstractServiceLocator.php b/module/VuFind/src/VuFind/Related/AbstractServiceLocator.php
index 7a24e760158..83cc546c988 100644
--- a/module/VuFind/src/VuFind/Related/AbstractServiceLocator.php
+++ b/module/VuFind/src/VuFind/Related/AbstractServiceLocator.php
@@ -23,7 +23,7 @@
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 namespace VuFind\Related;
 use Zend\ServiceManager\ServiceLocatorInterface,
@@ -36,7 +36,7 @@ use Zend\ServiceManager\ServiceLocatorInterface,
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 abstract class AbstractServiceLocator implements RelatedInterface,
     ServiceLocatorAwareInterface
diff --git a/module/VuFind/src/VuFind/Related/Editions.php b/module/VuFind/src/VuFind/Related/Editions.php
index a1eed7414ff..7b4440fd575 100644
--- a/module/VuFind/src/VuFind/Related/Editions.php
+++ b/module/VuFind/src/VuFind/Related/Editions.php
@@ -23,7 +23,7 @@
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 namespace VuFind\Related;
 
@@ -34,7 +34,7 @@ namespace VuFind\Related;
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 class Editions extends AbstractServiceLocator
 {
diff --git a/module/VuFind/src/VuFind/Related/PluginFactory.php b/module/VuFind/src/VuFind/Related/PluginFactory.php
index 59ae94f3441..cde48e9a266 100644
--- a/module/VuFind/src/VuFind/Related/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Related/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 namespace VuFind\Related;
 
@@ -34,7 +34,7 @@ namespace VuFind\Related;
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/Related/PluginManager.php b/module/VuFind/src/VuFind/Related/PluginManager.php
index 74760bfb158..2698edf1f4b 100644
--- a/module/VuFind/src/VuFind/Related/PluginManager.php
+++ b/module/VuFind/src/VuFind/Related/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 namespace VuFind\Related;
 
@@ -34,7 +34,7 @@ namespace VuFind\Related;
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/Related/RelatedInterface.php b/module/VuFind/src/VuFind/Related/RelatedInterface.php
index fbea92e06dc..0b222471210 100644
--- a/module/VuFind/src/VuFind/Related/RelatedInterface.php
+++ b/module/VuFind/src/VuFind/Related/RelatedInterface.php
@@ -23,7 +23,7 @@
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 namespace VuFind\Related;
 
@@ -44,7 +44,7 @@ namespace VuFind\Related;
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 interface RelatedInterface
 {
diff --git a/module/VuFind/src/VuFind/Related/Similar.php b/module/VuFind/src/VuFind/Related/Similar.php
index f0d7d10cb27..3435770c1cd 100644
--- a/module/VuFind/src/VuFind/Related/Similar.php
+++ b/module/VuFind/src/VuFind/Related/Similar.php
@@ -23,7 +23,7 @@
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 namespace VuFind\Related;
 
@@ -34,7 +34,7 @@ namespace VuFind\Related;
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 class Similar extends AbstractServiceLocator
 {
diff --git a/module/VuFind/src/VuFind/Related/WorldCatEditions.php b/module/VuFind/src/VuFind/Related/WorldCatEditions.php
index 7c6a243f24e..ef5bb0f98c8 100644
--- a/module/VuFind/src/VuFind/Related/WorldCatEditions.php
+++ b/module/VuFind/src/VuFind/Related/WorldCatEditions.php
@@ -23,7 +23,7 @@
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 namespace VuFind\Related;
 
@@ -34,7 +34,7 @@ namespace VuFind\Related;
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 class WorldCatEditions extends Editions
 {
diff --git a/module/VuFind/src/VuFind/Related/WorldCatSimilar.php b/module/VuFind/src/VuFind/Related/WorldCatSimilar.php
index c2eb1b1aa6c..8c34cdc7892 100644
--- a/module/VuFind/src/VuFind/Related/WorldCatSimilar.php
+++ b/module/VuFind/src/VuFind/Related/WorldCatSimilar.php
@@ -23,7 +23,7 @@
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 namespace VuFind\Related;
 
@@ -34,7 +34,7 @@ namespace VuFind\Related;
  * @package  Related_Records
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
  */
 class WorldCatSimilar extends Similar
 {
diff --git a/module/VuFind/src/VuFind/Reserves/CsvReader.php b/module/VuFind/src/VuFind/Reserves/CsvReader.php
index fe4205310ad..f5b3cce6b49 100644
--- a/module/VuFind/src/VuFind/Reserves/CsvReader.php
+++ b/module/VuFind/src/VuFind/Reserves/CsvReader.php
@@ -23,7 +23,7 @@
  * @package  Reserves
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki Wiki
  */
 namespace VuFind\Reserves;
 
diff --git a/module/VuFind/src/VuFind/Resolver/Connection.php b/module/VuFind/src/VuFind/Resolver/Connection.php
index 6f6e764a075..ee22d7bb3c8 100644
--- a/module/VuFind/src/VuFind/Resolver/Connection.php
+++ b/module/VuFind/src/VuFind/Resolver/Connection.php
@@ -26,7 +26,7 @@
  * @package  Resolver_Drivers
  * @author   Graham Seaman <Graham.Seaman@rhul.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 namespace VuFind\Resolver;
 use VuFind\Config\Reader as ConfigReader;
@@ -44,7 +44,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  Resolver_Drivers
  * @author   Graham Seaman <Graham.Seaman@rhul.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 class Connection
 {
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/DriverInterface.php b/module/VuFind/src/VuFind/Resolver/Driver/DriverInterface.php
index 2fbef98f960..580f34f2e8a 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/DriverInterface.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/DriverInterface.php
@@ -26,7 +26,7 @@
  * @package  Resolver_Drivers
  * @author   Graham Seaman <Graham.Seaman@rhul.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 namespace VuFind\Resolver\Driver;
 
@@ -40,7 +40,7 @@ namespace VuFind\Resolver\Driver;
  * @package  Resolver_Drivers
  * @author   Graham Seaman <Graham.Seaman@rhul.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 interface DriverInterface
 {
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/Ezb.php b/module/VuFind/src/VuFind/Resolver/Driver/Ezb.php
index 702e9ecea1e..5c4a7516eb8 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/Ezb.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/Ezb.php
@@ -28,7 +28,7 @@
  * @package  Resolver_Drivers
  * @author   Markus Fischer <info@flyingfischer.ch>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 namespace VuFind\Resolver\Driver;
 use DOMDocument, DOMXpath, VuFind\Config\Reader as ConfigReader;
@@ -40,7 +40,7 @@ use DOMDocument, DOMXpath, VuFind\Config\Reader as ConfigReader;
  * @package  Resolver_Drivers
  * @author   Markus Fischer <info@flyingfischer.ch>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 class Ezb implements DriverInterface
 {
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/PluginFactory.php b/module/VuFind/src/VuFind/Resolver/Driver/PluginFactory.php
index 1a7262d028f..09065a34ede 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  Resolver_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 namespace VuFind\Resolver\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\Resolver\Driver;
  * @package  Resolver_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/PluginManager.php b/module/VuFind/src/VuFind/Resolver/Driver/PluginManager.php
index 2da97e8eb8e..0a7ec5953b5 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/PluginManager.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  Resolver_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 namespace VuFind\Resolver\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\Resolver\Driver;
  * @package  Resolver_Drivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/Sfx.php b/module/VuFind/src/VuFind/Resolver/Driver/Sfx.php
index 0ca9c00699a..62f4469deb4 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/Sfx.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/Sfx.php
@@ -26,7 +26,7 @@
  * @package  Resolver_Drivers
  * @author   Graham Seaman <Graham.Seaman@rhul.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 namespace VuFind\Resolver\Driver;
 use VuFind\Config\Reader as ConfigReader;
@@ -38,7 +38,7 @@ use VuFind\Config\Reader as ConfigReader;
  * @package  Resolver_Drivers
  * @author   Graham Seaman <Graham.Seaman@rhul.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 class Sfx implements DriverInterface
 {
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/Threesixtylink.php b/module/VuFind/src/VuFind/Resolver/Driver/Threesixtylink.php
index 33e9bef1a5a..7395682dc39 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/Threesixtylink.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/Threesixtylink.php
@@ -25,7 +25,7 @@
  * @package  Resolver_Drivers
  * @author   Graham Seaman <Graham.Seaman@rhul.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 namespace VuFind\Resolver\Driver;
 use DOMDocument, DOMXpath, VuFind\Config\Reader as ConfigReader;
@@ -37,7 +37,7 @@ use DOMDocument, DOMXpath, VuFind\Config\Reader as ConfigReader;
  * @package  Resolver_Drivers
  * @author   Graham Seaman <Graham.Seaman@rhul.ac.uk>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_link_resolver_driver Wiki
+ * @link     http://vufind.org/wiki/vufind2:link_resolver_drivers Wiki
  */
 class Threesixtylink implements DriverInterface
 {
diff --git a/module/VuFind/src/VuFind/SMS/AbstractBase.php b/module/VuFind/src/VuFind/SMS/AbstractBase.php
index 984f9d6edfd..373b74949a6 100644
--- a/module/VuFind/src/VuFind/SMS/AbstractBase.php
+++ b/module/VuFind/src/VuFind/SMS/AbstractBase.php
@@ -23,7 +23,7 @@
  * @package  SMS
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\SMS;
 
@@ -34,7 +34,7 @@ namespace VuFind\SMS;
  * @package  SMS
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 abstract class AbstractBase implements SMSInterface
 {
diff --git a/module/VuFind/src/VuFind/SMS/Clickatell.php b/module/VuFind/src/VuFind/SMS/Clickatell.php
index 7cc0db4852a..875435e68f7 100644
--- a/module/VuFind/src/VuFind/SMS/Clickatell.php
+++ b/module/VuFind/src/VuFind/SMS/Clickatell.php
@@ -23,7 +23,7 @@
  * @package  SMS
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\SMS;
 use VuFind\Exception\Mail as MailException;
@@ -35,7 +35,7 @@ use VuFind\Exception\Mail as MailException;
  * @package  SMS
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Clickatell extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/SMS/Factory.php b/module/VuFind/src/VuFind/SMS/Factory.php
index fb78b65dd74..7fbbaf06033 100644
--- a/module/VuFind/src/VuFind/SMS/Factory.php
+++ b/module/VuFind/src/VuFind/SMS/Factory.php
@@ -23,7 +23,7 @@
  * @package  SMS
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\SMS;
 use VuFind\Config\Reader as ConfigReader,
@@ -36,7 +36,7 @@ use VuFind\Config\Reader as ConfigReader,
  * @package  SMS
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Factory implements \Zend\ServiceManager\FactoryInterface
 {
diff --git a/module/VuFind/src/VuFind/SMS/Mailer.php b/module/VuFind/src/VuFind/SMS/Mailer.php
index 5cff33f43a2..22222a978be 100644
--- a/module/VuFind/src/VuFind/SMS/Mailer.php
+++ b/module/VuFind/src/VuFind/SMS/Mailer.php
@@ -23,7 +23,7 @@
  * @package  SMS
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\SMS;
 
@@ -34,7 +34,7 @@ namespace VuFind\SMS;
  * @package  SMS
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Mailer extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/SMS/SMSInterface.php b/module/VuFind/src/VuFind/SMS/SMSInterface.php
index c15910d3391..b0cfe1795ef 100644
--- a/module/VuFind/src/VuFind/SMS/SMSInterface.php
+++ b/module/VuFind/src/VuFind/SMS/SMSInterface.php
@@ -23,7 +23,7 @@
  * @package  SMS
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\SMS;
 
@@ -34,7 +34,7 @@ namespace VuFind\SMS;
  * @package  SMS
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 interface SMSInterface
 {
diff --git a/module/VuFind/src/VuFind/Search/Minified.php b/module/VuFind/src/VuFind/Search/Minified.php
index f8e972f5219..72332ca6e82 100644
--- a/module/VuFind/src/VuFind/Search/Minified.php
+++ b/module/VuFind/src/VuFind/Search/Minified.php
@@ -23,7 +23,7 @@
  * @package  Search
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Search;
 
@@ -48,7 +48,7 @@ namespace VuFind\Search;
  * @package  Search
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_search_object Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Minified
 {
diff --git a/module/VuFind/src/VuFind/Search/minSO.php b/module/VuFind/src/VuFind/Search/minSO.php
index 9be5dbae043..1dfe02dfdd2 100644
--- a/module/VuFind/src/VuFind/Search/minSO.php
+++ b/module/VuFind/src/VuFind/Search/minSO.php
@@ -23,7 +23,7 @@
  * @package  Search
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 
 /**
diff --git a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginFactory.php b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginFactory.php
index e4363d359f3..838e0694f8a 100644
--- a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginFactory.php
+++ b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginFactory.php
@@ -23,7 +23,7 @@
  * @package  ServiceManager
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\ServiceManager;
 use Zend\ServiceManager\AbstractFactoryInterface,
@@ -36,7 +36,7 @@ use Zend\ServiceManager\AbstractFactoryInterface,
  * @package  ServiceManager
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_search_object Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 abstract class AbstractPluginFactory implements AbstractFactoryInterface
 {
diff --git a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
index 8ab59c121b3..0fece6d1e53 100644
--- a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
+++ b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
@@ -23,7 +23,7 @@
  * @package  ServiceManager
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\ServiceManager;
 use Zend\ServiceManager\AbstractPluginManager as Base,
@@ -36,7 +36,7 @@ use Zend\ServiceManager\AbstractPluginManager as Base,
  * @package  ServiceManager
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_search_object Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 abstract class AbstractPluginManager extends Base
 {
diff --git a/module/VuFind/src/VuFind/ServiceManager/Initializer.php b/module/VuFind/src/VuFind/ServiceManager/Initializer.php
index 5d93a939a25..62870e2ef73 100644
--- a/module/VuFind/src/VuFind/ServiceManager/Initializer.php
+++ b/module/VuFind/src/VuFind/ServiceManager/Initializer.php
@@ -23,7 +23,7 @@
  * @package  ServiceManager
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\ServiceManager;
 use Zend\ServiceManager\ServiceManager;
@@ -35,7 +35,7 @@ use Zend\ServiceManager\ServiceManager;
  * @package  ServiceManager
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_search_object Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Initializer
 {
diff --git a/module/VuFind/src/VuFind/Session/AbstractBase.php b/module/VuFind/src/VuFind/Session/AbstractBase.php
index 7c9dbf2d470..1936ea0452d 100644
--- a/module/VuFind/src/VuFind/Session/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Session/AbstractBase.php
@@ -23,7 +23,7 @@
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 namespace VuFind\Session;
 use Zend\ServiceManager\ServiceLocatorAwareInterface,
@@ -37,7 +37,7 @@ use Zend\ServiceManager\ServiceLocatorAwareInterface,
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 abstract class AbstractBase implements SaveHandlerInterface,
     \VuFind\Db\Table\DbTableAwareInterface
diff --git a/module/VuFind/src/VuFind/Session/Database.php b/module/VuFind/src/VuFind/Session/Database.php
index 987c3e66a4b..a7321047ba1 100644
--- a/module/VuFind/src/VuFind/Session/Database.php
+++ b/module/VuFind/src/VuFind/Session/Database.php
@@ -23,7 +23,7 @@
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 namespace VuFind\Session;
 use VuFind\Exception\SessionExpired as SessionExpiredException;
@@ -35,7 +35,7 @@ use VuFind\Exception\SessionExpired as SessionExpiredException;
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 class Database extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Session/File.php b/module/VuFind/src/VuFind/Session/File.php
index 2ddb7a3b1cb..f8eb60cf64c 100644
--- a/module/VuFind/src/VuFind/Session/File.php
+++ b/module/VuFind/src/VuFind/Session/File.php
@@ -23,7 +23,7 @@
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 namespace VuFind\Session;
 
@@ -34,7 +34,7 @@ namespace VuFind\Session;
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 class File extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Session/Memcache.php b/module/VuFind/src/VuFind/Session/Memcache.php
index 977f25b59a2..d87212ed627 100644
--- a/module/VuFind/src/VuFind/Session/Memcache.php
+++ b/module/VuFind/src/VuFind/Session/Memcache.php
@@ -26,7 +26,7 @@
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 namespace VuFind\Session;
 
@@ -37,7 +37,7 @@ namespace VuFind\Session;
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 class Memcache extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Session/PluginFactory.php b/module/VuFind/src/VuFind/Session/PluginFactory.php
index 8ac38a7dff5..a69a3cadfce 100644
--- a/module/VuFind/src/VuFind/Session/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Session/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 namespace VuFind\Session;
 
@@ -34,7 +34,7 @@ namespace VuFind\Session;
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/Session/PluginManager.php b/module/VuFind/src/VuFind/Session/PluginManager.php
index aafdbe5ba6c..2d8b048249c 100644
--- a/module/VuFind/src/VuFind/Session/PluginManager.php
+++ b/module/VuFind/src/VuFind/Session/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 namespace VuFind\Session;
 
@@ -34,7 +34,7 @@ namespace VuFind\Session;
  * @package  Session_Handlers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:session_handlers Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/SimpleXML.php b/module/VuFind/src/VuFind/SimpleXML.php
index a3a8f6b8501..25271beee24 100644
--- a/module/VuFind/src/VuFind/SimpleXML.php
+++ b/module/VuFind/src/VuFind/SimpleXML.php
@@ -23,7 +23,7 @@
  * @package  SimpleXML
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind;
 
@@ -34,7 +34,7 @@ namespace VuFind;
  * @package  SimpleXML
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SimpleXML
 {
diff --git a/module/VuFind/src/VuFind/Solr/Utils.php b/module/VuFind/src/VuFind/Solr/Utils.php
index 09410e304e7..275dbe7c687 100644
--- a/module/VuFind/src/VuFind/Solr/Utils.php
+++ b/module/VuFind/src/VuFind/Solr/Utils.php
@@ -23,7 +23,7 @@
  * @package  Solr
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Solr;
 
@@ -38,7 +38,7 @@ namespace VuFind\Solr;
  * @package  Solr
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Utils
 {
diff --git a/module/VuFind/src/VuFind/Statistics/Driver/PluginFactory.php b/module/VuFind/src/VuFind/Statistics/Driver/PluginFactory.php
index db1a36e2cae..6abe37b2ea1 100644
--- a/module/VuFind/src/VuFind/Statistics/Driver/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Statistics/Driver/PluginFactory.php
@@ -23,7 +23,7 @@
  * @package  Statistics
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:statistics_drivers Wiki
  */
 namespace VuFind\Statistics\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\Statistics\Driver;
  * @package  Statistics
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:statistics_drivers Wiki
  */
 class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
 {
diff --git a/module/VuFind/src/VuFind/Statistics/Driver/PluginManager.php b/module/VuFind/src/VuFind/Statistics/Driver/PluginManager.php
index 853b3ddec04..1cb9f6ff83d 100644
--- a/module/VuFind/src/VuFind/Statistics/Driver/PluginManager.php
+++ b/module/VuFind/src/VuFind/Statistics/Driver/PluginManager.php
@@ -23,7 +23,7 @@
  * @package  Statistics
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:statistics_drivers Wiki
  */
 namespace VuFind\Statistics\Driver;
 
@@ -34,7 +34,7 @@ namespace VuFind\Statistics\Driver;
  * @package  Statistics
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/creating_a_session_handler Wiki
+ * @link     http://vufind.org/wiki/vufind2:statistics_drivers Wiki
  */
 class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
 {
diff --git a/module/VuFind/src/VuFind/Statistics/Record.php b/module/VuFind/src/VuFind/Statistics/Record.php
index 72674be4433..cd82b6173f8 100644
--- a/module/VuFind/src/VuFind/Statistics/Record.php
+++ b/module/VuFind/src/VuFind/Statistics/Record.php
@@ -23,7 +23,7 @@
  * @package  Statistics
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Statistics;
 
@@ -34,7 +34,7 @@ namespace VuFind\Statistics;
  * @package  Statistics
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Record extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Statistics/Search.php b/module/VuFind/src/VuFind/Statistics/Search.php
index 596ef67ff99..cb42bcfab5b 100644
--- a/module/VuFind/src/VuFind/Statistics/Search.php
+++ b/module/VuFind/src/VuFind/Statistics/Search.php
@@ -23,7 +23,7 @@
  * @package  Statistics
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\Statistics;
 
@@ -34,7 +34,7 @@ namespace VuFind\Statistics;
  * @package  Statistics
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Search extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Blueprint/LayoutClass.php b/module/VuFind/src/VuFind/View/Helper/Blueprint/LayoutClass.php
index 4fbabf43622..b4bd04c7e88 100644
--- a/module/VuFind/src/VuFind/View/Helper/Blueprint/LayoutClass.php
+++ b/module/VuFind/src/VuFind/View/Helper/Blueprint/LayoutClass.php
@@ -24,7 +24,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Blueprint;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class LayoutClass extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Blueprint/Search.php b/module/VuFind/src/VuFind/View/Helper/Blueprint/Search.php
index 80186d4bcd5..bccf117fd4d 100644
--- a/module/VuFind/src/VuFind/View/Helper/Blueprint/Search.php
+++ b/module/VuFind/src/VuFind/View/Helper/Blueprint/Search.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Blueprint;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/system_classes Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Search extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/AbstractSyndetics.php b/module/VuFind/src/VuFind/View/Helper/Root/AbstractSyndetics.php
index 21a0c6071c3..093ef97468e 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/AbstractSyndetics.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/AbstractSyndetics.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 abstract class AbstractSyndetics extends AbstractHelper
     implements \VuFindHttp\HttpServiceAwareInterface
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Auth.php b/module/VuFind/src/VuFind/View/Helper/Root/Auth.php
index 85d569007bc..ff3e397aa14 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Auth.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Auth.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Exception\RuntimeException;
@@ -35,7 +35,7 @@ use Zend\View\Exception\RuntimeException;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Auth extends \Zend\View\Helper\AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/AuthorNotes.php b/module/VuFind/src/VuFind/View/Helper/Root/AuthorNotes.php
index dc3025011d2..3d35e0bca47 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/AuthorNotes.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/AuthorNotes.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use DOMDocument;
@@ -35,7 +35,7 @@ use DOMDocument;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class AuthorNotes extends AbstractSyndetics
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Browse.php b/module/VuFind/src/VuFind/View/Helper/Root/Browse.php
index 8e0f2c7edff..185077c1e41 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Browse.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Browse.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Browse extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Cart.php b/module/VuFind/src/VuFind/View/Helper/Root/Cart.php
index 6aca9f50935..78325ff5211 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Cart.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Cart.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 
@@ -34,7 +34,7 @@ namespace VuFind\View\Helper\Root;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Cart extends \Zend\View\Helper\AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Citation.php b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
index 02743c432fe..9571421ce52 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use VuFind\Date\Converter as DateConverter, VuFind\Exception\Date as DateException,
@@ -36,7 +36,7 @@ use VuFind\Date\Converter as DateConverter, VuFind\Exception\Date as DateExcepti
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Citation extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Context.php b/module/VuFind/src/VuFind/View/Helper/Root/Context.php
index 87a7aac802c..a166189040f 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Context.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Context.php
@@ -25,7 +25,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper, Zend\View\Renderer\RendererInterface;
@@ -39,7 +39,7 @@ use Zend\View\Helper\AbstractHelper, Zend\View\Renderer\RendererInterface;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Context extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/CurrentPath.php b/module/VuFind/src/VuFind/View/Helper/Root/CurrentPath.php
index 6d069857650..0783800ecd2 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/CurrentPath.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/CurrentPath.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class CurrentPath extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/DateTime.php b/module/VuFind/src/VuFind/View/Helper/Root/DateTime.php
index 5fe04d40e01..a27e93ec9fb 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/DateTime.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/DateTime.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use VuFind\Date\Converter as DateConverter, Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use VuFind\Date\Converter as DateConverter, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class DateTime extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/DisplayLanguageOption.php b/module/VuFind/src/VuFind/View/Helper/Root/DisplayLanguageOption.php
index 6d6278296bf..5bfa333c695 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/DisplayLanguageOption.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/DisplayLanguageOption.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 
@@ -34,7 +34,7 @@ namespace VuFind\View\Helper\Root;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class DisplayLanguageOption extends \Zend\View\Helper\AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Excerpt.php b/module/VuFind/src/VuFind/View/Helper/Root/Excerpt.php
index 5ab58621480..412e4bfe6ea 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Excerpt.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Excerpt.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use DOMDocument;
@@ -35,7 +35,7 @@ use DOMDocument;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Excerpt extends AbstractSyndetics
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Flashmessages.php b/module/VuFind/src/VuFind/View/Helper/Root/Flashmessages.php
index e3a9c1751a0..75e7f5fab9e 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Flashmessages.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Flashmessages.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Flashmessages extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/GetLastSearchLink.php b/module/VuFind/src/VuFind/View/Helper/Root/GetLastSearchLink.php
index 9a78eb8425c..9295b6e2414 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/GetLastSearchLink.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/GetLastSearchLink.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use VuFind\Search\Memory, Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use VuFind\Search\Memory, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class GetLastSearchLink extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Highlight.php b/module/VuFind/src/VuFind/View/Helper/Root/Highlight.php
index e1993afba23..e77f88d233f 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Highlight.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Highlight.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Highlight extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Ils.php b/module/VuFind/src/VuFind/View/Helper/Root/Ils.php
index 7b917830445..76fe14eecca 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Ils.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Ils.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 
@@ -34,7 +34,7 @@ namespace VuFind\View\Helper\Root;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Ils extends \Zend\View\Helper\AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/OpenUrl.php b/module/VuFind/src/VuFind/View/Helper/Root/OpenUrl.php
index b9c80ed0042..1e6a3d7b98a 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/OpenUrl.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/OpenUrl.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class OpenUrl extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Printms.php b/module/VuFind/src/VuFind/View/Helper/Root/Printms.php
index 820b40ddb3b..073d5e3b141 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Printms.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Printms.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Printms extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/ProxyUrl.php b/module/VuFind/src/VuFind/View/Helper/Root/ProxyUrl.php
index 48b87629fb5..a5512e38cad 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/ProxyUrl.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/ProxyUrl.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class ProxyUrl extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Recommend.php b/module/VuFind/src/VuFind/View/Helper/Root/Recommend.php
index 3242aad1031..eec701c558b 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Recommend.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Recommend.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Exception\RuntimeException, Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Exception\RuntimeException, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Recommend extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Record.php b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
index 0efe8fc5b58..2d1f2d4cba4 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Record.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Exception\RuntimeException,
@@ -36,7 +36,7 @@ use VuFind\Config\Reader as ConfigReader, Zend\View\Exception\RuntimeException,
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Record extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/RecordLink.php b/module/VuFind/src/VuFind/View/Helper/Root/RecordLink.php
index 58870015397..c01d06c0ac1 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/RecordLink.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/RecordLink.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 
@@ -34,7 +34,7 @@ namespace VuFind\View\Helper\Root;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class RecordLink extends \Zend\View\Helper\AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Related.php b/module/VuFind/src/VuFind/View/Helper/Root/Related.php
index 2bd301ec893..e18e843decb 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Related.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Related.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Exception\RuntimeException, Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Exception\RuntimeException, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Related extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/RenderArray.php b/module/VuFind/src/VuFind/View/Helper/Root/RenderArray.php
index b159ce7ccef..dac03ea5c88 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/RenderArray.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/RenderArray.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class RenderArray extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php b/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
index 7fd09c7fc69..f12a9e50438 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use DateTime, Zend\Feed\Writer\Writer as FeedWriter, Zend\Feed\Writer\Feed,
@@ -36,7 +36,7 @@ use DateTime, Zend\Feed\Writer\Writer as FeedWriter, Zend\Feed\Writer\Feed,
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class ResultFeed extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Reviews.php b/module/VuFind/src/VuFind/View/Helper/Root/Reviews.php
index 426b0281ebf..5d36d67217b 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Reviews.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Reviews.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use DOMDocument, ZendService\Amazon\Amazon;
@@ -35,7 +35,7 @@ use DOMDocument, ZendService\Amazon\Amazon;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Reviews extends AbstractSyndetics
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php b/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
index dc4f19c0461..109da995ae8 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SafeMoneyFormat extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/SearchOptions.php b/module/VuFind/src/VuFind/View/Helper/Root/SearchOptions.php
index a10692c6b8f..5111cdd49fa 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/SearchOptions.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SearchOptions.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 
@@ -34,7 +34,7 @@ namespace VuFind\View\Helper\Root;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SearchOptions extends \Zend\View\Helper\AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/SortFacetList.php b/module/VuFind/src/VuFind/View/Helper/Root/SortFacetList.php
index 892c6d2991a..fecd530aee0 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/SortFacetList.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SortFacetList.php
@@ -24,7 +24,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -36,7 +36,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SortFacetList extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/SystemEmail.php b/module/VuFind/src/VuFind/View/Helper/Root/SystemEmail.php
index 69acab38a3f..9c9082a10d7 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/SystemEmail.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SystemEmail.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class SystemEmail extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/TransEsc.php b/module/VuFind/src/VuFind/View/Helper/Root/TransEsc.php
index 86f14de189c..bee5e9ac479 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/TransEsc.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/TransEsc.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class TransEsc extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Translate.php b/module/VuFind/src/VuFind/View/Helper/Root/Translate.php
index ba1758411df..fc67e39da7d 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Translate.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Translate.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\I18n\Exception\RuntimeException,
@@ -36,7 +36,7 @@ use Zend\I18n\Exception\RuntimeException,
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Translate extends AbstractTranslatorHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Truncate.php b/module/VuFind/src/VuFind/View/Helper/Root/Truncate.php
index 6faada51fdb..db205fcff0e 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Truncate.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Truncate.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class Truncate extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/UserList.php b/module/VuFind/src/VuFind/View/Helper/Root/UserList.php
index 63c976c7604..1ffaa419b20 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/UserList.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/UserList.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use VuFind\Db\Row\UserList as UserListRow, Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use VuFind\Db\Row\UserList as UserListRow, Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class UserList extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/VideoClips.php b/module/VuFind/src/VuFind/View/Helper/Root/VideoClips.php
index 3abb9706d75..2ab67a091a3 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/VideoClips.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/VideoClips.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\Root;
 use DOMDocument;
@@ -35,7 +35,7 @@ use DOMDocument;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class VideoClips extends AbstractSyndetics
 {
diff --git a/module/VuFind/src/VuFind/View/Helper/jQueryMobile/MobileMenu.php b/module/VuFind/src/VuFind/View/Helper/jQueryMobile/MobileMenu.php
index e44f9f24391..943809c84f1 100644
--- a/module/VuFind/src/VuFind/View/Helper/jQueryMobile/MobileMenu.php
+++ b/module/VuFind/src/VuFind/View/Helper/jQueryMobile/MobileMenu.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFind\View\Helper\jQueryMobile;
 use Zend\View\Helper\AbstractHelper;
@@ -35,7 +35,7 @@ use Zend\View\Helper\AbstractHelper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class MobileMenu extends AbstractHelper
 {
diff --git a/module/VuFind/src/VuFindTest/RecordDriver/TestHarness.php b/module/VuFind/src/VuFindTest/RecordDriver/TestHarness.php
index aa24f6e0258..c4f655718b0 100644
--- a/module/VuFind/src/VuFindTest/RecordDriver/TestHarness.php
+++ b/module/VuFind/src/VuFindTest/RecordDriver/TestHarness.php
@@ -23,7 +23,7 @@
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\RecordDriver;
 
@@ -34,7 +34,7 @@ namespace VuFindTest\RecordDriver;
  * @package  RecordDrivers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/other_than_marc Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class TestHarness extends \VuFind\RecordDriver\AbstractBase
 {
diff --git a/module/VuFind/src/VuFindTest/Unit/DbTestCase.php b/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
index a05f9f3c5ec..b3a9a35769b 100644
--- a/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
@@ -24,7 +24,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Unit;
 
@@ -35,7 +35,7 @@ namespace VuFindTest\Unit;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 
 abstract class DbTestCase extends TestCase
diff --git a/module/VuFind/src/VuFindTest/Unit/TestCase.php b/module/VuFind/src/VuFindTest/Unit/TestCase.php
index cfd32b8c1c0..c7bc70dd657 100644
--- a/module/VuFind/src/VuFindTest/Unit/TestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/TestCase.php
@@ -24,7 +24,7 @@
  * @package  Tests
  * @author   David Maus <maus@hab.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 
 namespace VuFindTest\Unit;
@@ -36,7 +36,7 @@ namespace VuFindTest\Unit;
  * @package  Tests
  * @author   David Maus <maus@hab.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 
 abstract class TestCase extends \PHPUnit_Framework_TestCase
diff --git a/module/VuFind/src/VuFindTest/Unit/ViewHelperTestCase.php b/module/VuFind/src/VuFindTest/Unit/ViewHelperTestCase.php
index a98a3ee44d3..86ab667f922 100644
--- a/module/VuFind/src/VuFindTest/Unit/ViewHelperTestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/ViewHelperTestCase.php
@@ -24,7 +24,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Unit;
 
@@ -35,7 +35,7 @@ namespace VuFindTest\Unit;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 
 abstract class ViewHelperTestCase extends TestCase
diff --git a/module/VuFind/tests/integration-tests/src/Connection/SolrTest.php b/module/VuFind/tests/integration-tests/src/Connection/SolrTest.php
index a7a609999b1..07bf2d07cd4 100644
--- a/module/VuFind/tests/integration-tests/src/Connection/SolrTest.php
+++ b/module/VuFind/tests/integration-tests/src/Connection/SolrTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFind\IntegrationTest\Connection;
 
@@ -34,7 +34,7 @@ namespace VuFind\IntegrationTest\Connection;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class SolrTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/integration-tests/src/View/Helper/Root/ResultFeedTest.php b/module/VuFind/tests/integration-tests/src/View/Helper/Root/ResultFeedTest.php
index d441e017645..0c4040d0bb5 100644
--- a/module/VuFind/tests/integration-tests/src/View/Helper/Root/ResultFeedTest.php
+++ b/module/VuFind/tests/integration-tests/src/View/Helper/Root/ResultFeedTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFind\IntegrationTest\View\Helper\Root;
 use VuFind\View\Helper\Root\ResultFeed;
@@ -35,7 +35,7 @@ use VuFind\View\Helper\Root\ResultFeed;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class ResultFeedTest extends \VuFindTest\Unit\ViewHelperTestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php b/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
index db0a2e59a30..22d0c3c5679 100644
--- a/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
+++ b/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Code;
 use VuFind\Code\ISBN;
@@ -36,7 +36,7 @@ use VuFind\Code\ISBN;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class ISBNTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Config/Reader/CacheDecoratorTest.php b/module/VuFind/tests/unit-tests/src/Config/Reader/CacheDecoratorTest.php
index 62ed0cddc12..2baa4ee1213 100644
--- a/module/VuFind/tests/unit-tests/src/Config/Reader/CacheDecoratorTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/Reader/CacheDecoratorTest.php
@@ -24,7 +24,7 @@
  * @package  Tests
  * @author   David Maus <maus@hab.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 
 namespace VuFindTest\Config\Reader;
@@ -38,7 +38,7 @@ use VuFind\Config\Reader\CacheDecorator;
  * @package  Tests
  * @author   David Maus <maus@hab.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class CacheDecoratorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
index 6475e3032fe..9e078669e21 100644
--- a/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Config;
 use VuFind\Config\Reader;
@@ -36,7 +36,7 @@ use VuFind\Config\Reader;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class ReaderTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
index 0f8a6f67638..ce280f9f493 100644
--- a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Config;
 use VuFind\Config\SearchSpecsReader;
@@ -36,7 +36,7 @@ use VuFind\Config\SearchSpecsReader;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class SearchSpecsReaderTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Config/UpgradeTest.php b/module/VuFind/tests/unit-tests/src/Config/UpgradeTest.php
index 57a7c56802a..618b14c049c 100644
--- a/module/VuFind/tests/unit-tests/src/Config/UpgradeTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/UpgradeTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Config;
 use VuFind\Config\Upgrade;
@@ -36,7 +36,7 @@ use VuFind\Config\Upgrade;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class UpgradeTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php b/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
index 31e27758060..767b15e9064 100644
--- a/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
+++ b/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Cookie;
 use VuFind\Cookie\Container;
@@ -35,7 +35,7 @@ use VuFind\Cookie\Container;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class ContainerTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php b/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
index e747f84c075..cd82e34810b 100644
--- a/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
+++ b/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFind\Test\Db\Table;
 use VuFind\Db\Table\ChangeTracker;
@@ -35,7 +35,7 @@ use VuFind\Db\Table\ChangeTracker;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class ChangeTrackerTest extends \VuFindTest\Unit\DbTestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Db/Table/UserListTest.php b/module/VuFind/tests/unit-tests/src/Db/Table/UserListTest.php
index 56a68d50a9b..87843638633 100644
--- a/module/VuFind/tests/unit-tests/src/Db/Table/UserListTest.php
+++ b/module/VuFind/tests/unit-tests/src/Db/Table/UserListTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFind\Test\Db\Table;
 use VuFind\Db\Table\UserList;
@@ -35,7 +35,7 @@ use VuFind\Db\Table\UserList;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class UserListTest extends \VuFindTest\Unit\DbTestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php b/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
index bbc2b9b4dc8..13dae887f21 100644
--- a/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
+++ b/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Preetha Rao <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFind\Test\RecordDriver;
 
@@ -37,7 +37,7 @@ namespace VuFind\Test\RecordDriver;
  * @author   David Maus <maus@hab.de>
  * @author   Preetha Rao <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class SolrMarcTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php b/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
index 603a10fd799..0b2171c9c16 100644
--- a/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
+++ b/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
@@ -24,7 +24,7 @@
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Preetha Rao <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Search\Base;
 
@@ -36,7 +36,7 @@ namespace VuFindTest\Search\Base;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Preetha Rao <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class ParamsTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php b/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
index d1c1e83a1bf..53659e6c136 100644
--- a/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
+++ b/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFindTest\Solr;
 use VuFind\Solr\Utils;
@@ -35,7 +35,7 @@ use VuFind\Solr\Utils;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class UtilsTest extends \VuFindTest\Unit\TestCase
 {
diff --git a/module/VuFind/tests/unit-tests/src/View/Helper/Root/CitationTest.php b/module/VuFind/tests/unit-tests/src/View/Helper/Root/CitationTest.php
index 5ee9a9bfc69..78f901918ce 100644
--- a/module/VuFind/tests/unit-tests/src/View/Helper/Root/CitationTest.php
+++ b/module/VuFind/tests/unit-tests/src/View/Helper/Root/CitationTest.php
@@ -23,7 +23,7 @@
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 namespace VuFind\Test\View\Helper\Root;
 use VuFind\View\Helper\Root\Citation;
@@ -35,7 +35,7 @@ use VuFind\View\Helper\Root\Citation;
  * @package  Tests
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/unit_tests Wiki
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
  */
 class CitationTest extends \VuFindTest\Unit\ViewHelperTestCase
 {
diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php b/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
index 875cb9366cf..824ce536028 100644
--- a/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
@@ -24,7 +24,7 @@
  * @package  Controller
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFindConsole\Controller;
 use Zend\Console\Console, Zend\Console\Getopt,
@@ -38,7 +38,7 @@ use Zend\Console\Console, Zend\Console\Getopt,
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class AbstractBase extends AbstractActionController
 {
diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/HarvestController.php b/module/VuFindConsole/src/VuFindConsole/Controller/HarvestController.php
index 9e38d721cba..726ae73cdd7 100644
--- a/module/VuFindConsole/src/VuFindConsole/Controller/HarvestController.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/HarvestController.php
@@ -23,7 +23,7 @@
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFindConsole\Controller;
 use VuFind\Config\Reader as ConfigReader, VuFind\Harvester\NAF, VuFind\Harvester\OAI,
@@ -36,7 +36,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Harvester\NAF, VuFind\Harvester
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class HarvestController extends AbstractBase
 {
diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/ImportController.php b/module/VuFindConsole/src/VuFindConsole/Controller/ImportController.php
index 829dc25716a..82f6580707e 100644
--- a/module/VuFindConsole/src/VuFindConsole/Controller/ImportController.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/ImportController.php
@@ -23,7 +23,7 @@
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFindConsole\Controller;
 use VuFind\XSLT\Importer, Zend\Console\Console;
@@ -35,7 +35,7 @@ use VuFind\XSLT\Importer, Zend\Console\Console;
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class ImportController extends AbstractBase
 {
diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php b/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
index 33e64aa5673..83db78b6a18 100644
--- a/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
@@ -23,7 +23,7 @@
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 namespace VuFindConsole\Controller;
 use File_MARC, File_MARCXML, VuFind\Connection\Manager as ConnectionManager,
@@ -36,7 +36,7 @@ use File_MARC, File_MARCXML, VuFind\Connection\Manager as ConnectionManager,
  * @package  Controller
  * @author   Chris Hallberg <challber@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:building_a_controller Wiki
  */
 class UtilController extends AbstractBase
 {
diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php
index 50e9f7c17ca..099ca65b914 100644
--- a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php
+++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFindTheme\View\Helper;
 
@@ -34,7 +34,7 @@ namespace VuFindTheme\View\Helper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class HeadLink extends \Zend\View\Helper\HeadLink
 {
diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadScript.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadScript.php
index 5686af57989..b5d4e83f33e 100644
--- a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadScript.php
+++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadScript.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFindTheme\View\Helper;
 
@@ -34,7 +34,7 @@ namespace VuFindTheme\View\Helper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class HeadScript extends \Zend\View\Helper\HeadScript
 {
diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadThemeResources.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadThemeResources.php
index 76210ee577b..aefe2af4617 100644
--- a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadThemeResources.php
+++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadThemeResources.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFindTheme\View\Helper;
 
@@ -34,7 +34,7 @@ namespace VuFindTheme\View\Helper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class HeadThemeResources extends \Zend\View\Helper\AbstractHelper
 {
diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/MobileUrl.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/MobileUrl.php
index 884f64fec94..b89c8775c49 100644
--- a/module/VuFindTheme/src/VuFindTheme/View/Helper/MobileUrl.php
+++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/MobileUrl.php
@@ -23,7 +23,7 @@
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 namespace VuFindTheme\View\Helper;
 
@@ -34,7 +34,7 @@ namespace VuFindTheme\View\Helper;
  * @package  View_Helpers
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
+ * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
  */
 class MobileUrl extends \Zend\View\Helper\AbstractHelper
 {
diff --git a/themes/blueprint/templates/upgrade/home.phtml b/themes/blueprint/templates/upgrade/home.phtml
index 7672a623244..3c81d3feb73 100644
--- a/themes/blueprint/templates/upgrade/home.phtml
+++ b/themes/blueprint/templates/upgrade/home.phtml
@@ -18,5 +18,5 @@
   <li>You may want to check for problems on the <a href="<?=$this->url('install-home')?>"><?=$this->transEsc('auto_configure_title')?></a> page.</li>
 </ol>
 
-<p>For the latest notes on upgrading, see the <a href="http://www.vufind.org/wiki/migration_notes">online documentation</a>.</p>
+<p>For the latest notes on upgrading, see the <a href="http://vufind.org/wiki/vufind2:migration_notes">online documentation</a>.</p>
 <p>For help, feel free to use the mailing lists on the <a href="http://vufind.org/support.php">support page</a>.</p>
\ No newline at end of file
-- 
GitLab