Branch off 10/11

master is now version 11, and version 10 has its own branch.

diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt
index 6acdd34bea3c6c64c9c9b9686474c112d877e834..d82dba40801f35c258f1a0728382ee265de21f93 100644 (file)
--- a/wwwtools/messages-branches.txt
+++ b/wwwtools/messages-branches.txt
@@ -1,4 +1,5 @@
-messages-10-branch             master
+messages-master                        master
+messages-10-branch             REL_10_STABLE
 messages-9.6-branch            REL9_6_STABLE
 messages-9.5-branch            REL9_5_STABLE
 messages-9.4-branch            REL9_4_STABLE

diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page
index a09ef39f7bcd50bc43ac9d4576aa859cc0d38f18..7892ea3d5d5131012a099a39a3e67c5df5f8cc33 100755 (executable)
--- a/wwwtools/nls-status-page
+++ b/wwwtools/nls-status-page
@@ -84,6 +84,7 @@ my %branch_status = (
     '9.5-branch' => 'maintenance',
     '9.6-branch' => 'maintenance',
     '10-branch' => 'translate this now',
+    'master' => 'future',
 );
 
 my @branches = reverse sort {

diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt
index 26779daa152b3586c077f3288bdfb8d1da1e01f5..2bd5a5af65cd56af53f3fe1bedc67bd238bf9a8b 100644 (file)
--- a/wwwtools/postgresql-branches.txt
+++ b/wwwtools/postgresql-branches.txt
@@ -1,3 +1,4 @@
+postgresql-master      master
 postgresql-10-branch   REL_10_STABLE
 postgresql-9.6-branch  REL9_6_STABLE
 postgresql-9.5-branch  REL9_5_STABLE

diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index ac71d20e783a6d5977c09eef4f75a1f06413ddb1..e624eb612ee47bbdcc308506a2b32f0974be20b4 100755 (executable)
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -30,7 +30,7 @@ while true; do
        esac
 done
 
-active_branches="10-branch 9.6-branch 9.5-branch 9.4-branch 9.3-branch"
+active_branches="master 10-branch 9.6-branch 9.5-branch 9.4-branch 9.3-branch"
 
 if [ -n "$1" ]; then
        active_branches=$1