Merge branch 'master' into 5.2-devel

* master:
  Update 3- IMPORT.rdoc
  Update Apache configuration to 2.4
  Update 3- IMPORT.rdoc
  Fix rism-digital#752, make the new groups properly identified

# Conflicts:
#	2- INSTALL.rdoc

Author: xhero

2- INSTALL.rdoc

@@ -147,16 +147,14 @@ With MySQL 64 bit binaries, add:
 
 Example Apache configuration:
 
- # create /usr/local/etc/apache22/Includes/default.conf
+ # create /usr/local/etc/apache/Includes/default.conf
  # and add default site:
  <VirtualHost *:80>
          # ServerName www..org
          DocumentRoot /var/rails/rism-ch/public
          <Directory "/var/rails/rism-ch/public">
-                 Options All -Indexes +ExecCGI -Includes +MultiViews
-                 AllowOverride All
-                 Order allow,deny
-                 Allow from all
+                 Options All -Indexes +ExecCGI -Includes +MultiViewsny
+                 Require all granted
          </Directory>
          RailsEnv production
  </VirtualHost>
@@ -183,6 +181,4 @@ Also it is goot to block access to SOLR:
 
 == Add clean up in crontab for blacklight
 
- 0 2 * * * cd $PATH_TO && $PATH_TO/bin/rake blacklight:delete_old_searches[7] RAILS_ENV=production
- 
-  
+ 0 2 * * * cd $PATH_TO && $PATH_TO/bin/rake blacklight:delete_old_searches[7] RAILS_ENV=production

3- IMPORT.rdoc

@@ -2,10 +2,10 @@
 
 Marc records can be imported into muscat. They can be fed and imported using the command line script:
 
- ./script/runner housekeeping/import/import_from_marc.rb $FILE $MODEL
+ rails runner housekeeping/import/import_from_marc.rb $FILE $MODEL
 
 Records for thesaurus models like Places, StandardTerms etc., which are not related to marc, should be imported first with:
- ./script/runner housekeeping/import/import_thesaurus_from_marc.rb $File
+ rails runner housekeeping/import/import_thesaurus_from_marc.rb $File
 
 <tt>$FILE</tt> contains all the Marc records in MarcXML format.
 <tt>$MODEL</tt> refers to the model of the records (e.g. Source, Person etc.)
@@ -27,14 +27,6 @@ For imported fields without $0, a match will be search on the other fields (name
 
 For the StandardTitle authority, fields without a $0 (e.g., 740) can create problems during the import if a StandardTitle without $0 (740) is imported before a value with a $0 (e.g., 240). The first one will cause a new ext_id to be generated which will then cause a duplicates validation error with the one with the ext_id. The fix is either to temporarily allow duplicates in the StandardTitle class, or to add a $0 value to the 740 field to the data to be imported.
 
-== Source count
-Many object, like Person, Library, StandardTitle, ... cointain a field <tt>src_count</tt> which caches the total Sources
-related to any of them. This field is not updated during import, and a separate script needs to be run afterwards:
-
- rails r housekeeping/correct/01_update_src_count.rb
-	
-It will update all the ms_counts for each class. 
-
 == Importing from XML data
 
 XML data can be converted to text MARC using an xsl2 stylesheet in housekeeping/import/housekeeping/import/marcxml2marctxt.xsl. In this example Saxon HE version 9 is used (http://sourceforge.net/projects/saxon/files/Saxon-HE/), which requires a java runtime to be installed: