[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_11_2 created. 47705e4c182999da77d30d044375c88348ecdf08

Evergreen Git git at git.evergreen-ils.org
Wed Feb 15 17:31:13 EST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, tags/rel_2_11_2 has been created
        at  47705e4c182999da77d30d044375c88348ecdf08 (commit)

- Log -----------------------------------------------------------------
commit 47705e4c182999da77d30d044375c88348ecdf08
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Wed Feb 15 17:18:13 2017 -0500

    Add missing 2.11.1 Upgrade Script
    
    This upgrade script never got added to rel_2_11, so it was missed
    in the initial 2.11.2 build.  Adding it now.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.11.0-2.11.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.11.0-2.11.1-upgrade-db.sql
new file mode 100644
index 0000000..8042012
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.11.0-2.11.1-upgrade-db.sql
@@ -0,0 +1,109 @@
+--Upgrade Script for 2.11.0 to 2.11.1
+\set eg_version '''2.11.1'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.11.1', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('1001', :eg_version); -- stompro/gmcharlt
+
+CREATE INDEX action_usr_circ_history_usr_idx ON action.usr_circ_history ( usr );
+
+
+SELECT evergreen.upgrade_deps_block_check('1002', :eg_version);
+
+-- This is a placeholder for the backport of schema update 1002
+-- (adding es-ES to the list of locales. This script does nothing for
+-- rel_2_11 and later.
+
+
+SELECT evergreen.upgrade_deps_block_check('1003', :eg_version); -- gmcharlt/rhamby/csharp
+
+CREATE OR REPLACE FUNCTION metabib.remap_metarecord_for_bib( bib_id BIGINT, fp TEXT, bib_is_deleted BOOL DEFAULT FALSE, retain_deleted BOOL DEFAULT FALSE ) RETURNS BIGINT AS $func$
+DECLARE
+    new_mapping     BOOL := TRUE;
+    source_count    INT;
+    old_mr          BIGINT;
+    tmp_mr          metabib.metarecord%ROWTYPE;
+    deleted_mrs     BIGINT[];
+BEGIN
+
+    -- We need to make sure we're not a deleted master record of an MR
+    IF bib_is_deleted THEN
+        FOR old_mr IN SELECT id FROM metabib.metarecord WHERE master_record = bib_id LOOP
+
+            IF NOT retain_deleted THEN -- Go away for any MR that we're master of, unless retained
+                DELETE FROM metabib.metarecord_source_map WHERE source = bib_id;
+            END IF;
+
+            -- Now, are there any more sources on this MR?
+            SELECT COUNT(*) INTO source_count FROM metabib.metarecord_source_map WHERE metarecord = old_mr;
+
+            IF source_count = 0 AND NOT retain_deleted THEN -- No other records
+                deleted_mrs := ARRAY_APPEND(deleted_mrs, old_mr); -- Just in case...
+                DELETE FROM metabib.metarecord WHERE id = old_mr;
+
+            ELSE -- indeed there are. Update it with a null cache and recalcualated master record
+                UPDATE  metabib.metarecord
+                  SET   mods = NULL,
+                        master_record = ( SELECT id FROM biblio.record_entry WHERE fingerprint = fp AND NOT deleted ORDER BY quality DESC LIMIT 1)
+                  WHERE id = old_mr;
+            END IF;
+        END LOOP;
+
+    ELSE -- insert or update
+
+        FOR tmp_mr IN SELECT m.* FROM metabib.metarecord m JOIN metabib.metarecord_source_map s ON (s.metarecord = m.id) WHERE s.source = bib_id LOOP
+
+            -- Find the first fingerprint-matching
+            IF old_mr IS NULL AND fp = tmp_mr.fingerprint THEN
+                old_mr := tmp_mr.id;
+                new_mapping := FALSE;
+
+            ELSE -- Our fingerprint changed ... maybe remove the old MR
+                DELETE FROM metabib.metarecord_source_map WHERE metarecord = tmp_mr.id AND source = bib_id; -- remove the old source mapping
+                SELECT COUNT(*) INTO source_count FROM metabib.metarecord_source_map WHERE metarecord = tmp_mr.id;
+                IF source_count = 0 THEN -- No other records
+                    deleted_mrs := ARRAY_APPEND(deleted_mrs, tmp_mr.id);
+                    DELETE FROM metabib.metarecord WHERE id = tmp_mr.id;
+                END IF;
+            END IF;
+
+        END LOOP;
+
+        -- we found no suitable, preexisting MR based on old source maps
+        IF old_mr IS NULL THEN
+            SELECT id INTO old_mr FROM metabib.metarecord WHERE fingerprint = fp; -- is there one for our current fingerprint?
+
+            IF old_mr IS NULL THEN -- nope, create one and grab its id
+                INSERT INTO metabib.metarecord ( fingerprint, master_record ) VALUES ( fp, bib_id );
+                SELECT id INTO old_mr FROM metabib.metarecord WHERE fingerprint = fp;
+
+            ELSE -- indeed there is. update it with a null cache and recalcualated master record
+                UPDATE  metabib.metarecord
+                  SET   mods = NULL,
+                        master_record = ( SELECT id FROM biblio.record_entry WHERE fingerprint = fp AND NOT deleted ORDER BY quality DESC LIMIT 1)
+                  WHERE id = old_mr;
+            END IF;
+
+        ELSE -- there was one we already attached to, update its mods cache and master_record
+            UPDATE  metabib.metarecord
+              SET   mods = NULL,
+                    master_record = ( SELECT id FROM biblio.record_entry WHERE fingerprint = fp AND NOT deleted ORDER BY quality DESC LIMIT 1)
+              WHERE id = old_mr;
+        END IF;
+
+        IF new_mapping THEN
+            INSERT INTO metabib.metarecord_source_map (metarecord, source) VALUES (old_mr, bib_id); -- new source mapping
+        END IF;
+
+    END IF;
+
+    IF ARRAY_UPPER(deleted_mrs,1) > 0 THEN
+        UPDATE action.hold_request SET target = old_mr WHERE target IN ( SELECT unnest(deleted_mrs) ) AND hold_type = 'M'; -- if we had to delete any MRs above, make sure their holds are moved
+    END IF;
+
+    RETURN old_mr;
+
+END;
+$func$ LANGUAGE PLPGSQL;
+
+COMMIT;

commit 4b4e1ee52addb07608ab18c60746e13061b2a68b
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Wed Jan 25 16:45:46 2017 -0500

    Bumping version numbers, adding Upgrade Script and Changelog
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..916380e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,611 @@
-Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs.
-Those seeking a change log are encouraged to run 'git log -v', or read
-it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log
+commit 50ef8149c901014b93dd99f95b6746e392fad49e
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Mon Feb 24 12:09:57 2014 -0500
+
+    Bump OpenILS.pm version
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit e583a25b6ba8e2f48fde56c6af09007195f7f71b
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date:   Wed Jan 25 16:12:36 2017 -0500
+
+    2.10.8-2.10.9 schema upgrade script
+    
+    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+5	0	Open-ILS/src/sql/Pg/version-upgrade/2.10.8-2.10.9-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.10.8-2.10.9-upgrade-db.sql
+
+commit d23f3818b256f95041a4361d4b61ad7ab5b691c0
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Thu Dec 22 14:20:33 2016 -0500
+
+    Docs: Adding release notes for 2.10.9 point release
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+28	0	docs/RELEASE_NOTES_2_10.adoc
+
+commit efca05c66aa1e9c7db990aa47a842bc73b6b94a0
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Thu Dec 22 14:20:33 2016 -0500
+
+    Docs: Adding release notes for 2.11.2 point release
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+46	1	docs/RELEASE_NOTES_2_11.adoc
+
+commit 03d24c911d930aa6de25e284664b1f4892aaff08
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed Jan 25 12:33:24 2017 -0500
+
+    LP#1657885: Inform Vandelay of new chunking/bundling logic, part deux
+    
+    Here we conditionally use the old "max_chunk_count" method provided by OpenSRF
+    when Evergreen is running atop a version that doesn't know about the bundling
+    rename.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+4	6	Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
+
+commit 0bcfb31f391ff420b4f242474b87726f864a19e4
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed Jan 25 10:56:23 2017 -0500
+
+    LP#1657885: Inform Vandelay of new chunking/bundling logic
+    
+    There is a naive attempt to force immediate streaming of results in Vandelay
+    for certain processes, but it both only helps a little, and breaks under the
+    new OpenSRF bundling/chunking logic.  So, we'll drop it where it's not
+    directly configurable, and test for the appropriate features where we can.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+13	7	Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
+
+commit bce74e812685b137fc0ffa5ebdceb2a057249871
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Thu Jan 19 15:54:53 2017 -0500
+
+    LP#1657885: Account for new bundling/chunking logic in OpenSRF 2.5+
+    
+    When chunking was renamed bundling and actually chunking added in OpenSRF 2.5,
+    the few places in Evergreen that tried to make use of the old mechanism
+    directly now break. The most obvious breakage is in the alternate printable
+    hold pull list, which we fix here.  Evidence of other broken code should
+    be fixed as needed, though spots to look our for are z39.50 results and
+    Vandelay processing.
+    
+    To test:
+    
+     1) In Evergreen 2.11 running on top of OpenSRF 2.5+, attempt to use the
+        alt pull list printing interface at a location with many holds on their
+        pull list.  The progress bar will spin forever.
+     2) After applying this patch, do the same.  The interface should work
+        quickly.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+4	4	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+
+commit ad80f096534d525e08e55408992c33b0ed563bde
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed Jan 18 14:38:00 2017 -0500
+
+    LP#1657237: Rewrite the hold target cache
+    
+    We fixed the trigger that caused the problem in bug 167237, but now we need
+    to rewrite reporter.hold_request_record because T-holds are probably all
+    wrong.  No data was lost, we're just addressing the contents of a materialized
+    view.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+
+26	0	Open-ILS/src/sql/Pg/upgrade/1004.function.hold-move-trigger-bug.sql
+
+commit 6815904700aebaa1dd5a1011bbc35754ee0a6e24
+Author: Michele Morgan <mmorgan at noblenet.org>
+Date:   Tue Jan 24 09:17:58 2017 -0500
+
+    LP#1659006: Treat the Cost field like the other money fields in the copy editor,
+    reverting to null if blanked.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1	1	Open-ILS/xul/staff_client/server/cat/copy_editor.js
+
+commit 0117ed68446e1308905405ab6514cdd5cd89cab6
+Author: Jeanette Lundgren <jlundgren at cwmars.org>
+Date:   Wed Jan 18 14:22:58 2017 -0500
+
+    LP#1494362 Docs: oversized screenshot
+    
+    Signed-off-by: Jeanette Lundgren <jlundgren at cwmars.org>
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+-	-	docs/media/catalogue-3.png
+
+commit 5da54ca031ee81e348c68e6a96d239838de33bee
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date:   Tue Jan 17 16:58:39 2017 -0500
+
+    LP#1657282: fix redirect of one-hit metarecord searches
+    
+    This patches fixes a bug where, when performing a metarecord
+    ("Group Formats and Editions") search, one-hit result sets
+    get redirected to a "/eg/opac/record/0.0..." page, which
+    results in a "Bad Request" error being shown to the user.
+    
+    To test:
+    
+    [1] Perform a metarecord search that would result in exactly
+        one metarecord search. Observe that the browser displays
+        a "Bad Request" error page.
+    [2] Apply the patch and perform step 1 again. This time, the
+        search should succeed. Note that if the metarecord contains
+        more than one component, a results page with one grouped
+        hit is displayed; if the metarecord has exactly one component,
+        that bib's record page is displayed.
+    
+    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+2	2	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+
+commit 6badeb7a7ce8ab4172808343b1e88e068d1fc524
+Author: Bill Erickson <berickxx at gmail.com>
+Date:   Tue Jan 17 15:24:53 2017 -0500
+
+    LP#1657241 Stamping aged circ parent_circ index
+    
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+7	0	Open-ILS/src/sql/Pg/upgrade/1005.schema.aged_circulation_parent_circ_idx.sql
+0	7	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.aged_circulation_parent_circ_idx.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1005.schema.aged_circulation_parent_circ_idx.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.aged_circulation_parent_circ_idx.sql
+
+commit d18bc22ab32f7b127478c8185b257443a5ee7828
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Tue Jan 17 15:09:15 2017 -0500
+
+    LP#1657241 - Add parent_circ index to action.aged_circulation
+    
+    The lack of a parent_circ index on the aged_circulation table
+    was causing very long-running queries.  This solves the problem.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+1	0	Open-ILS/src/sql/Pg/090.schema.action.sql
+7	0	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.aged_circulation_parent_circ_idx.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.aged_circulation_parent_circ_idx.sql
+
+commit 637afff589653e589385f94090cb9c60e3f34ea5
+Author: Bill Erickson <berickxx at gmail.com>
+Date:   Tue Jan 17 15:08:58 2017 -0500
+
+    LP#1657237 Stamping rhrr mat view trigger repair
+    
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+51	0	Open-ILS/src/sql/Pg/upgrade/1004.function.hold-move-trigger-bug.sql
+0	49	Open-ILS/src/sql/Pg/upgrade/XXXX.function.hold-move-trigger-bug.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1004.function.hold-move-trigger-bug.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.hold-move-trigger-bug.sql
+
+commit 49b5ae1bc4eaedbf7b42d6f5b38fbe9be2d22700
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Tue Jan 17 14:46:36 2017 -0500
+
+    LP#1657237: Properly constrain matview trigger function
+    
+    The function maintaining the reporter.hold_request_record table
+    was performing an unconstrained update when a hold was moved.  This
+    fixes that.
+    
+    To test:
+    
+    [1] Apply the patch, the perform an asset merge that would
+        change the target of a hold request.  Verify that
+        reporter.hold_request_record is properly update.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+3	2	Open-ILS/src/sql/Pg/reporter-schema.sql
+49	0	Open-ILS/src/sql/Pg/upgrade/XXXX.function.hold-move-trigger-bug.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.hold-move-trigger-bug.sql
+
+commit c957bbf9a32bbacf37a5f20832cab3ec4885e326
+Author: Michelle Purcell <purcellm05 at gmail.com>
+Date:   Sat Jan 14 10:46:56 2017 -0300
+
+    Docs: adding section about circulating items in the Web client
+    
+    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+397	0	docs/circulation/circulating_items_web_client.txt
+-	-	docs/media/backdate_checkin_web_client.png
+-	-	docs/media/backdate_post_checkin_web_client.png
+-	-	docs/media/backdate_post_date_web_client.png
+-	-	docs/media/backdate_red_web_client.png
+-	-	docs/media/check_in_menu_web_client.png
+-	-	docs/media/checkin_barcode_web_client.png
+-	-	docs/media/checkin_options_web_client.png
+-	-	docs/media/checkout_item_barcode_web_client.png
+-	-	docs/media/checkout_menu_web_client.png
+-	-	docs/media/claimed_date_web_client.png
+-	-	docs/media/cr_section_web_client.png
+-	-	docs/media/due_date_display_web_client.png
+-	-	docs/media/edit_due_date_action_web_client.png
+-	-	docs/media/in_house_use_web_client.png
+-	-	docs/media/item_status_altview_web_client.png
+-	-	docs/media/item_status_barcode_web_client.png
+-	-	docs/media/item_status_list_view_web_client.png
+-	-	docs/media/item_status_menu_web_client.png
+-	-	docs/media/items_out_click_web_client.png
+-	-	docs/media/last_few_circs_action_web_client.png
+-	-	docs/media/last_few_circs_display_web_client.png
+-	-	docs/media/lost_cr_section_web_client.png
+-	-	docs/media/lost_section_web_client.png
+-	-	docs/media/mark_claims_returned_web_client.png
+-	-	docs/media/mark_lost_web_client.png
+-	-	docs/media/overdue_checkin_web_client.png
+-	-	docs/media/patron_summary_checkouts_web_client.png
+-	-	docs/media/precat_web_client.png
+-	-	docs/media/record_in_house_action_web_client.png
+-	-	docs/media/renew_action_web_client.png
+-	-	docs/media/renew_item_calendar_web_client.png
+-	-	docs/media/renew_item_web_client.png
+-	-	docs/media/retrieve_patron_web_client.png
+-	-	docs/media/specify_due_date1_web_client.png
+2	0	docs/root.txt
+ create mode 100644 docs/circulation/circulating_items_web_client.txt
+ create mode 100644 docs/media/backdate_checkin_web_client.png
+ create mode 100644 docs/media/backdate_post_checkin_web_client.png
+ create mode 100644 docs/media/backdate_post_date_web_client.png
+ create mode 100644 docs/media/backdate_red_web_client.png
+ create mode 100644 docs/media/check_in_menu_web_client.png
+ create mode 100644 docs/media/checkin_barcode_web_client.png
+ create mode 100644 docs/media/checkin_options_web_client.png
+ create mode 100644 docs/media/checkout_item_barcode_web_client.png
+ create mode 100644 docs/media/checkout_menu_web_client.png
+ create mode 100644 docs/media/claimed_date_web_client.png
+ create mode 100644 docs/media/cr_section_web_client.png
+ create mode 100644 docs/media/due_date_display_web_client.png
+ create mode 100644 docs/media/edit_due_date_action_web_client.png
+ create mode 100644 docs/media/in_house_use_web_client.png
+ create mode 100644 docs/media/item_status_altview_web_client.png
+ create mode 100644 docs/media/item_status_barcode_web_client.png
+ create mode 100644 docs/media/item_status_list_view_web_client.png
+ create mode 100644 docs/media/item_status_menu_web_client.png
+ create mode 100644 docs/media/items_out_click_web_client.png
+ create mode 100644 docs/media/last_few_circs_action_web_client.png
+ create mode 100644 docs/media/last_few_circs_display_web_client.png
+ create mode 100644 docs/media/lost_cr_section_web_client.png
+ create mode 100644 docs/media/lost_section_web_client.png
+ create mode 100644 docs/media/mark_claims_returned_web_client.png
+ create mode 100644 docs/media/mark_lost_web_client.png
+ create mode 100644 docs/media/overdue_checkin_web_client.png
+ create mode 100644 docs/media/patron_summary_checkouts_web_client.png
+ create mode 100644 docs/media/precat_web_client.png
+ create mode 100644 docs/media/record_in_house_action_web_client.png
+ create mode 100644 docs/media/renew_action_web_client.png
+ create mode 100644 docs/media/renew_item_calendar_web_client.png
+ create mode 100644 docs/media/renew_item_web_client.png
+ create mode 100644 docs/media/retrieve_patron_web_client.png
+ create mode 100644 docs/media/specify_due_date1_web_client.png
+
+commit 94ed523032edc28a53ade54df9b7c26a36a8b6e4
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Wed Dec 28 14:43:34 2016 -0500
+
+    LP#1655149: Badges need CDBI support for location groups
+    
+    The badge code needs to inspect copy location groups, and tries to do so using
+    Class::DBI classes. But we haven't told CDBI about aclg and friends.  Here we
+    tell Class::DBI about asset.copy_location_group so that storage can retrieve
+    directly.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+8	0	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/asset.pm
+6	0	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/dbi.pm
+
+commit 289f25a0c6d314057eb37fd358d14bc8308c67e7
+Author: Jeanette Lundgren <jlundgren at cwmars.org>
+Date:   Mon Jan 9 12:10:12 2017 -0500
+
+    Updated link syntax to fix broken section link.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+5	4	docs/admin/phonelist.txt
+
+commit fdae54a34dbeb57f3a788b8c11a95154a57f4f97
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Thu Jan 5 13:55:49 2017 -0500
+
+    Docs: 2.11 Release Note corrections and clarifications.
+    
+    Fixes several typos in the 2.11 Release Notes and in the template for release
+    notes acknowledgements. Also resets the acknowledgements as TODOs for the
+    next release. Added clarification to the email checkout receipts to let users
+    know that email receipts are not available in the XUL client, but only in the
+    web client.
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+21	21	docs/RELEASE_NOTES_2_11.adoc
+4	33	docs/RELEASE_NOTES_NEXT/_acknowledgments
+
+commit 854fe8d71bf6969e072d9fe6c0731bd89c31deb8
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Thu Jan 5 10:03:48 2017 -0500
+
+    Docs: Add "export non-imported records"
+    
+    This commit briefly describes the queue actions, summary and filter
+    sections of the Inspect Queue page in Vandelay, as well as explaining
+    the new "Export Non-Imported Records" action. This commit includes
+    updated screenshots.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+10	1	docs/cataloging/batch_importing_MARC.txt
+-	-	docs/media/Batch_Importing_MARC_Records12.jpg
+-	-	docs/media/Batch_Importing_MARC_Records15.jpg
+
+commit 55bf52cb84be826cd167db288fff298216f944c5
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Wed Dec 21 16:32:26 2016 -0500
+
+    LP#1651808: avoid a class of intermittent search failures
+    
+    This patch fixes a bug where catalog searches can sometimes fail
+    with a PostgreSQL error that looks like this:
+    
+    ERROR: type of parameter 56 (double precision) does not match that when preparing the plan (numeric)
+    CONTEXT: PL/pgSQL function search.query_parser_fts(integer,integer,text,integer[],integer[],integer,integer,integer,boolean,boolean,boolean,integer) line 319 at assignment
+    
+    In particular, it ensures that the relevance values are coerced
+    to the Pg NUMERIC data type regardless of how the core query is
+    constructed; otherwise, it can sometimes end up as a double
+    precision value.  Because of how Pg backends cache query plans,
+    that change of type can result in the error above.
+    
+    To test
+    -------
+    [1] (Optional) Configure the max_children values for open-ils.storage
+        to permit only one drone, which in turn forces all catalog
+        search requests to go through a single Pg backend.
+    [2] Set the default_preferred_language_weight opensrf.xml setting
+        to 0.
+    [3] Perform a catalog search that has just a filter, e.g.,
+        item_lang(eng).
+    [4] Perform a catalog search that includes search term, e.g.,
+        cats
+    [5] The second search should fail.
+    [6] Apply the patch and try steps 3 and 4 again; this time, both
+        searches should work.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
+
+commit ad022e3ea5a55c363bb688068c2ad22d7e0a51c7
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date:   Tue Dec 20 10:07:46 2016 -0800
+
+    fixing formatting in supercat docs
+    
+    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+9	1	docs/development/data_supercat.txt
+
+commit e2957d85e53b4664b9fafe8f71557bad3e390741
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date:   Tue Dec 20 09:32:34 2016 -0800
+
+    Docs: Adding information about Supercat and UnAPI
+
+238	0	docs/development/data_supercat.txt
+67	0	docs/development/data_unapi.txt
+21	0	docs/root.txt
+ create mode 100644 docs/development/data_supercat.txt
+ create mode 100644 docs/development/data_unapi.txt
+
+commit 3292c5708490ed337d831acbbf2f12d58b5ea5d4
+Author: Dan Pearl <dpearl at cwmars.org>
+Date:   Thu Jun 2 15:17:44 2016 -0400
+
+    LP#1586509 Bug fix to LP#1352542 caused extraneous blank line to appear in
+    spine label.  This affected LC call numbers that had only one cutter number
+    plus additional text following.
+    
+    Signed-off-by: Dan Pearl <dpearl at cwmars.org>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+21	19	Open-ILS/xul/staff_client/server/cat/spine_labels.js
+
+commit 6dcdd6f5d156a57540e14be040581fcf7e69c8e6
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Mon Dec 12 16:13:00 2016 -0500
+
+    LP#1594937 Fix off-by-one display of closed dates
+    
+    The switch to toISOString() to format dates introduced an off-by-one error in
+    the closed dates display, showing one extra day of closure due to the timezone
+    being ignored in toISOString().
+    
+    toLocaleDateString() is the future of locale-sensitive date formats. In XUL,
+    because it is an old version of Firefox, it lacks locale sensitivity, but for
+    the purposes of the web staff client it's a good base to build on as even
+    Internet Explorer supports the locale and options arguments as of IE 11.
+    
+    And for the immediate purposes of showing the right dates in the closed dates
+    editor, it works.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+1	1	Open-ILS/xul/staff_client/server/admin/closed_dates.js
+
+commit d708e9d8247e0cbeb7f42c754a84070d4cc5ad9f
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Mon Dec 12 15:39:08 2016 -0500
+
+    LP#1432753 Restore "All day" verbiage to Closed Dates editor
+    
+    Commit ede7e78925 replaced the JSAN calls to util.date.formatted_date() with
+    inline date/time handling, in the process returning times with granularity to
+    the minute instead of to the second. This resulted in the test for "all day"
+    closings always failing.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+1	1	Open-ILS/xul/staff_client/server/admin/closed_dates.js
+
+commit 9e7dc6eef6db00fc4d297b2eb3f94ff359ee0913
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date:   Thu Dec 8 21:31:25 2016 -0800
+
+    Docs: LP1268054 add patron purchase request doc
+    
+    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+53	0	docs/acquisitions/purchase_requests_management.txt
+29	0	docs/acquisitions/purchase_requests_patron_view.txt
+4	0	docs/root.txt
+ create mode 100644 docs/acquisitions/purchase_requests_management.txt
+ create mode 100644 docs/acquisitions/purchase_requests_patron_view.txt
+
+commit 1470114b82f343138f5382e0130b6f07a03560de
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date:   Thu Dec 1 10:47:20 2016 -0800
+
+    Docs: Making sure that image filenames don't include . character, as this can cause some versions of a2x to fail
+    
+    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+3	3	docs/acquisitions/selection_lists_po.txt
+-	-	docs/media/2.10_Lineitem_Paid.PNG
+-	-	docs/media/2.7_Enhancements_to_Canceled2.jpg
+-	-	docs/media/2.7_Enhancements_to_Canceled4.jpg
+-	-	docs/media/2.7_Enhancements_to_Reports1.jpg
+-	-	docs/media/2.7_Enhancements_to_Reports2.jpg
+-	-	docs/media/2.7_Enhancements_to_Reports2a.jpg
+-	-	docs/media/2.7_Enhancements_to_Reports3.jpg
+-	-	docs/media/2.7_Enhancements_to_Reports4.jpg
+-	-	docs/media/2.7_Enhancements_to_Reports5.jpg
+-	-	docs/media/2.7_Enhancements_to_Reports6.jpg
+-	-	docs/media/2_10_Lineitem_Paid.png
+-	-	docs/media/2_7_Enhancements_to_Canceled2.jpg
+-	-	docs/media/2_7_Enhancements_to_Canceled4.jpg
+-	-	docs/media/2_7_Enhancements_to_Reports1.jpg
+-	-	docs/media/2_7_Enhancements_to_Reports2.jpg
+-	-	docs/media/2_7_Enhancements_to_Reports2a.jpg
+-	-	docs/media/2_7_Enhancements_to_Reports3.jpg
+-	-	docs/media/2_7_Enhancements_to_Reports4.jpg
+-	-	docs/media/2_7_Enhancements_to_Reports5.jpg
+-	-	docs/media/2_7_Enhancements_to_Reports6.jpg
+3	3	docs/reports/reporter_generating_reports.txt
+4	4	docs/reports/reporter_template_enhancements.txt
+ delete mode 100644 docs/media/2.10_Lineitem_Paid.PNG
+ delete mode 100644 docs/media/2.7_Enhancements_to_Canceled2.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Canceled4.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Reports1.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Reports2.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Reports2a.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Reports3.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Reports4.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Reports5.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Reports6.jpg
+ create mode 100644 docs/media/2_10_Lineitem_Paid.png
+ create mode 100644 docs/media/2_7_Enhancements_to_Canceled2.jpg
+ create mode 100644 docs/media/2_7_Enhancements_to_Canceled4.jpg
+ create mode 100644 docs/media/2_7_Enhancements_to_Reports1.jpg
+ create mode 100644 docs/media/2_7_Enhancements_to_Reports2.jpg
+ create mode 100644 docs/media/2_7_Enhancements_to_Reports2a.jpg
+ create mode 100644 docs/media/2_7_Enhancements_to_Reports3.jpg
+ create mode 100644 docs/media/2_7_Enhancements_to_Reports4.jpg
+ create mode 100644 docs/media/2_7_Enhancements_to_Reports5.jpg
+ create mode 100644 docs/media/2_7_Enhancements_to_Reports6.jpg
+
+commit e469e74487e310b6805a682bdb19cf37d8e62c70
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date:   Thu Dec 1 10:32:41 2016 -0800
+
+    Docs: fixing missing anchor
+    
+    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+1	0	docs/cataloging/authorities.txt
+
+commit 56522c440097c07a16ea1a5d05b5d14734217370
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date:   Sat Nov 19 08:56:33 2016 -0800
+
+    Docs: consolidating some duplicate language
+    
+    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+17	0	docs/cataloging/authorities.txt
+0	40	docs/cataloging/batch_importing_MARC.txt
+
+commit 9855d90a4193a70c9c602ac20dfa0052ac377c1f
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date:   Thu Nov 17 20:25:36 2016 -0800
+
+    Docs: Incorporating overlay/merge profiles documentation from Evergreen in Action + new 2.11 feature
+    
+    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+24	0	docs/cataloging/batch_importing_MARC.txt
+
+commit e985a70cada82586e5ac06aee193c95b2f0f105e
+Author: Kyle Huckins <khuckins at catalystdevworks.com>
+Date:   Tue Oct 4 09:01:02 2016 -0700
+
+    LP#1528916 Patron Holds Ready/Total
+    
+    Switch order or patron_stats().holds.ready and
+    patron_stats().holds.total in t_summary and patron
+    index.
+    
+    Signed-off-by: Kyle Huckins <khuckins at catalystdevworks.com>
+    
+     Changes to be committed:
+    	modified:   Open-ILS/src/templates/staff/circ/patron/index.tt2
+    	modified:   Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1	1	Open-ILS/src/templates/staff/circ/patron/index.tt2
+1	1	Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+
+commit 71b53d8e7e0a3432dd75d5a3d3c264f60a2b4706
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date:   Thu Nov 17 17:02:46 2016 -0800
+
+    Docs: documenting new authority features
+    
+    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+21	2	docs/cataloging/authorities.txt
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..22b6c3b 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
 sub ils_version {
     # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
     # For branches, format is "x-y"
-    return "HEAD";
+    return "2-11-2";
 }
 
 __PACKAGE__->register_method(
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index c0b4613..d3dc541 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1005', :eg_version); -- csharp/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.11.2', :eg_version);
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.11.1-2.11.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.11.1-2.11.2-upgrade-db.sql
new file mode 100644
index 0000000..e7cadc4
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.11.1-2.11.2-upgrade-db.sql
@@ -0,0 +1,85 @@
+--Upgrade Script for 2.11.1 to 2.11.2
+\set eg_version '''2.11.2'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.11.2', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('1004', :eg_version); 
+
+CREATE OR REPLACE FUNCTION reporter.hold_request_record_mapper () RETURNS TRIGGER AS $$
+BEGIN
+    IF TG_OP = 'INSERT' THEN
+        INSERT INTO reporter.hold_request_record (id, target, hold_type, bib_record)
+        SELECT  NEW.id,
+                NEW.target,
+                NEW.hold_type,
+                CASE
+                    WHEN NEW.hold_type = 'T'
+                        THEN NEW.target
+                    WHEN NEW.hold_type = 'I'
+                        THEN (SELECT ssub.record_entry FROM serial.subscription ssub JOIN serial.issuance si ON (si.subscription = ssub.id) WHERE si.id = NEW.target)
+                    WHEN NEW.hold_type = 'V'
+                        THEN (SELECT cn.record FROM asset.call_number cn WHERE cn.id = NEW.target)
+                    WHEN NEW.hold_type IN ('C','R','F')
+                        THEN (SELECT cn.record FROM asset.call_number cn JOIN asset.copy cp ON (cn.id = cp.call_number) WHERE cp.id = NEW.target)
+                    WHEN NEW.hold_type = 'M'
+                        THEN (SELECT mr.master_record FROM metabib.metarecord mr WHERE mr.id = NEW.target)
+                    WHEN NEW.hold_type = 'P'
+                        THEN (SELECT bmp.record FROM biblio.monograph_part bmp WHERE bmp.id = NEW.target)
+                END AS bib_record;
+    ELSIF TG_OP = 'UPDATE' AND (OLD.target <> NEW.target OR OLD.hold_type <> NEW.hold_type) THEN
+        UPDATE  reporter.hold_request_record
+          SET   target = NEW.target,
+                hold_type = NEW.hold_type,
+                bib_record = CASE
+                    WHEN NEW.hold_type = 'T'
+                        THEN NEW.target
+                    WHEN NEW.hold_type = 'I'
+                        THEN (SELECT ssub.record_entry FROM serial.subscription ssub JOIN serial.issuance si ON (si.subscription = ssub.id) WHERE si.id = NEW.target)
+                    WHEN NEW.hold_type = 'V'
+                        THEN (SELECT cn.record FROM asset.call_number cn WHERE cn.id = NEW.target)
+                    WHEN NEW.hold_type IN ('C','R','F')
+                        THEN (SELECT cn.record FROM asset.call_number cn JOIN asset.copy cp ON (cn.id = cp.call_number) WHERE cp.id = NEW.target)
+                    WHEN NEW.hold_type = 'M'
+                        THEN (SELECT mr.master_record FROM metabib.metarecord mr WHERE mr.id = NEW.target)
+                    WHEN NEW.hold_type = 'P'
+                        THEN (SELECT bmp.record FROM biblio.monograph_part bmp WHERE bmp.id = NEW.target)
+                END
+         WHERE  id = NEW.id;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE PLPGSQL;
+
+TRUNCATE TABLE reporter.hold_request_record;
+ 
+INSERT INTO reporter.hold_request_record 
+SELECT  id,
+        target,
+        hold_type,
+        CASE
+                WHEN hold_type = 'T'
+                        THEN target
+                WHEN hold_type = 'I'
+                        THEN (SELECT ssub.record_entry FROM serial.subscription ssub JOIN serial.issuance si ON (si.subscription = ssub.id) WHERE si.id = ahr.target)
+                WHEN hold_type = 'V'
+                        THEN (SELECT cn.record FROM asset.call_number cn WHERE cn.id = ahr.target)
+                WHEN hold_type IN ('C','R','F')
+                        THEN (SELECT cn.record FROM asset.call_number cn JOIN asset.copy cp ON (cn.id = cp.call_number) WHERE cp.id = ahr.target)
+                WHEN hold_type = 'M'
+                        THEN (SELECT mr.master_record FROM metabib.metarecord mr WHERE mr.id = ahr.target)
+                WHEN hold_type = 'P'
+                        THEN (SELECT bmp.record FROM biblio.monograph_part bmp WHERE bmp.id = ahr.target)
+        END AS bib_record
+  FROM  action.hold_request ahr;
+ 
+REINDEX TABLE reporter.hold_request_record;
+
+
+ANALYZE reporter.hold_request_record;
+
+
+SELECT evergreen.upgrade_deps_block_check('1005', :eg_version);
+
+CREATE INDEX action_aged_circulation_parent_circ_idx ON action.aged_circulation (parent_circ);
+
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index 7b2b3f5..eef3d81 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -1,7 +1,7 @@
 <html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
 <h1 style="text-decoration: underline">Evergreen</h1>
 <p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_11_2</p>
 <h2>What is Evergreen?</h2>
 <blockquote>
 <p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..e306ebb 100644
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main");
 pref("open-ils.enable_join_tabs", true);
 
 // We'll use this one to help brand some build information into the client, and rely on subversion keywords
-pref("open-ils.repository.headURL","$HeadURL$");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_11_2");
 pref("open-ils.repository.author","$Author$");
 pref("open-ils.repository.revision","$Revision$");
 pref("open-ils.repository.date","$Date$");
diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi
index a954357..5ebcd7a 100644
--- a/Open-ILS/xul/staff_client/windowssetup.nsi
+++ b/Open-ILS/xul/staff_client/windowssetup.nsi
@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 ; Old versions of makensis don't like this, moved to Makefile
 ;!define /file PRODUCT_VERSION "client/VERSION"
-!define PRODUCT_TAG "Master"
+!define PRODUCT_TAG "2.11"
 !define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}"
 !define UI_IMAGESET "beta"
 ;!define UI_IMAGESET "release"
