[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_9_3 created. c285a0cbab9d1c48aa8e59f1bfb8a88f4fdb9492

Evergreen Git git at git.evergreen-ils.org
Wed Mar 16 16:36:07 EDT 2016


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_9_3 has been created
        at  c285a0cbab9d1c48aa8e59f1bfb8a88f4fdb9492 (commit)

- Log -----------------------------------------------------------------
commit c285a0cbab9d1c48aa8e59f1bfb8a88f4fdb9492
Author: Jason Stephenson <jstephenson at mvlcstaff.org>
Date:   Wed Mar 16 15:21:31 2016 -0400

    Bumping version numbers, adding Upgrade Script and Changelog
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>

diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..2388e4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,601 @@
-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 040d0b08cf8dcf103bca6a406e45f7fafc620d15
+Author: Bill Erickson <berickxx at gmail.com>
+Date:   Thu Feb 25 15:47:20 2016 -0500
+
+    LP#1206936 Base SQL schema repair
+    
+    Avoid referencing money.materialized_billable_xact_summary before it's
+    defined.
+    
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+8	8	Open-ILS/src/sql/Pg/080.schema.money.sql
+
+commit dc4a2113ec622ae124bbc1870bc62ae7a391717a
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Wed Mar 16 13:54:10 2016 -0400
+
+    Docs: 2.9.3 Release notes
+    
+    Adding bug fixes to the point release notes for 2.9.3
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+89	2	docs/RELEASE_NOTES_2_9.txt
+
+commit df29e8d1766ed927f0c9912ca4afd4cce8299746
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Wed Mar 16 13:35:22 2016 -0400
+
+    docs-2.8.7 release notes
+    
+    Adding point release notes for 2.8.7
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+51	0	docs/RELEASE_NOTES_2_8.txt
+
+commit 341babf860a20539529e29db252545031b01ed5f
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Thu Jan 7 11:47:43 2016 -0500
+
+    LP#1208613: Reset lineitem cache when resetting table
+    
+    Stale cache entries in this table were causing the "expand all"
+    functionality to break.  This might be a nuclear option, but as far as
+    I could see, this "cache" gets repopulated on every pagination anyway,
+    so I don't think we're losing anything.
+    
+    To test:
+    
+    [1] Select a large list from the Acquisitions --> My Selection List
+        screen.
+    [2] Click on the Expand All button and the items on the page expand
+        with more information.
+    [3] Click on the Next link to bring up page 2 of the list.
+    [4] Click on the Expand All button and verify that additional
+        information is displayed.
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+    Signed-off-by: Erica Rohlfs <erohlfs at esilibrary.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	0	Open-ILS/web/js/ui/default/acq/common/li_table.js
+
+commit 0e7bb08d991fc55eeb62eef2cf4b636d76af56e7
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Mon Mar 14 17:35:59 2016 -0400
+
+    LP#1370694: stamp database update
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+74	0	Open-ILS/src/sql/Pg/upgrade/0974.data.selfcheck_holds_printing.sql
+0	74	Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_holds_printing.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0974.data.selfcheck_holds_printing.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_holds_printing.sql
+
+commit 66b92744ec2da55dbc207dc3ea59da00a42719d6
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Mon Mar 14 17:33:49 2016 -0400
+
+    LP#1370694: don't update already-customized format.selfcheck.holds
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+36	3	Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_holds_printing.sql
+
+commit 7e5fda81ec3dffbc4be3761cd68aea7c0a782741
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Mon Mar 14 17:09:53 2016 -0400
+
+    LP#1370694: clean up whitespace
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+13	13	Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+
+commit 107eac51aa2378515eb92da6c8604466bf045608
+Author: Terran McCanna <tmccanna at georgialibraries.org>
+Date:   Tue Mar 1 16:47:20 2016 -0500
+
+    LP#1370694 Selfcheck: "Print List" for Holds view does not work
+    
+    Prior to this change, the holds data was not getting passed to the
+    print function. Now, it is being captured and passed to the print
+    function. Because of some sorting discrepancies between the order of
+    the information being passed from here to the action trigger and the
+    order that the information is presented when pulled directly out of the
+    database by the action trigger (which led to data mismatches between the
+    title/author and the hold status/pickup locations for each printed item),
+    I modified this script to pass all of the hold information together in the
+    desired order to the action trigger rather than relying on the template
+    to match the data coming from the script with the data from the database.
+    
+    This change requires the action trigger printing template to be updated in
+    order to work. I've included an upgrade script as well as an update to the
+    seed data script.
+    
+    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+    Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+6	5	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+41	0	Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_holds_printing.sql
+20	3	Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+5	0	docs/RELEASE_NOTES_NEXT/Circulation/selfcheck_printing_holds.adoc
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_holds_printing.sql
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/selfcheck_printing_holds.adoc
+
+commit 66f14b6e9d8c1b1ceba9332a37db0d9c2ff3a24e
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Mon Mar 14 17:01:16 2016 -0400
+
+    LP#1551447: stamp database update
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+65	0	Open-ILS/src/sql/Pg/upgrade/0973.data.selfcheck_fines_printing.sql
+0	65	Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_fines_printing.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0973.data.selfcheck_fines_printing.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_fines_printing.sql
+
+commit 73b9f0cb41b3bc191f2f072cf2de144cc387832a
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Mon Mar 14 16:48:50 2016 -0400
+
+    LP#1551447: don't update already-customized format.selfcheck.fines
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+31	2	Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_fines_printing.sql
+
+commit c658bd0d5dd7ae5855d1c140b1c770551217b707
+Author: Terran McCanna <tmccanna at georgialibraries.org>
+Date:   Tue Mar 1 17:35:28 2016 -0500
+
+    LP#1551447 Selfcheck: Printing Fines Prints All Open Transactions
+    
+    This corrects the behavior of the selfcheck fines receipt print template.
+    Prior to this, it printed all open billable transactions (eg, every item
+    that the patron had checked out) regardless of whether or not it had bills
+    associated with it. This adds a small bit of logic to the template to
+    check for a balance due. It also updates the javascript to check for a
+    balance on the account before launching the print function to prevent the
+    system from taking unnecessary action.
+    
+    This includes a SQL upgrade script to update the Self-Checked Fines
+    Receipt template for systems that are already in production, as well as
+    including an update to the seed data.
+    
+    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+    Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+15	12	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+36	0	Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_fines_printing.sql
+2	1	Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+6	0	docs/RELEASE_NOTES_NEXT/Circulation/selfcheck_printing_fines.adoc
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.selfcheck_fines_printing.sql
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/selfcheck_printing_fines.adoc
+
+commit 61cb8e54e3161a3bc2d78afe8e86a16bb09eed8c
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Mon Mar 14 15:10:14 2016 -0400
+
+    LP#1454871: whitespace cleanup
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+7	7	Open-ILS/src/templates/kpac/getit.tt2
+
+commit bd30cabe5cb87d69edd5fff8d52db9c8be4280db
+Author: Terran McCanna <tmccanna at georgialibraries.org>
+Date:   Thu Jun 11 18:15:13 2015 -0400
+
+    LP#1454871: Fix KPAC Hold Notification Preferences
+    
+    Correction to KPAC holds notification default preferences to allow for
+    SMS text messaging options.
+    
+    Prior to this correction, KPAC hold notifications would only pick up
+    hold preferences if set to email and/or phone. This correction allows
+    it to pick up email and/or phone and/or sms notification preferences.
+    
+    To test, set hold preferences to different options, place hold via the
+    KPAC, and then view the hold to see which preferences were recognized.
+    (May need to show columns for Phone Notify, Text Notify, and Email Notify.)
+    
+    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+    Signed-off-by: Josh Stompro <stomproj at larl.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+24	12	Open-ILS/src/templates/kpac/getit.tt2
+
+commit 3f2b5047fd02b7c691f32927f94db54c59d403c0
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Mon Mar 14 15:06:12 2016 -0400
+
+    LP#1548869: tidy up whitespace
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+6	6	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
+
+commit e84f1af9274df0c02bbf9c48ee78842726d69fb5
+Author: Terran McCanna <tmccanna at georgialibraries.org>
+Date:   Wed Feb 24 17:17:27 2016 -0500
+
+    LP#1548869 KPAC hold results screen not displaying complete info
+    
+    The getit_results.tt2 page was not displaying item title after
+    hold placement or after adding to a list. It was also not pulling
+    in the item id (which was needed for navigational links back to the
+    record) and was not pulling in the list name after adding an item
+    to a named list.
+    
+    This patch adds some logic to prevent subroutine conflicts, adds
+    missing parameters to a function call, and corrects a variable name.
+    
+    To test:
+    
+    Log in to the KPAC and perform the following actions:
+    
+    1. Place a successful hold (results screen should show item title
+       and pickup library, and provide links back to record page).
+    2. Place an unsuccessful hold (try placing a hold on an item you
+       already have a hold on - the results screen should show the item
+       title).
+    3. Add item to a temporary list (results screen should show item title).
+    4. Add item to a named list (results screen should show item title and
+       title of list it was added to).
+    
+    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+    Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+8	3	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
+1	1	Open-ILS/src/templates/kpac/getit_results.tt2
+
+commit 0c76ab2eaac7793d6ce846c2fc8b4877b4b563a0
+Author: Josh Stompro <stomproj at larl.org>
+Date:   Sat Feb 27 08:54:04 2016 -0600
+
+    LP#1549393 - Remove undef values from isbn and issn arrays.
+    
+    This prevents empty requests being sent to content providers.
+    
+    This caused a problem for us because invalid ISBNs were causing
+    requests to Content Cafe to fail, since Content Cafe returns an
+    error if there is a blank key sent along with valid ISBNs and UPCs.
+    
+    Specifically we had problems with DVD records from Baker & Taylor because
+    B&T creates unoffical ISBNs for the DVDs they sell.  Those ISBN's do
+    not validate when run through B::ISBN.
+    
+    ISSNs are also cleaned since they are validated and set to undef if
+    invalid just like ISBNs are.
+    
+    It shouldn't hurt to not send blank requests to providers in any case.
+    
+    To test:
+    1. I know this is a problem with Content Cafe, I don't
+    know if any other providers are effected.  Let me know
+    if you need Content Cafe credentials to test.
+    
+    2. Add an invalid ISBN 020a entry to a bib record that has added content.
+    9786316271976 is an example of a fake ISBN that doesn't
+    pass B::ISBN validation.  Or just make up a fake number.
+    
+    3. Clear out the memcache entries for that record.  In 2.9+ there
+    is a link to clear the cache in the record detail view under Permalink.
+    
+    4. Reload the record and the cover art and other added content should
+    not be displayed.  This is because the invalid ISBN gets set to undef
+    , and the undef gets sent to content cafe as a blank key request.
+    
+    5. Now apply the fix.  Clear the memcache entries for that bib, and now
+    the cover art should be displayed since the undef entries due to the invalid
+    ISBN's have been removed.
+    
+    Signed-off-by: Josh Stompro <stomproj at larl.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+5	0	Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
+
+commit 8a8aecb40d252866dbb036f16cb8082a3bd96c7f
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Mon Mar 14 14:46:19 2016 -0400
+
+    LP#1550495: stamp DB update
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+18	0	Open-ILS/src/sql/Pg/upgrade/0972.data.acq-cancel_reason-add-85.sql
+0	18	Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0972.data.acq-cancel_reason-add-85.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql
+
+commit 6499b8adad89a76352e7260f6bc0be747efeb625
+Author: Josh Stompro <stomproj at larl.org>
+Date:   Fri Mar 4 13:51:34 2016 -0600
+
+    LP#1550495 - Add EDI Cancel Code 85 - used by Baker & Taylor
+    
+    Baker & Taylor send back a quantity code 85 response when they cancel
+    a line item.  This code wasn't included as one of the built in EDI
+    codes so those line items were not being canceled automatically in
+    evergreen.
+    
+    The system looks for the response code + 1200 to find the cancel reason,
+    so this code is entered as ID 1285 in the acq.cancel_reason table.
+    
+    I received confirmation from another system that uses B&T as an EDI vendor
+    that they also receive code 85 responses when something gets canceled.
+    
+    Signed-off-by: Josh Stompro <stomproj at larl.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3	1	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+18	0	Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql
+6	0	docs/RELEASE_NOTES_NEXT/Acquisitions/add_cancel_reason_85.adoc
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql
+ create mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/add_cancel_reason_85.adoc
+
+commit b594a9524b799303b2837ca0800a0f791c9bcfde
+Author: Terran McCanna <tmccanna at georgialibraries.org>
+Date:   Wed Mar 2 12:16:43 2016 -0500
+
+    LP#1454884 Hold placed on grouped metabib result displays wrong title
+    
+    Prior to this change, a full/extended title displayed even on metarecord
+    holds that had different extended titles, which sometimes led to situations
+    where a video's full title displayed on a book hold, or vice versa. This
+    change displays the short version of the title on metarecord holds and
+    the full version on individual record holds.
+    
+    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+8	1	Open-ILS/src/templates/opac/parts/place_hold.tt2
+
+commit ce835a3ac9a7e4e294d7f55f24aa2c23cc34b338
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Fri Mar 4 11:31:06 2016 -0500
+
+    LP 1533331: Stamping upgrade script.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+    
+    Conflicts:
+    	Open-ILS/src/sql/Pg/002.schema.config.sql
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+15	0	Open-ILS/src/sql/Pg/upgrade/0971.schema.fix_protect_reserved_rows_from_delete.sql
+0	15	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_protect_reserved_rows_from_delete.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0971.schema.fix_protect_reserved_rows_from_delete.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_protect_reserved_rows_from_delete.sql
+
+commit c3b95afaad2d3ceb5a8e31607be6e5c4bea0d499
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Mon Feb 8 13:00:06 2016 -0500
+
+    LP#1533331 - Fix evergreen.protect_reserved_rows_from_delete() trigger function
+    
+    The fix for bug 1513554 included creating a general trigger function to prevent
+    the deletion of reserved table rows with an ID lower than a specified threshold.
+    Testing for that seemed to pass muster, but using the function in practice revealed
+    a failure to delete deletable rows either.
+    
+    This adds an explicit RETURN to the function, which fixes the issue.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+1	0	Open-ILS/src/sql/Pg/000.functions.general.sql
+11	1	Open-ILS/src/sql/Pg/t/lp1513554_do_not_delete_reserved_cancel_reasons.pg
+15	0	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_protect_reserved_rows_from_delete.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_protect_reserved_rows_from_delete.sql
+
+commit 3e2179e781d1c2440524439f4287b4c31b9a8825
+Author: Terran McCanna <tmccanna at georgialibraries.org>
+Date:   Wed Mar 2 17:11:40 2016 -0500
+
+    LP #1422932 TPAC: Holds history pager typo
+    
+    Corrects typo in link that caused page not found errors when attempting
+    to navigate multiple pages of hold history through My OPAC.
+    
+    Patch originally by Bob Wicksall.
+    
+    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1	1	Open-ILS/src/templates/opac/myopac/hold_history.tt2
+
+commit 43319f4b31639d90ac5167763aafd2e3a1dc273a
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Wed Mar 2 15:38:52 2016 -0500
+
+    LP#1516757: add Perl test case
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+9	2	Open-ILS/src/perlmods/t/12-OpenILS-SIP.t
+
+commit 188029b6a60e53c3a91d5374592ad04957dc5d74
+Author: Bill Erickson <berickxx at gmail.com>
+Date:   Mon Nov 16 14:48:23 2015 -0500
+
+    LP#1516757: ensure that SIP2 returns DOB correctly
+    
+    Parse dates of birth using the local timezone to ensure that the date in
+    the database will match what is sent to SIP clients.  Otherwise, the
+    date will be parsed as UTC and may result in the DoB value being offset
+    by one day in the SIP response.
+    
+    To test
+    -------
+    [1] Fire up a SIP client of some sort and retrieve a patron record;
+        verify that the patron's date of birth is correct, and not
+        offset by one day.
+    
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+8	1	Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
+1	1	Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+
+commit 036ce850ba7b625077078137704001128a6de025
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date:   Thu Jan 7 14:34:18 2016 -0500
+
+    LP#1531976: fix bringing up Mesage Center and Triggered Events
+    
+    This patch fixes a bug in the XUL staff client where
+    using Other -> Triggered Events from the patron page,
+    then Other -> Message Center, only brings up the Triggered
+    Events page in both cases (and vice versa).
+    
+    This patch works by preventing the deck code from thinking they are
+    the same page, despite both using the browser wrapper as their base URL.
+    
+    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+2	2	Open-ILS/xul/staff_client/server/patron/display.js
+
+commit 9335dcb1a146333b5ee3b2bd51f94234c33fc3f4
+Author: Jason Boyer <jboyer at library.in.gov>
+Date:   Wed Sep 2 16:20:13 2015 -0400
+
+    LP#1491571: Ignore Case when Checking PW Reset email
+    
+    Emails are not passwords and are not case sensitive;
+    while it is a good idea to require patrons to prove
+    they know the address associated with their account
+    it is not cool to deny them because they don't know
+    the capitalization of the value in the database.
+    
+    Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+    Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
+
+commit 00b1e695be7e693903630fe86eabdb8624f5c663
+Author: Bill Erickson <berickxx at gmail.com>
+Date:   Tue Jul 14 14:25:34 2015 -0400
+
+    LP#1474566 Avoid credit card payment rounding
+    
+    Calculate total amount for credit payment as integers to avoid rounding
+    errors w/ large sets of small billings.
+    
+    E.g. avoid trying to pay a fine of 9.999999999999 for a set of fines
+    which should add up to 10.00.
+    
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+    Signed-off-by: Ben Shum <ben at evergreener.net>
+
+5	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm
+
+commit 5f9ab6499c3539fd84b6517bca25ff59614a78fc
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Wed Feb 24 14:27:15 2016 -0500
+
+    LP#1206936 Stamping upgrade script; adding test
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+    
+    Conflicts:
+    	Open-ILS/src/sql/Pg/002.schema.config.sql
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+48	0	Open-ILS/src/sql/Pg/live_t/0959.schema.correct_mtbs_view.pg
+13	0	Open-ILS/src/sql/Pg/upgrade/0959.schema.correct_mtbs_view.sql
+0	13	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.correct_mtbs_view.sql
+ create mode 100644 Open-ILS/src/sql/Pg/live_t/0959.schema.correct_mtbs_view.pg
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0959.schema.correct_mtbs_view.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.correct_mtbs_view.sql
+
+commit ab29e9f89dd9443905008b228950376460fbd1df
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Mon Nov 30 09:48:26 2015 -0500
+
+    LP#1206936 - Fix wrong billing info in money.transaction_billing_summary
+    
+    The money.transaction_billing_summary view was showing the wrong
+    last billing type and last billing note for certain transactions.
+    This fix, from Dan Scott, in turn from Mike Rylander, recreates
+    that view so that it depends on the speedier and more accurate
+    money.materialized_billable_xact_summary view.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+7	9	Open-ILS/src/sql/Pg/080.schema.money.sql
+13	0	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.correct_mtbs_view.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.correct_mtbs_view.sql
+
+commit 7066a3200f96c0863445cf196e933f71df04f94e
+Author: Remington Steed <rjs7 at calvin.edu>
+Date:   Wed Dec 16 15:46:17 2015 -0500
+
+    LP#1526546 Sort copies by part label in holdings maint.
+    
+    This commit improves the sorting of copies on the Holdings Maintenance
+    screen in the XUL-based staff client. The previous code sorted the
+    copies by their barcodes after retrieval. This commit moves the sorting
+    logic into the search call and adds logic to first sort by the part
+    label sort key.
+    
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+17	3	Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
+
+commit bd8411c9e141ab3d6bf3cb3ac895b85bc43012b6
+Author: blake <blake at mobiusconsortium.org>
+Date:   Wed Dec 23 14:20:40 2015 -0600
+
+    LP#1466990: Detailed search results shows parts for items that dont have parts
+    
+    The part_label variable needs to be reset between iterations. The variable was still set
+    and bled from copy to copy. Testing this will require a search with details turned on.
+    The search result set needs to include a bib that has copies with parts (with at least
+    one copy invisible) and another bib that has copies without parts.
+    
+    Signed-off-by: blake <blake at mobiusconsortium.org>
+    Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1	0	Open-ILS/src/templates/opac/parts/misc_util.tt2
+
+commit bea2cddccfc17fcadeadf2c7c893b44aa43bd224
+Author: Bill Erickson <berickxx at gmail.com>
+Date:   Fri Feb 19 12:35:42 2016 -0500
+
+    Porting 2.8.4-2.8.5 / 2.8.5-2.8.6 DB upgrade scripts
+    
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+161	0	Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.8.5-upgrade-db.sql
+35	0	Open-ILS/src/sql/Pg/version-upgrade/2.8.5-2.8.6-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.8.5-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.8.5-2.8.6-upgrade-db.sql
+
+commit 862bfb900db4be48c6aabf534e6d748f3f562aa1
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date:   Fri Feb 19 12:00:24 2016 -0500
+
+    Forward port 2.9.1 to 2.9.2 upgrade script and server upgrade instructions.
+    
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+35	0	Open-ILS/src/sql/Pg/version-upgrade/2.9.1-2.9.2-upgrade-db.sql
+16	15	docs/installation/server_upgrade.txt
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.9.1-2.9.2-upgrade-db.sql
diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index a099119..8c01711 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.09';
+our $VERSION = '2.0903';
 
 1;
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..cc0f157 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-9-3";
 }
 
 __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 bf2df91..3cfd62e 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 ('0974', :eg_version); -- tmccanna/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.3', :eg_version);
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.9.2-2.9.3-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.9.2-2.9.3-upgrade-db.sql
new file mode 100644
index 0000000..fd99266
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.9.2-2.9.3-upgrade-db.sql
@@ -0,0 +1,180 @@
+--Upgrade Script for 2.9.2 to 2.9.3
+\set eg_version '''2.9.3'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.3', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('0959', :eg_version);
+
+CREATE OR REPLACE VIEW money.transaction_billing_summary AS
+    SELECT id as xact,
+        last_billing_type,
+        last_billing_note,
+        last_billing_ts,
+        total_owed
+      FROM money.materialized_billable_xact_summary;
+
+
+SELECT evergreen.upgrade_deps_block_check('0971', :eg_version);
+
+CREATE OR REPLACE FUNCTION evergreen.protect_reserved_rows_from_delete() RETURNS trigger AS $protect_reserved$
+BEGIN
+IF OLD.id < TG_ARGV[0]::INT THEN
+    RAISE EXCEPTION 'Cannot delete row with reserved ID %', OLD.id; 
+END IF;
+RETURN OLD;
+END
+$protect_reserved$
+LANGUAGE plpgsql;
+
+
+SELECT evergreen.upgrade_deps_block_check('0972', :eg_version); -- jstompro/gmcharlt
+
+-- LP#1550495 - Add Baker&Taylor EDI Quantity Cancel Code
+-- Insert EDI Cancel Reason 85 (1200 + 85 = 1285) if it doesn't already exist
+INSERT INTO acq.cancel_reason 
+   (org_unit, keep_debits, id, label, description)
+   SELECT 
+     1, 'f',( 85+1200),
+     oils_i18n_gettext(1285, 'Canceled: By Vendor', 'acqcr', 'label'),
+     oils_i18n_gettext(1285, 'Line item canceled by vendor', 'acqcr', 'description')
+   WHERE NOT EXISTS (
+    SELECT 1 FROM acq.cancel_reason where id=(85+1200)
+   );
+
+
+
+SELECT evergreen.upgrade_deps_block_check('0973', :eg_version); -- tmccanna/gmcharlt
+
+UPDATE action_trigger.event_definition SET template = 
+$$
+[%- USE date -%]
+[%- SET user = target -%]
+<div>
+    <style> li { padding: 8px; margin 5px; }</style>
+    <div>[% date.format %]</div>
+    <br/>   
+	Fines for:<br/>
+    [% user.family_name %], [% user.first_given_name %]
+    <ol>
+    [% FOR xact IN user.open_billable_transactions_summary %]
+        [% IF xact.balance_owed > 0 %]
+            <li>
+                <div>Details: 
+                    [% IF xact.xact_type == 'circulation' %]
+                        [%- helpers.get_copy_bib_basics(xact.circulation.target_copy).title -%]
+                    [% ELSE %]
+                        [%- xact.last_billing_type -%]
+                    [% END %]
+                </div>
+                <div>Total Billed: [% xact.total_owed %]</div>
+                <div>Total Paid: [% xact.total_paid %]</div>
+                <div>Balance Owed : [% xact.balance_owed %]</div>
+            </li>
+        [% END %]
+    [% END %]
+    </ol>
+</div>
+$$ WHERE id=13
+AND template = 
+$$
+[%- USE date -%]
+[%- SET user = target -%]
+<div>
+    <style> li { padding: 8px; margin 5px; }</style>
+    <div>[% date.format %]</div>
+    <br/>
+
+    [% user.family_name %], [% user.first_given_name %]
+    <ol>
+    [% FOR xact IN user.open_billable_transactions_summary %]
+        <li>
+            <div>Details: 
+                [% IF xact.xact_type == 'circulation' %]
+                    [%- helpers.get_copy_bib_basics(xact.circulation.target_copy).title -%]
+                [% ELSE %]
+                    [%- xact.last_billing_type -%]
+                [% END %]
+            </div>
+            <div>Total Billed: [% xact.total_owed %]</div>
+            <div>Total Paid: [% xact.total_paid %]</div>
+            <div>Balance Owed : [% xact.balance_owed %]</div>
+        </li>
+    [% END %]
+    </ol>
+</div>
+$$
+;
+
+
+SELECT evergreen.upgrade_deps_block_check('0974', :eg_version); -- tmccanna/gmcharlt
+
+UPDATE action_trigger.event_definition SET template = 
+$$
+[%- USE date -%]
+[%- SET user = target.0.usr -%]
+<div>
+    <style> li { padding: 8px; margin 5px; }</style>
+    <div>[% date.format %]</div>
+    <br/>
+    Holds for:<br/>
+	[% user.family_name %], [% user.first_given_name %]
+	
+    <ol>
+    [% FOR hold IN target %]
+        [%-
+            SET idx = loop.count - 1;
+            SET udata =  user_data.$idx;
+        -%]
+        <li>
+            <div>Title: [% udata.item_title %]</div>
+            <div>Author: [% udata.item_author %]</div>
+            <div>Pickup Location: [% udata.pickup_lib %]</b></div>
+            <div>Status: 
+                [%- IF udata.ready -%]
+                    Ready for pickup
+                [% ELSE %]
+                    #[% udata.queue_position %] of 
+                      [% udata.potential_copies %] copies.
+                [% END %]
+            </div>
+        </li>
+    [% END %]
+    </ol>
+</div>
+
+$$ WHERE id=12
+AND template = 
+$$
+[%- USE date -%]
+[%- SET user = target.0.usr -%]
+<div>
+    <style> li { padding: 8px; margin 5px; }</style>
+    <div>[% date.format %]</div>
+    <br/>
+
+    [% user.family_name %], [% user.first_given_name %]
+    <ol>
+    [% FOR hold IN target %]
+        [%-
+            SET idx = loop.count - 1;
+            SET udata =  user_data.$idx
+        -%]
+        <li>
+            <div>Title: [% hold.bib_rec.bib_record.simple_record.title %]</div>
+            <div>Author: [% hold.bib_rec.bib_record.simple_record.author %]</div>
+            <div>Pickup Location: [% hold.pickup_lib.name %]</div>
+            <div>Status: 
+                [%- IF udata.ready -%]
+                    Ready for pickup
+                [% ELSE %]
+                    #[% udata.queue_position %] of [% udata.potential_copies %] copies.
+                [% END %]
+            </div>
+        </li>
+    [% END %]
+    </ol>
+</div>
+$$
+;
+
+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 dd10653..10e9255 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_9_3</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..2b1f533 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_9_3");
 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..285d0fd 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.9"
 !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..2aec877
--- /dev/null
+++ b/README
@@ -0,0 +1,641 @@
+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), Debian Squeeze(6.0), Ubuntu Trusty Tahr (14.04), 
+    Ubuntu Precise Pangolin (12.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 many distributions, it is necessary to install PostgreSQL 9.1+ from external
+   repositories.
++
+  * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the
+    *root* Linux account and add the following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+deb http://backports.debian.org/debian-backports squeeze-backports main contrib
+------------------------------------------------------------------------------
++
+  * Ubuntu Precise and Trusty 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`, `debian-squeeze`, `fedora`, 
+   `ubuntu-trusty`, or `ubuntu-precise` 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 Precise, Trusty 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
+------------------------------------------------------------------------------
+
+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_9_3 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
+-------------------------------
+
+1. 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 and Ubuntu Precise
+[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 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
+------------------------------------------------------------------------------
++
+2. 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
+------------------------------------------------------------------------------
++
+3. 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/`.
+4. 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`.
+5. Configure Apache with performance settings appropriate for Evergreen:
+  * (Debian and Ubuntu): As the *root* Linux account, edit
+    `/etc/apache2/apache2.conf`:
+  * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`:
+    a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of
+       a request timing out unexpectedly, but increase the risk of using up
+       all available Apache child processes.
+    b. 'Optional': Change `MaxKeepAliveRequests` to `100`
+    c. (Debian Wheezy, Ubuntu Precise, and Fedora) Update the prefork configuration 
+       section to suit your environment. The following settings apply to a busy 
+       system:
++
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+   StartServers           20
+   MinSpareServers         5
+   MaxSpareServers        15
+   MaxClients            150
+   MaxRequestsPerChild 10000
+</IfModule>
+------------------------------------------------------------------------------
+    d. (Ubuntu Trusty, Debian Jessie) As the *root* user, edit 
+       /etc/apache2/mods-available/mpm_prefork.conf to match the above values.  
+       Then, also as the *root* user, enable the mpm_prefork module by doing:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+6. (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/`.
+7. (Debian Wheezy and Ubuntu Precise): 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, Debian Jessie):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default  # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+8. (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
+------------------------------------------------------------------------------
++
+9. 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 the following section, sets the database
+connection information in `opensrf.xml` for you.
+
+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-debian-squeeze
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+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:
+
+.(Ubuntu Precise)
+[source,bash]
+---------------------------------------------------------------------------------
+cpan Rose::URI
+---------------------------------------------------------------------------------
+
+.(Debian "wheezy" and Ubuntu Trusty) 
+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 585ab00..94ce1e9 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.9.3, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.9.3])
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index abf9063..ca3c2e9 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -48,8 +48,8 @@ the http://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
 +
 [source, bash]
 -----------------------------------------------
-wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.9.2.tar.gz
-tar xzf Evergreen-ILS-2.9.2.tar.gz
+wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.9.3.tar.gz
+tar xzf Evergreen-ILS-2.9.3.tar.gz
 -----------------------------------------------
 +
 [NOTE]
@@ -59,7 +59,7 @@ For the latest edition of Evergreen, check the http://evergreen-ils.org/egdownlo
 +
 [source, bash]
 ---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.2
+cd /home/opensrf/Evergreen-ILS-2.9.3
 ---------------------------------------------
 +
 On the next command, replace `[distribution]` with one of these values for your
@@ -85,7 +85,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
 +
 [source, bash]
 ------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.2
+cd /home/opensrf/Evergreen-ILS-2.9.3
 PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
 make
 ------------------------------------------------------------
@@ -96,8 +96,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
 +
 [source, bash]
 ------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.2
-make STAFF_CLIENT_STAMP_ID=rel_2_9_2 install
+cd /home/opensrf/Evergreen-ILS-2.9.3
+make STAFF_CLIENT_STAMP_ID=rel_2_9_3 install
 ------------------------------------------------------------
 +
 . As the *root* user, change all files to be owned by the opensrf user and group:
@@ -113,7 +113,7 @@ chown -R opensrf:opensrf /openils
 -----------------------------------------------------------
 cd /openils/var/web/xul/
 rm server
-ln -sf rel_2_9_2/server server
+ln -sf rel_2_9_3/server server
 ----------------------------------------------------------
 +
 . As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -133,7 +133,7 @@ Copying these configuration files will remove any customizations you have made t
 +
 [source, bash]
 -------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.2
+cd /home/opensrf/Evergreen-ILS-2.9.3
 perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
 --create-offline --database evergreen --host localhost --user evergreen --password evergreen
 -------------------------------------------------------------------------
@@ -157,21 +157,21 @@ The diff command can be used to show the differences between the distribution ve
 +
 [source, bash]
 ----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.9.2/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.9.3/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
 ----------------------------------------------------------
 +
 .. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
 +
 [source, bash]
 ----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.9.2/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.9.3/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
 ----------------------------------------------------------
 +
 .. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
 +
 [source, bash]
 ----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.9.2/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.9.3/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
 ----------------------------------------------------------
 
 Upgrade the Evergreen database schema
@@ -194,7 +194,7 @@ anything goes wrong during the upgrade.
 =============
 Evergreen provides incremental upgrade scripts that allow you to upgrade
 from one minor version to the next until you have the current version of
-the schema. For example, if you want to upgrade from 2.5.1 to 2.9.2, you
+the schema. For example, if you want to upgrade from 2.5.1 to 2.9.3, you
 would run the following upgrade scripts:
 
 - 2.5.1-2.5.2-upgrade-db.sql
@@ -214,13 +214,14 @@ would run the following upgrade scripts:
 - 2.8.4-2.9.0-upgrade-db.sql (this is a major version upgrade)
 - 2.9.0-2.9.1-upgrade-db.sql
 - 2.9.1-2.9.2-upgrade-db.sql
+- 2.9.2-2.9.3-upgrade-db.sql
 
 Note that you do *not* want to run additional 2.5 scripts to upgrade to the
 newest version of 2.5, since currently there is no automated way to upgrade
 from 2.5.4+ to 2.6. Only upgrade as far as necessary to reach the major
 version upgrade script (in this example, as far as 2.5.3).
 
-To upgrade across multiple major versions (e.g. from 2.3.0 to 2.9.2), use
+To upgrade across multiple major versions (e.g. from 2.3.0 to 2.9.3), use
 the same logic to utilize the provided major version upgrade scripts. For
 example:
 
@@ -236,7 +237,7 @@ example:
 - 2.7.4-2.8.0-upgrade-db.sql
 - (run all incremental scripts from 2.8.0 to 2.8.4)
 - 2.8.4-2.9.0-upgrade-db.sql
-- (run all incremental scripts from 2.9.0 to 2.9.2)
+- (run all incremental scripts from 2.9.0 to 2.9.3)
 =============
 
 [CAUTION]
@@ -250,8 +251,8 @@ as a user with the ability to connect to the database server.
 
 [source, bash]
 ----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.2/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.8.4-2.9.0-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-2.9.3/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/2.9.2-2.9.3-upgrade-db.sql evergreen
 ----------------------------------------------------------
 
 [TIP]

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


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list