# HG changeset patch
# User bsw
# Date 1459881665 -7200
# Node ID 62f7e7d4f9ec7243f29410b8f9e78998d207d43f
# Parent  c0fd12b97d656daa652c72c8d248f1ee2a078771# Parent  d08e4cadd33cace4b7ccfb68e78bdab70c5942da
merge

diff -r c0fd12b97d65 -r 62f7e7d4f9ec INSTALL.html
--- a/INSTALL.html	Tue Apr 05 20:40:37 2016 +0200
+++ b/INSTALL.html	Tue Apr 05 20:41:05 2016 +0200
@@ -70,7 +70,7 @@
 INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 day', 80, 12);
 INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 hour', 200, 60);
 INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 day', 800, 120);
-INSERT INTO policy (index, name, admission_time, discussion_time, verification_time, voting_time, issue_quorum_num, issue_quorum_den, initiative_quorum_num, initiative_quorum_den) VALUES (1, 'Default policy', '8 days', '15 days', '8 days', '15 days', 10, 100, 10, 100);
+INSERT INTO policy (index, name, min_admission_time, max_admission_time, discussion_time, verification_time, voting_time, issue_quorum_num, issue_quorum_den, initiative_quorum_num, initiative_quorum_den) VALUES (1, 'Default policy', '4 days', '8 days', '15 days', '8 days', '15 days', 10, 100, 10, 100);
 INSERT INTO unit (name) VALUES ('Our organization');
 INSERT INTO area (unit_id, name) VALUES (1, 'Default area');
 INSERT INTO allowed_policy (area_id, policy_id, default_policy) VALUES (1, 1, TRUE);
diff -r c0fd12b97d65 -r 62f7e7d4f9ec INSTALL.mkd
--- a/INSTALL.mkd	Tue Apr 05 20:40:37 2016 +0200
+++ b/INSTALL.mkd	Tue Apr 05 20:41:05 2016 +0200
@@ -68,7 +68,7 @@
     INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 day', 80, 12);
     INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 hour', 200, 60);
     INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 day', 800, 120);
-    INSERT INTO policy (index, name, admission_time, discussion_time, verification_time, voting_time, issue_quorum_num, issue_quorum_den, initiative_quorum_num, initiative_quorum_den) VALUES (1, 'Default policy', '8 days', '15 days', '8 days', '15 days', 10, 100, 10, 100);
+    INSERT INTO policy (index, name, min_admission_time, max_admission_time, discussion_time, verification_time, voting_time, issue_quorum_num, issue_quorum_den, initiative_quorum_num, initiative_quorum_den) VALUES (1, 'Default policy', '4 days', '8 days', '15 days', '8 days', '15 days', 10, 100, 10, 100);
     INSERT INTO unit (name) VALUES ('Our organization');
     INSERT INTO area (unit_id, name) VALUES (1, 'Default area');
     INSERT INTO allowed_policy (area_id, policy_id, default_policy) VALUES (1, 1, TRUE);