Merge branch 'bug_7368' into 3.14-master

diff --git a/edithelp.pl b/edithelp.pl
index 28586b3..de4e9b1 100755 (executable)
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -96,7 +96,7 @@ elsif ( $type eq 'modify' ) {
                $error = "Cannot read file: '$file'.";
        } else {
                (-w $file) or $error = 
-                       "WARNING: You will not be able save, because your webserver cannot write to '$file'. Contact your admin about help file permissions.";
+                       "WARNING: You will not be able to save, because your webserver cannot write to '$file'. Contact your admin about help file permissions.";
        open (my $fh, '<', $file) or die "Cannot read file '$file'";            # unlikely death, since we just checked
                my $help = '';
         while ( <$fh> ) {

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index a6760d4..24097ed 100644 (file)
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -468,7 +468,7 @@ CREATE TABLE collections_tracking (
 ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;
 
 --
--- Table structure for table `borrower_branch_circ_rules`
+-- Table structure for table `branch_borrower_circ_rules`
 --
 
 DROP TABLE IF EXISTS `branch_borrower_circ_rules`;