Merge commit 'zf2/master' into livedocx-2.0

abutme · May 5, 2011 · 5c51310 · 5c51310
2 parents 8f97e22 + 795c7f2
commit 5c51310
Show file tree

Hide file tree

Showing 5,386 changed files with 337,784 additions and 214,357 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2010, Zend Technologies USA, Inc.
+Copyright (c) 2005-2011, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/bin/classmap_generator.php b/bin/classmap_generator.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -114,8 +114,8 @@
     echo "Creating class file map for library in '$path'..." . PHP_EOL;
 }
 
-// Get the ClassFileLocater, and pass it the library path
-$l = new \Zend\File\ClassFileLocater($path);
+// Get the ClassFileLocator, and pass it the library path
+$l = new \Zend\File\ClassFileLocator($path);
 
 // Iterate over each element in the path, and create a map of 
 // classname => filename, where the filename is relative to the library path

diff --git a/bin/zf.bat b/bin/zf.bat
@@ -12,7 +12,7 @@ REM obtain it through the world-wide-web, please send an email
 REM to [email protected] so we can send you a copy immediately.
 REM
 REM Zend
-REM Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+REM Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
 REM http://framework.zend.com/license/new-bsd     New BSD License