projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19ce809 eed5316)
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ubuntu-14-04... user/csharp/ubuntu-14-04-makefile-signoff
authorChris Sharp <csharp@georgialibraries.org>
Mon, 14 Jul 2014 16:53:07 +0000 (12:53 -0400)
committerChris Sharp <csharp@georgialibraries.org>
Mon, 14 Jul 2014 16:53:07 +0000 (12:53 -0400)
Conflicts:
Open-ILS/src/extras/install/Makefile.ubuntu-trusty
docs/installation/server_installation.txt

1  2 
docs/installation/server_installation.txt patch | diff1 | diff2 | blob | history

diff --cc docs/installation/server_installation.txt
index b8f9943,f7c2fd8..ac57a3a
--- 1/docs/installation/server_installation.txt
--- 2/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@@ -319,7 -307,7 +306,6 @@@ a2ensite eg.con
  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:
Evergreen ILS