resolve conflicts

doc/pg_repack.rst

@@ -40,7 +40,7 @@ Requirements
 ------------
 
 PostgreSQL versions
-    PostgreSQL 8.3, 8.4, 9.0, 9.1, 9.2, 9.3, 9.4, 9.5, 9.6
+    PostgreSQL 9.1, 9.2, 9.3, 9.4, 9.5, 9.6
 
 Disks
     Performing a full-table repack requires free disk space about twice as
@@ -84,21 +84,12 @@ You can also use Microsoft Visual C++ 2010 to build the program on Windows.
 There are project files in the ``msvc`` folder.
 
 After installation, load the pg_repack extension in the database you want to
-process. On PostgreSQL 9.1 and following pg_repack is packaged as an
-extension, so you can execute::
+process. pg_repack is packaged as an extension, so you can execute::
 
     $ psql -c "CREATE EXTENSION pg_repack" -d your_database
 
-For previous PostgreSQL versions you should load the script
-``$SHAREDIR/contrib/pg_repack.sql`` in the database to process; you can
-get ``$SHAREDIR`` using ``pg_config --sharedir``, e.g. ::
-
-    $ psql -f "$(pg_config --sharedir)/contrib/pg_repack.sql" -d your_database
-
-You can remove pg_repack from a PostgreSQL 9.1 and following database using
-``DROP EXTENSION pg_repack``. For previous Postgresql versions load the
-``$SHAREDIR/contrib/uninstall_pg_repack.sql`` script or just drop the
-``repack`` schema.
+You can remove pg_repack using ``DROP EXTENSION pg_repack`` or just dropping
+the ``repack`` schema.
 
 If you are upgrading from a previous version of pg_repack or pg_reorg, just
 drop the old version from the database as explained above and install the new
@@ -477,12 +468,14 @@ Releases
 
 * pg_repack 1.4
 
-  * added support for PostgreSQL 9.6
+  * added support for PostgreSQL 9.6, dropped support for versions before 9.1
   * use ``AFTER`` trigger to solve concurrency problems with ``INSERT
     CONFLICT`` (issue #106)
   * added ``--no-kill-backend`` option (issue #108)
   * added ``--no-superuser-check`` option (issue #114)
   * added ``--exclude-extension`` option (#97)
+  * restore TOAST storage parameters on repacked tables (issue #10)
+  * restore columns storage types in repacked tables (issue #94)
 
 * pg_repack 1.3.4
 

doc/pg_repack_jp.rst

@@ -62,7 +62,7 @@ pg_repackでは再編成する方法として次のものが選択できます
   ------------
   
   PostgreSQL versions
-      PostgreSQL 8.3, 8.4, 9.0, 9.1, 9.2, 9.3, 9.4, 9.5, 9.6
+      PostgreSQL 9.1, 9.2, 9.3, 9.4, 9.5, 9.6
   
   Disks
       Performing a full-table repack requires free disk space about twice as
@@ -75,7 +75,7 @@ pg_repackでは再編成する方法として次のものが選択できます
 ---------
 
 PostgreSQL バージョン
-    PostgreSQL 8.3, 8.4, 9.0, 9.1, 9.2, 9.3, 9.4
+    PostgreSQL 9.1, 9.2, 9.3, 9.4, 9.5, 9.6
 
 ディスク
     テーブル全体の再編成を行うには、対象となるテーブルと付属するインデックスのおよそ2倍のサイズのディスク空き容量が必要です。例えば、テーブルとインデックスを合わせたサイズが1GBの場合、2GBのディスク領域が必要となります。
@@ -862,6 +862,8 @@ ACCESS EXCLUSIVEロックを取得します。その他のステップでは、A
 ..   * added ``--no-kill-backend`` option (issue #108)
 ..   * added ``--no-superuser-check`` option (issue #114)
 ..   * added ``--exclude-extension`` option (#97)
+..   * restore TOAST storage parameters on repacked tables (issue #10)
+..   * restore columns storage types in repacked tables (issue #94)
 
 * pg_repack 1.4
 
@@ -871,6 +873,8 @@ ACCESS EXCLUSIVEロックを取得します。その他のステップでは、A
   * ``--no-kill-backend`` オプションを追加しました (issue #108)
   * ``--no-superuser-check`` オプションを追加しました (issue #114)
   * ``--exclude-extension`` オプションを追加しました (#97)
+  * TOASTテーブルの格納オプションを再編成後のテーブルに再設定するようにしました (issue #10)
+  * 列の格納タイプを再編成後のテーブルに再設定するようにしました (issue #94)
 
 .. * pg_repack 1.3.4
 ..  * grab exclusive lock before dropping original table (#81)