From: Peter Eisentraut <peter@eisentraut.org>
Date: Fri, 8 Apr 2022 08:08:36 +0000 (+0200)
Subject: Branch off 14/15
X-Git-Url: http://git.postgresql.org/gitweb/static/%7B%7Bpgdulink%28?a=commitdiff_plain;h=4df37dea0a9bbe23967f338e637d022997f42486;p=pgtranslation%2Fadmin.git

Branch off 14/15

master is now version 15, and version 14 has its own branch.
---

diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt
index 955e855..662d0cd 100644
--- a/wwwtools/messages-branches.txt
+++ b/wwwtools/messages-branches.txt
@@ -1,4 +1,5 @@
-messages-14-branch		master
+messages-master			master
+messages-14-branch		REL_14_STABLE
 messages-13-branch		REL_13_STABLE
 messages-12-branch		REL_12_STABLE
 messages-11-branch		REL_11_STABLE
diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page
index a439993..4cb17d9 100755
--- a/wwwtools/nls-status-page
+++ b/wwwtools/nls-status-page
@@ -84,6 +84,7 @@ my %branch_status = (
     '12-branch' => 'maintenance',
     '13-branch' => 'maintenance',
     '14-branch' => 'complete this now',
+    'master' => 'future',
 );
 
 my @branches = reverse sort {
diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt
index 97daa51..53b2767 100644
--- a/wwwtools/postgresql-branches.txt
+++ b/wwwtools/postgresql-branches.txt
@@ -1,3 +1,4 @@
+postgresql-master	master
 postgresql-14-branch	REL_14_STABLE
 postgresql-13-branch	REL_13_STABLE
 postgresql-12-branch	REL_12_STABLE
diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index be19032..3a058c9 100755
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -30,7 +30,7 @@ while true; do
 	esac
 done
 
-active_branches="14-branch 13-branch 12-branch 11-branch 10-branch"
+active_branches="master 14-branch 13-branch 12-branch 11-branch 10-branch"
 
 if [ -n "$1" ]; then
 	active_branches=$1