diff --git a/README b/README
deleted file mode 120000
index b57451a..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.txt
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..ac6edcc
--- /dev/null
+++ b/README
@@ -0,0 +1,742 @@
+Installing the Evergreen server
+===============================
+:toc:
+:numbered:
+
+Preamble: referenced user accounts
+----------------------------------
+
+In subsequent sections, we will refer to a number of different accounts, as
+follows:
+
+  * Linux user accounts:
+    ** The *user* Linux account is the account that you use to log onto the
+       Linux system as a regular user.
+    ** The *root* Linux account is an account that has system administrator
+       privileges. On Debian and Fedora you can switch to this account from
+       your *user* account by issuing the `su -` command and entering the
+       password for the *root* account when prompted. On Ubuntu you can switch
+       to this account from your *user* account using the `sudo su -` command
+       and entering the password for your *user* account when prompted.
+    ** The *opensrf* Linux account is an account that you create when installing
+       OpenSRF. You can switch to this account from the *root* account by
+       issuing the `su - opensrf` command.
+    ** The *postgres* Linux account is created automatically when you install
+       the PostgreSQL database server. You can switch to this account from the
+       *root* account by issuing the `su - postgres` command.
+  * PostgreSQL user accounts:
+    ** The *evergreen* PostgreSQL account is a superuser account that you will
+       create to connect to the PostgreSQL database server.
+  * Evergreen administrator account:
+    ** The *egadmin* Evergreen account is an administrator account for
+       Evergreen that you will use to test connectivity and configure your
+       Evergreen instance.
+
+Preamble: developer instructions
+--------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must perform one step before they 
+can proceed with the `./configure` step.
+
+As the *user* Linux account, issue the following command in the Evergreen
+source directory to generate the configure script and Makefiles:
+
+[source, bash]
+------------------------------------------------------------------------------
+autoreconf -i
+------------------------------------------------------------------------------
+
+Installing prerequisites
+------------------------
+
+  * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
+    is 9.1.
+  * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0), 
+    Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04), 
+    Ubuntu Trusty Tahr (14.04), and Fedora. 
+    If you are running an older version of these distributions, you may want 
+    to upgrade before upgrading Evergreen. For instructions on upgrading these
+    distributions, visit the Debian, Ubuntu or Fedora websites.
+  * **OpenSRF**: The minimum supported version of OpenSRF is 2.4.0.
+
+
+Evergreen has a number of prerequisite packages that must be installed
+before you can successfully configure, compile, and install Evergreen.
+
+1. Begin by installing the most recent version of OpenSRF (2.4.0 or later).
+   You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
+   repositories.
++
+  * Debian (Wheezy and Jessie) and Ubuntu (Trusty and Xenial) comes with
+    PostgreSQL 9.1+, so no additional steps are required.
+  * Fedora 19 and 20 come with PostgreSQL 9.2+, so no additional steps are required.
++
+3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to
+   retrieve the new packages from the backports repository.
+4. Issue the following commands as the *root* Linux account to install
+   prerequisites using the `Makefile.install` prerequisite installer,
+   substituting `debian-jessie`, `debian-wheezy`, `fedora`, 
+   `ubuntu-xenial`, or `ubuntu-trusty` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+5. Add the libdbi-libdbd libraries to the system dynamic library path by
+   issuing the following commands as the *root* Linux account:
++
+[NOTE]
+You should skip this step if installing on Ubuntu Trusty, Ubuntu Xenial or Debian Jessie. The Ubuntu
+and Debian Jessie targets use libdbd-pgsql from packages.
++
+.Debian Wheezy
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
++
+.Fedora
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
+
+6. OPTIONAL: Developer additions
++
+To perform certain developer tasks from a Git source code checkout, 
+additional packages may be required.  As the *root* Linux account:
++
+ * To install packages needed for retriving and managing web dependencies,
+   use the <osname>-developer Makefile.install target.  Currently, 
+   this is only needed for building and installing the (preview) browser 
+   staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen release bundles, use
+   the <osname>-packager Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-packager
+------------------------------------------------------------------------------
+
+Optional: Extra steps for browser-based staff client
+----------------------------------------------------
+
+[NOTE]
+Skip this entire section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+[NOTE]
+You make skip the subsection `Install dependencies for browser-based staff client'
+if you are installing on either Debian Jessie, Ubuntu Trusty, or Ubuntu Xenial and you have
+installed the `Optional: Developer Additions' described above.  You will still
+need to do the steps in `Install files for browser-based staff client' below.
+
+Install dependencies for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Install Node.js.  For more information see also:
+   https://github.com/joyent/node/wiki/installation[Node.js Installation]
++
+[source,sh]
+------------------------------------------------------------------------------
+# Go to a temporary directory
+cd /tmp
+
+# Clone the code and checkout the necessary version
+git clone https://github.com/joyent/node.git
+cd node
+git checkout -b v0.10.28 v0.10.28
+
+# set -j to the number of CPU cores on the server + 1
+./configure && make -j2 && sudo make install
+
+# update packages
+% sudo npm update
+------------------------------------------------------------------------------
++
+2. Install Grunt CLI
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g grunt-cli
+------------------------------------------------------------------------------
++
+3. Install Bower
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g bower
+------------------------------------------------------------------------------
+
+Install files for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Building, Testing, Minification: The remaining steps all take place within
+   the staff JS web root:
++
+[source,sh]
+------------------------------------------------------------------------------
+cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/
+------------------------------------------------------------------------------
++
+2. Install Project-local Dependencies. npm inspects the 'package.json' file
+   for dependencies and fetches them from the Node package network.
++
+[source,sh]
+------------------------------------------------------------------------------
+npm install   # fetch Grunt dependencies
+bower install # fetch JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build, run tests, concat+minify
+grunt all
+------------------------------------------------------------------------------
+
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+   command as the *root* Linux account to install Evergreen, build the server
+   portion of the staff client, and copy example configuration files to
+   `/openils/conf`.
+   Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+   of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_2_11_2 install
+------------------------------------------------------------------------------
++
+2. The server portion of the staff client expects `http://hostname/xul/server`
+   to resolve. Issue the following commands as the *root* Linux account to
+   create a symbolic link pointing to the `server` subdirectory of the server
+   portion of the staff client that we just built using the staff client ID
+   'rel_name':
++
+[source, bash]
+------------------------------------------------------------------------------
+cd /openils/var/web/xul
+ln -sf rel_name/server server
+------------------------------------------------------------------------------
+
+Change ownership of the Evergreen files
+---------------------------------------
+
+All files in the `/openils/` directory and subdirectories must be owned by the
+`opensrf` user. Issue the following command as the *root* Linux account to
+change the ownership on the files:
+
+[source, bash]
+------------------------------------------------------------------------------
+chown -R opensrf:opensrf /openils
+------------------------------------------------------------------------------
+
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
+Configure the Apache Web server
+-------------------------------
+
+. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian Wheezy
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf       /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup    /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty, Ubuntu Xenial, and Debian Jessie
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf       /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup    	/etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf       /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup          /etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------
++
+. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+  a. To enable access to the offline upload / execute interface from any
+     workstation on any network, make the following change (and note that
+     you *must* secure this for a production instance):
+     * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+     * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+  b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+     to `/etc/httpd/`.
+. Change the user for the Apache server.
+  * (Debian and Ubuntu): As the *root* Linux account, edit
+    `/etc/apache2/envvars`.  Change `export APACHE_RUN_USER=www-data` to 
+    `export APACHE_RUN_USER=opensrf`.
+  * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`.
+    Change `User apache` to `User opensrf`.
+. As the *root* Linux account, configure Apache with KeepAlive settings
+  appropriate for Evergreen. Higher values can improve the performance of a
+  single client by allowing multiple requests to be sent over the same TCP
+  connection, but increase the risk of using up all available Apache child
+  processes and memory.
+  * (Debian and Ubuntu): Edit `/etc/apache2/apache2.conf`.
+    a. Change `KeepAliveTimeout` to `1`.
+    b. Change `MaxKeepAliveRequests` to `100`.
+  * (Fedora): Edit `/etc/httpd/conf/httpd.conf`.
+    a. Change `KeepAliveTimeout` to `1`.
+    b. Change `MaxKeepAliveRequests` to `100`.
+. As the *root* Linux account, configure the prefork module to start and keep
+  enough Apache servers available to provide quick responses to clients without
+  running out of memory. The following settings are a good starting point for a
+  site that exposes the default Evergreen catalogue to the web:
++
+.Debian Wheezy (`/etc/apache2/apache2.conf`) and Fedora (`/etc/httpd/conf/httpd.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+   StartServers         15
+   MinSpareServers       5
+   MaxSpareServers      15
+   MaxClients           75
+   MaxRequestsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty, Ubuntu Xenial, Debian Jessie (`/etc/apache2/mods-available/mpm_prefork.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+   StartServers            15
+   MinSpareServers          5
+   MaxSpareServers         15
+   MaxRequestWorkers       75
+   MaxConnectionsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+. (Ubuntu Trusty, Ubuntu Xenial, Debian Jessie) As the *root* user,
+    enable the mpm_prefork module:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf`
+   file to change references from the non-existent `/etc/apache2/` directory
+   to `/etc/httpd/`.
+. (Debian Wheezy): As the *root* Linux account, enable the Evergreen site:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite default  # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty, Ubuntu Xenial, Debian Jessie):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default  # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+. (Ubuntu): As the *root* Linux account, enable Apache to write
+   to the lock directory; this is currently necessary because Apache
+   is running as the `opensrf` user:
++
+[source,bash]
+------------------------------------------------------------------------------
+chown opensrf /var/lock/apache2
+------------------------------------------------------------------------------
+
+Learn more about additional Apache options in the following sections:
+
+  * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+  * <<_apache_access_handler_perl_module,Apache Access Handler Perl Module>>
+
+Configure OpenSRF for the Evergreen application
+-----------------------------------------------
+There are a number of example OpenSRF configuration files in `/openils/conf/`
+that you can use as a template for your Evergreen installation. Issue the
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml
+cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
+------------------------------------------------------------------------------
+
+When you installed OpenSRF, you created four Jabber users on two
+separate domains and edited the `opensrf_core.xml` file accordingly. Please
+refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the
+Evergreen version of the `opensrf_core.xml` file using the same Jabber users
+and domains as you used while installing and testing OpenSRF.
+
+[NOTE]
+The `-b` flag tells the `cp` command to create a backup version of the
+destination file. The backup version of the destination file has a tilde (`~`)
+appended to the file name, so if you have forgotten the Jabber users and
+domains, you can retrieve the settings from the backup version of the files.
+
+`eg_db_config`, described in <<_creating_the_evergreen_database,Creating the Evergreen
+database>>, sets the database connection information in `opensrf.xml` for you.
+
+Configure action triggers for the Evergreen application
+-------------------------------------------------------
+_Action Triggers_ provide hooks for the system to perform actions when a given
+event occurs; for example, to generate reminder or overdue notices, the
+`checkout.due` hook is processed and events are triggered for potential actions
+if there is no checkin time.
+
+To enable the default set of hooks, issue the following command as the
+*opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json
+------------------------------------------------------------------------------
+
+For more information about configuring and using action triggers, see
+<<_notifications_action_triggers,Notifications / Action Triggers>>.
+
+Creating the Evergreen database
+-------------------------------
+
+Setting up the PostgreSQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For production use, most libraries install the PostgreSQL database server on a
+dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
+installer does *not* install the PostgreSQL 9 database server that is required
+by every Evergreen system. You can install the packages required by Debian or
+Ubuntu on the machine of your choice using the following commands as the
+*root* Linux account:
+
+.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system.  To install Postgres server packages, 
+use the make target 'postgres-server-<OSTYPE>'.  Choose the most appropriate 
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
+------------------------------------------------------------------------------
+
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora also requires you to initialize the PostgreSQL
+cluster and start the service. Issue the following commands as the *root* user:
+
+[source, bash]
+------------------------------------------------------------------------------
+postgresql-setup initdb
+systemctl start postgresql
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Debian Wheezy, Ubuntu Trusty, and Ubuntu Xenial) 
+No extra modules required for these distributions.
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+cpan Rose::URI
+------------------------------------------------------------------------------
+
+You need to create a PostgreSQL superuser to create and access the database.
+Issue the following command as the *postgres* Linux account to create a new
+PostgreSQL superuser named `evergreen`. When prompted, enter the new user's
+password:
+
+[source, bash]
+------------------------------------------------------------------------------
+createuser -s -P evergreen
+------------------------------------------------------------------------------
+
+.Enabling connections to the PostgreSQL database
+
+Your PostgreSQL database may be configured by default to prevent connections,
+for example, it might reject attempts to connect via TCP/IP or from other
+servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf`
+file, found in the `/etc/postgresql/` directory on Debian and Ubuntu, and in
+the `/var/lib/pgsql/data/` directory on Fedora. A simple way to enable TCP/IP
+connections from localhost to all databases with password authentication, which
+would be suitable for a test install of Evergreen on a single server, is to
+ensure the file contains the following entries _before_ any "host ... ident"
+entries:
+
+------------------------------------------------------------------------------
+host    all             all             ::1/128                 md5
+host    all             all             127.0.0.1/32            md5
+------------------------------------------------------------------------------
+
+When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to
+make the changes take effect.  For more information on configuring connectivity
+to PostgreSQL, see
+http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html
+
+Creating the Evergreen database and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have created the *evergreen* PostgreSQL account, you also need to
+create the database and schema, and configure your configuration files to point
+at the database server. Issue the following command as the *root* Linux account
+from inside the Evergreen source directory, replacing <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+with the values you want for the *egadmin* Evergreen administrator account:
+
+[source, bash]
+------------------------------------------------------------------------------
+perl Open-ILS/src/support-scripts/eg_db_config --update-config \
+       --service all --create-database --create-schema --create-offline \
+       --user <user> --password <password> --hostname <hostname> --port <port> \
+       --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass>
+------------------------------------------------------------------------------
+
+This creates the database and schema and configures all of the services in
+your `/openils/conf/opensrf.xml` configuration file to point to that database.
+It also creates the configuration files required by the Evergreen `cgi-bin`
+administration scripts, and sets the user name and password for the *egadmin*
+Evergreen administrator account to your requested values.
+
+You can get a complete set of options for `eg_db_config` by passing the
+`--help` parameter.
+
+Loading sample data
+~~~~~~~~~~~~~~~~~~~
+If you add the `--load-all-sample` parameter to the `eg_db_config` command,
+a set of authority and bibliographic records, call numbers, copies, staff
+and regular users, and transactions will be loaded into your target
+database. This sample dataset is commonly referred to as the _concerto_
+sample data, and can be useful for testing out Evergreen functionality and
+for creating problem reports that developers can easily recreate with their
+own copy of the _concerto_ sample data.
+
+Creating the database on a remote server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In a production instance of Evergreen, your PostgreSQL server should be
+installed on a dedicated server.
+
+PostgreSQL 9.1 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.1 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_control -l --start-all
+------------------------------------------------------------------------------
++
+  ** If you receive the error message `bash: osrf_control: command not found`,
+     then your environment variable `PATH` does not include the `/openils/bin`
+     directory; this should have been set in the *opensrf* Linux account's
+     `.bashrc` configuration file. To manually set the `PATH` variable, edit the
+     configuration file `~/.bashrc` as the *opensrf* Linux account and add the
+     following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+export PATH=$PATH:/openils/bin
+------------------------------------------------------------------------------
++
+3. As the *opensrf* Linux account, generate the Web files needed by the staff
+   client and catalogue and update the organization unit proximity (you need to do
+   this the first time you start Evergreen, and after that each time you change the library org unit configuration.
+):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh
+------------------------------------------------------------------------------
++
+4. As the *root* Linux account, restart the Apache Web server:
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/apache2 restart
+------------------------------------------------------------------------------
++
+If the Apache Web server was running when you started the OpenSRF services, you
+might not be able to successfully log in to the OPAC or staff client until the
+Apache Web server is restarted.
+
+Testing connections to Evergreen
+--------------------------------
+
+Once you have installed and started Evergreen, test your connection to
+Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following
+commands to start `srfsh` and try to log onto the Evergreen server using the
+*egadmin* Evergreen administrator user name and password that you set using the
+`eg_db_config` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+You should see a result like:
+
+    Received Data: "250bf1518c7527a03249858687714376"
+    ------------------------------------
+    Request Completed Successfully
+    Request Time in seconds: 0.045286
+    ------------------------------------
+
+    Received Data: {
+       "ilsevent":0,
+       "textcode":"SUCCESS",
+       "desc":" ",
+       "pid":21616,
+       "stacktrace":"oils_auth.c:304",
+       "payload":{
+          "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a",
+          "authtime":420
+       }
+
+    }
+
+    ------------------------------------
+    Request Completed Successfully
+    Request Time in seconds: 1.336568
+    ------------------------------------
+[[install-troubleshooting-1]]
+If this does not work, it's time to do some troubleshooting.
+
+  * As the *opensrf* Linux account, run the `settings-tester.pl` script to see
+    if it finds any system configuration problems. The script is found at
+    `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source
+    tree.
+  * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide].
+  * If you have faithfully followed the entire set of installation steps
+    listed here, you are probably extremely close to a working system.
+    Gather your configuration files and log files and contact the
+    http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development 
+mailing list] for assistance before making any drastic changes to your system
+    configuration.
+
+Getting help
+------------
+
+Need help installing or using Evergreen? Join the mailing lists at
+http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode
+IRC network on the #evergreen channel.
+
+License
+-------
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+Unported License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/configure.ac b/configure.ac
index 74e6b3b..07edd83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
 
 export PATH=${PATH}:/usr/sbin
 AC_PREREQ(2.61)
-AC_INIT(Open-ILS, trunk, open-ils-dev at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 2.11.2, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.11.2])
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])

commit 50ef8149c901014b93dd99f95b6746e392fad49e
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Mon Feb 24 12:09:57 2014 -0500

    Bump OpenILS.pm version
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index d7235ce..d19704e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS.pm
@@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system
 
 =cut
 
-our $VERSION = '2.4';
+our $VERSION = '2.1102';
 
 1;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list