Merge branch 'bug299'

Conflicts:
	doc/adminguide/slonyupgrade.sgml

diff --cc doc/adminguide/slonyupgrade.sgml
index 47582b0be4e08ff1fb4cee28cb192d59c1ffb9db,0b71c9f4a5f39365a9bb74ce4e2f0f731835c23a..ca8885b0f651bcb748fd95f194c8ac4ae0963836
--- 1/doc/adminguide/slonyupgrade.sgml
--- 2/doc/adminguide/slonyupgrade.sgml
+++ b/doc/adminguide/slonyupgrade.sgml
@@@ -116,15 -116,6 +116,16 @@@ that inserts these changes into a sl_lo
  on the log shipping target.
  </para>
  </sect3>
 +
 +<sect3>
 +<title>Installable files are now versioned</title>
 +<para>
 +The files that get installed on database servers in the $libdir and $sharedir now
 +have the &slony1; version number as part of the file name. For example
 +slony1_funcs.so is now slony1_funcs.2.2.0.so and slony1_funcs.sql is now
 +slony1_funcs.2.2.0.sql 
 +</para>
++
  </sect2>