Branch off 9.2, drop 8.3 branch

diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt
index a4480cbc8491139dbbd359a50f957dfba2700e1f..4e5fe1c80ea6a58a69d9a81744fc20771a207049 100644 (file)
--- a/wwwtools/messages-branches.txt
+++ b/wwwtools/messages-branches.txt
@@ -1,6 +1,5 @@
 messages-current               master
-messages-9.2-branch            master
+messages-9.2-branch            REL9_2_STABLE
 messages-9.1-branch            REL9_1_STABLE
 messages-9.0-branch            REL9_0_STABLE
 messages-8.4-branch            REL8_4_STABLE
-messages-8.3-branch            REL8_3_STABLE

diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page
index e0b8dbba854960f4075d18ed505d92ed4993ce42..711240f74fc1b4f4271970a0f5e78aaef9ee16e6 100755 (executable)
--- a/wwwtools/nls-status-page
+++ b/wwwtools/nls-status-page
@@ -78,11 +78,11 @@ list</a> about when a branch is about to be released.</p>
 _EOF_
 
 my %branch_status = (
-    '8.3-branch' => 'maintenance',
     '8.4-branch' => 'maintenance',
     '9.0-branch' => 'maintenance',
     '9.1-branch' => 'maintenance',
-    '9.2-branch' => 'translate this now',
+    '9.2-branch' => 'maintenance',
+    'current' => 'translate this now',
 );
 
 my @branches = map { m!table-([^/]+).html$! && $1 } reverse sort glob("$dir/table-*.html");

diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt
index b4416c019cbf18e17fe56b2cdb780d10054865ce..2151041b1c1a7b080d5a7e926598e0e56e887574 100644 (file)
--- a/wwwtools/postgresql-branches.txt
+++ b/wwwtools/postgresql-branches.txt
@@ -3,4 +3,3 @@ postgresql-9.2-branch   REL9_2_STABLE
 postgresql-9.1-branch  REL9_1_STABLE
 postgresql-9.0-branch  REL9_0_STABLE
 postgresql-8.4-branch  REL8_4_STABLE
-postgresql-8.3-branch  REL8_3_STABLE

diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index 008fea46cec5d2b3293c3cdb4925c52fe2de8b63..ae2000e896631285cd63522b9ef40cda0de335e3 100755 (executable)
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -30,7 +30,7 @@ while true; do
        esac
 done
 
-active_branches="9.2-branch 9.1-branch 9.0-branch 8.4-branch 8.3-branch"
+active_branches="current 9.2-branch 9.1-branch 9.0-branch 8.4-branch"
 
 if [ -n "$1" ]; then
        active_branches=$1