Merge pull request phpbb#6820 from marc1706/ticket/17514

[tticket/17514] Remove version 3 specifier from paths and content

Author: marc1706

git-tools/hooks/commit-msg

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# A hook to check syntax of a phpBB3 commit message, per:
+# A hook to check syntax of a phpBB commit message, per:
 # * <https://area51.phpbb.com/docs/dev/master/development/git.html>
 # * <http://area51.phpbb.com/phpBB/viewtopic.php?p=209919#p209919>
 #

git-tools/merge.php

@@ -56,7 +56,7 @@ function show_usage()
 function work($pull_id, $remote)
 {
 	// Get some basic data
-	$pull = get_pull('phpbb', 'phpbb3', $pull_id);
+	$pull = get_pull('phpbb', 'phpbb', $pull_id);
 
 	if (!$pull_id)
 	{
@@ -79,7 +79,7 @@ function work($pull_id, $remote)
 			run("git checkout develop-olympus");
 			run("git pull $remote develop-olympus");
 
-			add_remote($pull_user, 'phpbb3');
+			add_remote($pull_user, 'phpbb');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");
@@ -94,7 +94,7 @@ function work($pull_id, $remote)
 			run("git checkout develop");
 			run("git pull $remote develop");
 
-			add_remote($pull_user, 'phpbb3');
+			add_remote($pull_user, 'phpbb');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");

phpBB/adm/style/admin.js

@@ -1,7 +1,7 @@
 /* global phpbb */
 
 /**
-* phpBB3 ACP functions
+* phpBB ACP functions
 */
 
 /**

phpBB/docs/CHANGELOG.html

@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.3.x Changelog" />
+<meta name="description" content="phpBB Changelog" />
 <title>phpBB &bull; Changelog</title>
 
 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,7 +21,7 @@
 
 			<div id="doc-description">
 				<a href="../index.php" id="logo"><span class="site_logo"></span></a>
-				<h1>phpBB 3.3.x Changelog</h1>
+				<h1>phpBB Changelog</h1>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>
 
@@ -36,7 +36,7 @@ <h1>phpBB 3.3.x Changelog</h1>
 <!-- BEGIN DOCUMENT -->
 
 <p class="paragraph main-description">
-	This is a non-exhaustive (but still near complete) changelog for phpBB 3.3.x including release candidate versions.
+	This is a non-exhaustive (but still near complete) changelog for phpBB including release candidate versions.
 	Our thanks to all those people who've contributed bug reports and code fixes.
 </p>