doc: Remove mentions of bdr-plugin/stable branch from docs

diff --git a/doc/appendix-releasenotes.sgml b/doc/appendix-releasenotes.sgml
index c504e06a2289a4548c8d99778d303da7ad1ccc17..bc0c0bb7f3b99e156f5021efe0391da6e5afd5dd 100644 (file)
--- a/doc/appendix-releasenotes.sgml
+++ b/doc/appendix-releasenotes.sgml
@@ -234,7 +234,7 @@
     <filename>bdr-pg/</filename>, mainly
     <filename>bdr-pg/REL9_4_STABLE</filename>.  The extension is now tracked in
     git branches prefixed with <filename>bdr-plugin/</filename>, mainly
-    <filename>bdr-plugin/stable</filename> (last stable release)
+    <filename>bdr-plugin/RELX_Y_STABLE</filename> (stable releases)
     and <filename>bdr-plugin/next</filename> (current development tree).
     All branches share the same working repository.
    </para>

diff --git a/doc/install-source.sgml b/doc/install-source.sgml
index 58e6b0704ba41eb65a2fe1db8e2ff47ea41a70e1..028d610b45f7c07b288ad883d037b4a1af261631 100644 (file)
--- a/doc/install-source.sgml
+++ b/doc/install-source.sgml
@@ -68,15 +68,16 @@
 
    <para>
     The source for &bdr; is maintained at
-    <ulink url="http://git.postgresql.org/gitweb/?p=2ndquadrant_bdr.git;a=tree;h=refs/heads/bdr-plugin/stable;hb=bdr-plugin/stable">
+    <ulink url="http://git.postgresql.org/gitweb/?p=2ndquadrant_bdr.git;a=tree;h=refs/heads/bdr-plugin/next;hb=bdr-plugin/next">
     git.postgresql.org in the 2ndquadrant_bdr repository</ulink>. There are
     actually two independent source trees in this repository - one tree for
     the &bdr; plugin, and one for the modified version of PostgreSQL
     &pgmajorversion; that it requires to run. At the time of writing the
     main branches are:
     <itemizedlist>
-     <listitem><para><filename>bdr-plugin/stable</filename>:
-        the current stable release of the &bdr; plugin</para></listitem>
+     <listitem><para><filename>bdr-plugin/RELX_Y_STABLE</filename>:
+        the stable releases of the &bdr; plugin (for example
+        <filename>bdr-plugin/REL0_9_STABLE</filename> is latest source of 0.9.x).</para></listitem>
      <listitem><para><filename>bdr-plugin/next</filename>:
         the in-progress development version of the &bdr; plugin</para></listitem>
      <listitem><para><filename>bdr-pg/REL9_4_STABLE</filename>:
@@ -91,10 +92,10 @@
    <para>
     To clone the source code using <application>git</application> you will
     need to run two clones, one for the &bdr; plugin sources and one for the
-    patched PostgreSQL sources, e.g.:
+    patched PostgreSQL sources, e.g. (for the 0.9.x version of &bdr;):
     <programlisting>
      git clone -b bdr-pg/REL9_4_STABLE git://git.postgresql.org/git/2ndquadrant_bdr.git postgresql-bdr
-     git clone -b bdr-plugin/stable git://git.postgresql.org/git/2ndquadrant_bdr.git bdr-plugin
+     git clone -b bdr-plugin/REL0_9_STABLE git://git.postgresql.org/git/2ndquadrant_bdr.git bdr-plugin
     </programlisting>
    </para>
 

diff --git a/doc/quickstart.sgml b/doc/quickstart.sgml
index 52af2adf52b4f853d625432cced1baab95c0fd0e..fef4ff7a02ac2aad277fa71a63f559ff5c2f81f1 100644 (file)
--- a/doc/quickstart.sgml
+++ b/doc/quickstart.sgml
@@ -40,7 +40,7 @@
     system with valuable data on it.</emphasis>
     To install the latest stable release, run:
     <screen>
-    <prompt>$</prompt> curl -s "http://git.postgresql.org/gitweb/?p=2ndquadrant_bdr.git;a=blob_plain;f=scripts/bdr_quickstart.sh;hb=bdr-plugin/next" | bash
+    <prompt>$</prompt> curl -s "http://git.postgresql.org/gitweb/?p=2ndquadrant_bdr.git;a=blob_plain;f=scripts/bdr_quickstart.sh;hb=bdr-plugin/REL0_9_STABLE" | bash
     </screen>
     For the latest development version, instead try
     <screen>

diff --git a/sql/identifier.sql b/sql/identifier.sql
index 7a18ce2849eb201c2d5113ba1f1e243654934199..3bc5e3a4873235d70380f592f7a2ac5eb97b979b 100644 (file)
--- a/sql/identifier.sql
+++ b/sql/identifier.sql
@@ -46,8 +46,9 @@ AS (
   FROM pg_catalog.pg_replication_slots s,
     LATERAL bdr.bdr_parse_slot_name(s.slot_name) p
 )
-SELECT orig = formatted
-FROM namepairs;
+SELECT 'fail'
+FROM namepairs
+WHERE orig <> formatted;
 
 -- Check the view mapping slot names to bdr nodes. We can't really examine the slot
 -- name in the regresschecks, because it changes every run, so make sure we at least