Merge remote-tracking branch 'upstream/master' into patch-two-level-cache-updates

.gitignore

@@ -1 +1,12 @@
 tests/Zend/Db/Table/_files/cachefiles/*
+tests/Zend/Auth/Adapter/OpenId/_files/*
+tests/Zend/Filter/_files/Compress/*
+tests/Zend/Filter/_files/Users/*
+tests/Zend/OpenId/Provider/Storage/_files/*
+tests/Zend/OpenId/_files/*
+tests/Zend/Translate/Adapter/_files/zend_cache---internal-metadatas---testid
+tests/Zend/Translate/Adapter/_files/zend_cache---testid
+vendor/*
+composer.lock
+bin/dbunit
+bin/phpunit

.travis.yml

@@ -1,17 +1,23 @@
 language: php
+
 php:
-  - "5.2"
-  - "5.3"
-  - "5.4"
-  - "5.5"
+  - 5.2
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
 
 env: TMPDIR=/tmp
 
-before_install:
- - phpenv rehash
+install:
  - sh ./tests/install_dependencies.sh
  - phpenv rehash
 
 script:
  - cd tests/
  - php runalltests.php
+ 
+matrix:
+  allow_failures:
+   - php: hhvm

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2012, Zend Technologies USA, Inc.
+Copyright (c) 2005-2014, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -7,16 +7,61 @@ Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch=
 RELEASE INFORMATION
 ===================
 
-Zend Framework 1.12.4dev Release ([INSERT REV NUM HERE]).
-Released on <Month> <Day>, <Year>.
+Zend Framework 1.12.4 Release.
+Released on March 06, 2014.
+
+SECURITY FIXES FOR 1.12.4
+-------------------------
+
+- **ZF2014-01:** Potential XXE/XEE attacks using PHP functions:
+  `simplexml_load_*`, `DOMDocument::loadXML`, and `xml_parse`. A new component,
+  `Zend_Xml`, was introduced to mitigate XML eXternal Entity and XML Entity
+  Expansion vectors that are present in older versions of libxml2 and/or PHP.
+  Components that could contain these vectors include:
+
+    - `Zend_Amf`
+    - `Zend_Config`
+    - `Zend_Dom`
+    - `Zend_Feed`
+    - `Zend_Gdata`
+    - `Zend_Json`
+    - `Zend_Locale`
+    - `Zend_Mobile_Push`
+    - `Zend_Rest_Client`
+    - `Zend_Search_Lucene`
+    - `Zend_Serializer_Adapter_Wddx`
+    - `Zend_Service_Amazon`
+    - `Zend_Service_AudioScrobbler`
+    - `Zend_Service_Delicious`
+    - `Zend_Service_Ebay`
+    - `Zend_Service_Flickr`
+    - `Zend_Service_SlideShare`
+    - `Zend_Service_SqlAzure`
+    - `Zend_Service_Technorati`
+    - `Zend_Service_WindowsAzure`
+    - `Zend_Service_Yahoo`
+    - `Zend_Soap`
+    - `Zend_Translate`
+
+  If you use one or more of these components, we strongly urge that you upgrade
+  immediately.
+
+- **ZF2014-02:** Potential security issue in login mechanism of `Zend_OpenId`
+  consumer. Using the Consumer component in conjunction with a malicious OpenID
+  provider, one could login to a service using an arbitrary OpenID Identity
+  without requiring credentials, allowing impersonation of an OpenID Identity.
+  If you use this component, we strongly urge that you upgrade immediately.
 
 IMPORTANT FIXES FOR 1.12.4
 --------------------------
 
+
 - [#221](https://github.com/zendframework/zf1/pull/221) removes the TinySrc view
   helper, as the TinySrc service no longer exists.
 - [#222](https://github.com/zendframework/zf1/pull/222) removes the InfoCard
   component, as the CardSpace service no longer exists.
+- [#271](https://github.com/zendframework/zf1/pull/271) removes the Nirvanix
+  component, as the Nirvanix service shut down in October 2013.
 
 IMPORTANT FIXES FOR 1.12.3
 --------------------------

bin/classmap_generator.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

bin/zf.bat

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

bin/zf.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Tool
  * @subpackage Framework
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Tool
  * @subpackage Framework
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZF

bin/zf.sh

@@ -14,7 +14,7 @@
 # to license@zend.com so we can send you a copy immediately.
 #
 # Zend
-# Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # http://framework.zend.com/license/new-bsd     New BSD License
 #############################################################################
 

composer.json

@@ -26,5 +26,9 @@
         "branch-alias": {
             "dev-master": "1.12.x-dev"
         }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*",
+        "phpunit/dbunit": "1.3.*"
     }
 }

demos/Zend/Cloud/cloudexp/application/Bootstrap.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap

demos/Zend/Cloud/cloudexp/application/controllers/DocumentController.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocumentController extends Zend_Controller_Action

demos/Zend/Cloud/cloudexp/application/controllers/ErrorController.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ErrorController extends Zend_Controller_Action

demos/Zend/Cloud/cloudexp/application/controllers/IndexController.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IndexController extends Zend_Controller_Action

demos/Zend/Cloud/cloudexp/application/controllers/QueueController.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueueController extends Zend_Controller_Action

demos/Zend/Cloud/cloudexp/application/controllers/StorageController.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StorageController extends Zend_Controller_Action

demos/Zend/Cloud/cloudexp/library/CloudExplorer/ResourceInjector.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CloudExplorer_ResourceInjector extends Zend_Controller_Action_Helper_Abstract

demos/Zend/Feeds/consume-feed.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Feed
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php

@@ -10,7 +10,7 @@ require_once 'Zend/Gdata/Query.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/3LeggedOAuth/index.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/Blogger.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -58,7 +58,7 @@ Zend_Loader::loadClass('Zend_Gdata_ClientLogin');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleCRUD

demos/Zend/Gdata/BooksBrowser/index.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/BooksBrowser/interface.html

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  *
  */

demos/Zend/Gdata/Calendar.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/Docs.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/Gapps.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/InstallationChecker.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/MyLibrary/demo.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/Photos.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/Spreadsheet-ClientLogin.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -56,7 +56,7 @@ Zend_Loader::loadClass('Zend_Http_Client');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleCRUD

demos/Zend/Gdata/YouTubeVideoApp/index.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/YouTubeVideoApp/operations.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/YouTubeVideoApp/session_details.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Gdata
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/YouTubeVideoApp/video_app.js

@@ -13,7 +13,7 @@
  *
  * @category   Zend
  * @package    Zend_Gdata
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/YouTubeVideoBrowser/index.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Gdata/YouTubeVideoBrowser/interface.html

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 -->

demos/Zend/Gdata/YouTubeVideoBrowser/video_browser.js

@@ -14,7 +14,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Locale/AllLanguages.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Locale
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Mail/SimpleMailer.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -47,7 +47,7 @@ require_once 'Zend/Loader.php';
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Demo_Zend_Mail_SimpleMailer

demos/Zend/OpenId/mvc_auth/application/controllers/ErrorController.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -31,7 +31,7 @@ require_once 'Zend/Controller/Action.php';
  * @package    Zend_OpenId
  * @subpackage Demos
  * @uses       Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ErrorController extends Zend_Controller_Action

demos/Zend/OpenId/mvc_auth/application/controllers/IndexController.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -34,7 +34,7 @@ require_once 'Zend/Auth.php';
  * @package    Zend_OpenId
  * @subpackage Demos
  * @uses       Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IndexController extends Zend_Controller_Action

demos/Zend/OpenId/mvc_auth/html/index.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/OpenId/test_auth.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/OpenId/test_consumer.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/OpenId/test_server.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Pdf/demo.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/ProgressBar/JsPush.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_ProgressBar
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -162,4 +162,4 @@ if (isset($_GET['progress'])) {
     </div>
     <div id="progressBar"><div id="progressDone"></div></div>
 </body>
-</html>
+</html>

demos/Zend/ProgressBar/Upload.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_ProgressBar
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/ProgressBar/ZendForm.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_ProgressBar
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Search/Lucene/feed-search/create-index.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Search/Lucene/feed-search/search-index.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/Search/Lucene/indexing/CreateIndex.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@ require_once 'Zend/Search/Lucene.php';
  * @package    Zend_Search_Lucene
  * @subpackage Demos
  * @uses       Zend_Search_Lucene_Document
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FileDocument extends Zend_Search_Lucene_Document

demos/Zend/Service/LiveDocx/Helper.php

@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,7 +28,7 @@ require_once 'Zend/Date.php';
  * @category   Demos
  * @package    Demos_Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Demos_Zend_Service_LiveDocx_Helper
@@ -174,4 +174,4 @@ class Demos_Zend_Service_LiveDocx_Helper
     {
         return wordwrap($str, self::LINE_LENGTH);
     }
-}
+}

demos/Zend/Service/LiveDocx/configuration.php.dist

@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,4 +41,4 @@
  *
  */
 define('DEMOS_ZEND_SERVICE_LIVEDOCX_USERNAME', false);
-define('DEMOS_ZEND_SERVICE_LIVEDOCX_PASSWORD', false);
+define('DEMOS_ZEND_SERVICE_LIVEDOCX_PASSWORD', false);

demos/Zend/WebServices/Amazon/amazon-search.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -211,4 +211,4 @@ if (strtolower($_SERVER['REQUEST_METHOD']) == 'post') {
 ?>
 <p id="poweredby" style="text-align: center; font-size: 9px;">Powered by the <a href="http://framework.zend.com">Zend Framework</a></p>
 </body>
-</html>
+</html>

demos/Zend/WebServices/Flickr/flickr-composite.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Flickr
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/WebServices/Flickr/flickr-search.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Flickr
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/WebServices/Protocols/xmlrpc-upc-lookup.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

demos/Zend/WebServices/Yahoo/yahoo-multi-search.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Yahoo
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -150,4 +150,4 @@ if (isset($_POST) && strtolower($_SERVER['REQUEST_METHOD']) == 'post') {
 ?>
 <p id="poweredby" style="text-align: center; font-size: 9px;">Powered by the <a href="http://framework.zend.com">Zend Framework</a></p>
 </body>
-</html>
+</html>

demos/Zend/Wildfire/application/controllers/ErrorController.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ErrorController extends Zend_Controller_Action

demos/Zend/Wildfire/application/controllers/IndexController.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -26,7 +26,7 @@ require_once 'Zend/Controller/Action.php';
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IndexController extends Zend_Controller_Action

demos/Zend/Wildfire/application/controllers/ZendDbProfilerFirebugController.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -26,7 +26,7 @@ require_once 'Zend/Controller/Action.php';
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZendDbProfilerFirebugController extends Zend_Controller_Action

demos/Zend/Wildfire/application/controllers/ZendLogWriterFirebugController.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@ require_once 'Zend/Wildfire/Plugin/FirePhp.php';
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZendLogWriterFirebugController extends Zend_Controller_Action

demos/Zend/Wildfire/application/controllers/ZendWildfirePluginFirePhpController.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -26,7 +26,7 @@ require_once 'Zend/Controller/Action.php';
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZendWildfirePluginFirePhpController extends Zend_Controller_Action

demos/Zend/Wildfire/public/index.php

@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

documentation/manual/Makefile

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/ar/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/ar/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(Makefile.in)
-AC_COPYRIGHT([Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)])
+AC_COPYRIGHT([Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)])
 
 XINC=xinc
 XEP=xep

documentation/manual/bg/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/bg/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(Makefile.in)
-AC_COPYRIGHT([Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)])
+AC_COPYRIGHT([Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)])
 
 XINC=xinc
 XEP=xep

documentation/manual/cs/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/cs/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(Makefile.in)
-AC_COPYRIGHT([Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)])
+AC_COPYRIGHT([Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)])
 
 XINC=xinc
 XEP=xep

documentation/manual/de/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/de/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(Makefile.in)
-AC_COPYRIGHT([Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)])
+AC_COPYRIGHT([Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)])
 
 FOP=fop
 XSLTPROC=xsltproc

documentation/manual/de/module_specs/Zend_Service.xml

@@ -32,7 +32,6 @@
         <listitem><para><link linkend="zend.service.delicious">Del.icio.us</link></para></listitem>
         <listitem><para><link linkend="zend.service.flickr">Flickr</link></para></listitem>
         <listitem><para><link linkend="zend.service.livedocx">LiveDocx</link></para></listitem>
-        <listitem><para><link linkend="zend.service.nirvanix">Nirvanix</link></para></listitem>
         <listitem><para><link linkend="zend.service.recaptcha">ReCaptcha</link></para></listitem>
         <listitem><para><link linkend="zend.service.slideshare">SlideShare</link></para></listitem>
         <listitem><para><link linkend="zend.service.strikeiron">StrikeIron</link></para></listitem>

documentation/manual/de/module_specs/Zend_Service_Nirvanix.xml

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 24249 -->
-<!-- Reviewed: no -->
-<sect1 id="zend.service.nirvanix">
-    <title>Zend_Service_Nirvanix</title>
-
-    <sect2 id="zend.service.nirvanix.introduction">
-        <title>Einführung</title>
-
-        <para>
-            Nirvanix bietet ein Internet Media File System (IMFS), einen Internet Speicher Service
-            der es Anwendungen erlaubt Dateien hochzuladen, zu speichern, zu organisieren und
-            nachhaltig auf Sie zuzugreifen durch Verwendung eines Standard Web Service Interfaces.
-            Ein IMFS ist ein verteiltes geclustertes Dateisystem, auf das über das Internet
-            zugegriffen wird, und das für die Handhabung mit Mediendateien (Audio, Video, usw.)
-            optimiert ist. Das Ziel eines IMFA ist es massive Skalarität zu bieten um den
-            Problemen des Wachstums der Medienspeicher Herr zu werden, mit garantiertem Zugriff und
-            Erreichbarkeit unabhängig von Zeit und Ort. Letztendlich, gibt eine IMFS Anwendung die
-            Möglichkeit auf Daten sicher zuzugreifen, ohne die großen Fixkosten die mit der
-            Beschaffung und Einrichtung von physikalischen Speicherbänken verbunden sind.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.registering">
-        <title>Registrierung bei Nirvanix</title>
-
-        <para>
-            Bevor man mit <classname>Zend_Service_Nirvanix</classname> beginnt, muß man sich zuerst
-            für einen Account anmelden. Bitte sehen Sie auf die
-            <ulink url="http://www.nirvanix.com/gettingStarted.aspx">Wie man anfängt</ulink> Seite
-            auf der Nirvanix Webseite für weitere Informationen.
-        </para>
-
-        <para>
-            Nach der Registrierung erhält man einen Benutzernamen, ein Passwort und einen
-            Anwendungsschlüssel. Alle drei werden benötigt um
-            <classname>Zend_Service_Nirvanix</classname> zu verwenden.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.apiDocumentation">
-        <title>API Dokumentation</title>
-
-        <para>
-            Der Zugriff auf Nirvanix IMFS ist durch beide, sowohl ein <acronym>SOAP</acronym> als
-            auch ein schnelleres REST Service möglich. <classname>Zend_Service_Nirvanix</classname>
-            bietet einen relativ dünnen <acronym>PHP</acronym> 5 Wrapper um das REST Service.
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> zielt darauf ab das Nirvanix REST Service
-            einfacher zu verwenden aber zu verstehen dass das Service selbst trotzdem noch
-            essentiell ist um mit Nirvanix erfolgreich zu sein.
-        </para>
-
-        <para>
-            Die <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-                <acronym>API</acronym> Dokumentation</ulink> bietet eine Übersicht sowie detailierte
-            Informationen über die Verwendung des Services. Bitte machen Sie sich mit diesem
-            Dokument vertraut und referieren Sie darauf wenn Sie
-            <classname>Zend_Service_Nirvanix</classname> verwenden.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.features">
-        <title>Features</title>
-
-        <para>
-            Nirvanix's REST Service kann mit <acronym>PHP</acronym> effektiv verwendet werden
-            alleine mit Hilfe der <ulink url="http://www.php.net/simplexml">SimpleXML</ulink>
-            Erweiterung und <classname>Zend_Http_Client</classname>. Trotzdem ist deren Verwendung
-            auf diesem Weg irgendwie unbequem wegen der wiederholenden Operationen, wie die Übergabe
-            des Session Tokens bei jeder Anfrage und der wiederholten Prüfung des Antwort Bodys nach
-            Fehlercodes.
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> bietet die folgenden Funktionalitäten:
-
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        Einen einzelnen Punkt für die Konfiguration der Nirvanix Authentifizierungs
-                        Daten die mit den Nirvanix Namespaces verwendet werden können.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Ein Proxy Objekt das viel bequemer ist als ein <acronym>HTTP</acronym>
-                        Client alleine, hauptsächlich wird die Notwendigkeit entfernt die
-                        <acronym>HTTP</acronym> POST Anfrage manuell zu erstellen um auf das REST
-                        Service zugreifen zu können.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Ein verantwortlicher Wrapper der jeden Antwortbody parst und eine Ausnahme
-                        wirft wenn ein Fehler aufgetreten ist, was die Notwendigkeit mildert
-                        widerholt den Erfolg der vielen Kommandos zu prüfen.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Zusätzliche bequeme Methoden für einige oder die meisten üblichen
-                        Operationen.
-                    </para>
-                </listitem>
-            </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.storing-your-first">
-        <title>Der Anfang</title>
-
-        <para>
-            Sobald man in Nirvanix registriert ist, ist man bereit die ersten Datein am IMFS zu
-            speichern. Die üblichste Operation die man am IMFS benötigt ist der Erstellung einer
-            neuen Datei, das Herunterladen bestehender Dateien, und das Löschen einer Datei.
-            <classname>Zend_Service_Nirvanix</classname> bietet bequeme Methoden für diese drei
-            Operationen.
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'Dein-Benutzername',
-              'password' => 'Dein-Passwort',
-              'appKey'   => 'Dein-App-Schlüssel');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$imfs->putContents('/foo.txt', 'zu speichernder Inhalt');
-
-echo $imfs->getContents('/foo.txt');
-
-$imfs->unlink('/foo.txt');
-]]></programlisting>
-
-        <para>
-            Der erste Schritt um <classname>Zend_Service_Nirvanix</classname> zu verwenden ist immer
-            sich gegenüber dem Service zu authentifizieren. Das wird durch die Übergabe der
-            Anmeldedaten an den Kontruktor von <classname>Zend_Service_Nirvanix</classname>, wie
-            oben, gemacht. Das assoziative Array wurd direkt an Nirvanix als POST Parameter
-            übergeben.
-        </para>
-
-        <para>
-            Nirvanix teilt seine WebService in <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999879">Namespaces</ulink>
-            auf. Jeder Namespace kapselt eine Gruppe von zusammengehörenden Operationen. Nachdem
-            man eine Instanz von <classname>Zend_Service_Nirvanix</classname> erhalten hat, muß die
-            <methodname>getService()</methodname> Methode aufgerufen werden um einen Proxy für den
-            Namespace zu erhalten den man verwenden will. Oben wird ein Proxy für den
-            <constant>IMFS</constant> Namespace erstellt.
-        </para>
-
-        <para>
-            Nachdem man den Proxy für den Namespace hat den man verwenden will, muß die Methode auf
-            Ihm aufgerufen werden. Der Proxy erlaubt es jedes Kommando zu verwenden das in der
-            REST <acronym>API</acronym> vorhanden ist. Der Proxy kann auch bequeme Methoden
-            verfügbar machen, welche Kommandos des Web Services wrappen. Das obige Beispiel zeigt
-            die Verwendung der bequemen IMFS Methoden um eine neue Datei zu erstellen, sie zu
-            empfangen, diese Datei anzuzeigen und letztendlich die Datei zu löschen.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.understanding-proxy">
-        <title>Den Proxy verstehen</title>
-
-        <para>
-            Im vorherigen Beispiel wurde die <methodname>getService()</methodname> Methode verwendet
-            um ein Proxy Objekt zum <constant>IMFS</constant> Namespace zurückzugeben. Das Proxy
-            Objekt erlaubt es das Nirvanix REST Service in einer Art zu verwenden die näher daran
-            ist wie normalerweise ein <acronym>PHP</acronym> Methodenaufruf durchgeführt wird,
-            gegenüber der Erstellung von eigenen <acronym>HTTP</acronym> Anfrage Objekten.
-        </para>
-
-        <para>
-            Ein Proxy Objekt kann bequeme Methoden enthalten. Das sind Methoden die
-            <classname>Zend_Service_Nirvanix</classname> bietet um die Verwendung der Nirvanix Web
-            Services zu vereinfachen. Im vorigen Beispiel haben die Methoden
-            <methodname>putContents()</methodname>, <methodname>getContents()</methodname>, und
-            <methodname>unlink()</methodname> keine direkte Entsprechungen in der REST
-            <acronym>API</acronym>. Das sind bequeme Methoden die von
-            <classname>Zend_Service_Nirvanix</classname> angeboten werden um viel komplexere
-            Operationen der REST <acronym>API</acronym> zu abstrahieren.
-        </para>
-
-        <para>
-            Für alle anderen Methodenaufrufe zum Proxy Objekt konvertiert der Proxy dynamisch den
-            Methodenaufruf in die entsprechende <acronym>HTTP</acronym> POST Anfrage zur REST
-            <acronym>API</acronym>. Hierbei wird der Name der Methode als <acronym>API</acronym>
-            Kommando verwendet, und ein assoziatives Array im ersten Argument als POST Parameter.
-        </para>
-
-        <para>
-            Nehmen wir an das wir die REST <acronym>API</acronym> Methode <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999923">RenameFile</ulink>
-            aufrufen wollen welche keine bequeme Methode in
-            <classname>Zend_Service_Nirvanix</classname> besitzen:
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'Dein-Benutzername',
-              'password' => 'Dein-Passwort',
-              'appKey'   => 'Dein-App-Schlüssel');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->renameFile(array('filePath' => '/path/to/foo.txt',
-                                  'newFileName' => 'bar.txt'));
-]]></programlisting>
-
-        <para>
-            Oben wird ein Proxy für den <constant>IMFS</constant> erstellt. Eine Methode,
-            <methodname>renameFile()</methodname>, wird dann vom Proxy aufgerufen. Diese Methode
-            existiert nicht als bequeme Methode im <acronym>PHP</acronym> Code, deswegen wird Sie
-            durch <methodname>__call()</methodname> gefangen und in eine POST Anfrage für die REST
-            <acronym>API</acronym> umgewandelt wo das assoziative Array als POST Parameter verwendet
-            wird.
-        </para>
-
-        <para>
-            Es ist in der Nirvanix <acronym>API</acronym> Dokumentation zu beachten das
-            <code>sessionToken</code> für diese Methode benötigt wird, wir dieses aber nicht an das
-            Proxy Objekt übbergeben haben. Es wird, der Bequemlichkeit halber, automatisch
-            hinzugefügt.
-        </para>
-
-        <para>
-            Das Ergebnis dieser Operation ist entweder ein
-            <classname>Zend_Service_Nirvanix_Response</classname> Objekt welches das von Nirvanix
-            zurückgegebene <acronym>XML</acronym> wrappt, oder
-            <classname>Zend_Service_Nirvanix_Exception</classname> wenn ein Fehler aufgetreten ist.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.examining-results">
-        <title>Ergebnisse erkunden</title>
-
-        <para>
-            Die Nirvanix REST <acronym>API</acronym> gibt Ihre Ergebnisse immer in einem
-            <acronym>XML</acronym> zurück. <classname>Zend_Service_Nirvanix</classname> parst dieses
-            <acronym>XML</acronym> mit der <code>SimpleXML</code> Erweiterung und dekoriert dann das
-            sich ergebende <code>SimpleXMLElement</code> mit einem
-            <classname>Zend_Service_Nirvanix_Response</classname> Objekt.
-        </para>
-
-        <para>
-            Der einfachste Weg ein Ergebnis vom service zu betrachten ist die Verwendung der
-            in <acronym>PHP</acronym> eingebauten Funktionen wie <methodname>print_r()</methodname>:
-        </para>
-
-        <programlisting language="php"><![CDATA[
-<?php
-$auth = array('username' => 'Dein-Benutzername',
-              'password' => 'Dein-Passwort',
-              'appKey'   => 'Dein-App-Schlüssel');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->putContents('/foo.txt', 'Vierzehn Bytes');
-print_r($result);
-?>
-
-Zend_Service_Nirvanix_Response Object
-(
-    [_sxml:protected] => SimpleXMLElement Object
-        (
-            [ResponseCode] => 0
-            [FilesUploaded] => 1
-            [BytesUploaded] => 14
-        ))
-]]></programlisting>
-
-        <para>
-            Auf jede Eigenschaft oder Methode des dekorierten <code>SimpleXMLElement</code>s kann
-            zugegriffen werden. Im obigen Beispiel, könnte <code>$result->BytesUploaded</code>
-            verwendet werden um die anzahl von empfangenen Bytes zu sehen. Sollte man auf das
-            <code>SimpleXMLElement</code> direkt zugreifen wollen, kann einfach
-            <code>$result->getSxml()</code> verwendet werden.
-        </para>
-
-        <para>
-            Die üblichste Antwort von Nirvanix ist Erfolg (<code>ResponseCode</code> von Null).
-            Es ist normalerweise nicht notwendig <code>ResponseCode</code> zu prüfen weil jedes
-            nicht-null Ergebnis eine <classname>Zend_Service_Nirvanix_Exception</classname> wirft.
-            Siehe das nächste Kapitel über die Behandlung von Fehlern.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.handling-errors">
-        <title>Fehler behandeln</title>
-
-        <para>
-            Wenn Nirvanix verwendet wird, ist es wichtig Fehler zu vermeiden die vom Service
-            zurückgegeben werden können und diese entsprechend zu behandeln.
-        </para>
-
-        <para>
-            Alle Operationen gegenüber dem REST Service ergeben einen <acronym>XML</acronym>
-            RückgabePayload der ein <code>ResponseCode</code> Element, wie im folgenden Beispiel,
-            enthält:
-        </para>
-
-        <programlisting language="xml"><![CDATA[
-<Response>
-    <ResponseCode>0</ResponseCode>
-</Response>
-]]></programlisting>
-
-        <para>
-            Wenn <code>ResponseCode</code> Null ist, wie im obigen Beispiel,  war die Operation
-            erfolgreich. Wenn die Operation nicht erfolgreich war, ist <code>ResponseCode</code>
-            nicht-Null und ein <code>ErrorMessage</code> Element sollte vorhanden sein.
-        </para>
-
-        <para>
-            Um die Notwendigkeit zu verringern immer zu Prüfen ob <code>ResponseCode</code> Null
-            ist, prüft <classname>Zend_Service_Nirvanix</classname> automatisch jede von Nirvanix
-            zurückgegebene Antwort. Wenn <code>ResponseCode</code> einen Fehler zeigt, wird eine
-            <classname>Zend_Service_Nirvanix_Exception</classname> geworfen.
-        </para>
-
-      <programlisting language="xml"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-$nirvanix = new Zend_Service_Nirvanix($auth);
-
-try {
-
-  $imfs = $nirvanix->getService('IMFS');
-  $imfs->unlink('/a-nonexistant-path');
-
-} catch (Zend_Service_Nirvanix_Exception $e) {
-  echo $e->getMessage() . "\n";
-  echo $e->getCode();
-}
-]]></programlisting>
-
-        <para>
-            im obigen Beispiel ist <methodname>unlink()</methodname> eine bequeme Methode die das
-            <code>DeleteFiles</code> der REST <acronym>API</acronym> wrappt. Der
-            <code>filePath</code> Parameter wird vom <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999918">DeleteFiles</ulink>
-            Kommando benötigt und enthält einen Pfad der nicht existiert. Das wird in einer
-            <classname>Zend_Service_Nirvanix</classname> Ausnahme resultieren die, mit der Nachricht
-            "Invalid Path" und Code 70005, geworfen wird.
-        </para>
-
-        <para>
-            Die <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-                <acronym>API</acronym> Dokumentation</ulink> beschreibt die mit jedem Kommando
-            assoziierten Fehler. Abhängig von den eigenen Bedürfnissen kann jedes Kommando in einen
-            <code>try</code> Block eingebettet werden oder aus Bequemlichkeit, viele Kommandos im
-            selben <code>try</code> Block.
-        </para>
-    </sect2>
-</sect1>

documentation/manual/de/ref/coding_standard.xml

@@ -1103,7 +1103,7 @@ switch ($numPeople) {
  * @category   Zend
  * @package    Zend_Magic
  * @subpackage Wand
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license   BSD License
  * @version    $Id:$
  * @link       http://framework.zend.com/package/PackageName
@@ -1148,7 +1148,7 @@ switch ($numPeople) {
  * @category   Zend
  * @package    Zend_Magic
  * @subpackage Wand
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license   BSD License
  * @version    Release: @package_version@
  * @link       http://framework.zend.com/package/PackageName

documentation/manual/en/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/en/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(Makefile.in)
-AC_COPYRIGHT([Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)])
+AC_COPYRIGHT([Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)])
 
 FOP=fop
 XSLTPROC=xsltproc

documentation/manual/en/manual-print2.xml.in

@@ -195,7 +195,6 @@
         <xi:include href="module_specs/Zend_Service_Audioscrobbler.xml" />
         <xi:include href="module_specs/Zend_Service_Delicious.xml" />
         <xi:include href="module_specs/Zend_Service_Flickr.xml" />
-        <xi:include href="module_specs/Zend_Service_Nirvanix.xml" />
         <xi:include href="module_specs/Zend_Service-ReCaptcha.xml" />
         <xi:include href="module_specs/Zend_Service_SlideShare.xml" />
         <xi:include href="module_specs/Zend_Service_StrikeIron-Overview.xml" />

documentation/manual/en/manual.xml.in

@@ -1967,11 +1967,6 @@
                     <xi:include href="../en/module_specs/Zend_Service_LiveDocx.xml" />
                 </xi:fallback>
             </xi:include>
-            <xi:include href="module_specs/Zend_Service_Nirvanix.xml">
-                <xi:fallback>
-                    <xi:include href="../en/module_specs/Zend_Service_Nirvanix.xml" />
-                </xi:fallback>
-            </xi:include>
             <xi:include href="module_specs/Zend_Service_Rackspace.xml">
                 <xi:fallback>
                     <xi:include href="../en/module_specs/Zend_Service_Rackspace.xml" />

documentation/manual/en/module_specs/Zend_Cloud_StorageService.xml

@@ -35,13 +35,6 @@
 
             <listitem>
                 <para>
-                    <ulink
-                        url="http://developer.nirvanix.com/sitefiles/1000/API.html"><classname>Zend_Cloud_StorageService_Adapter_Nirvanix</classname></ulink>
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
                     <classname>Zend_Cloud_StorageService_Adapter_FileSystem</classname>
                 </para>
             </listitem>
@@ -339,64 +332,6 @@ $storage = Zend_Cloud_StorageService_Factory::getAdapter(array(
                 </tgroup>
             </table>
 
-            <table frame='all' id="zend.cloud.storageservice.options.nirvanix">
-                <title>Zend_Cloud_StorageService_Adapter_Nirvanix options</title>
-
-                <tgroup cols="5">
-                    <thead>
-                        <row>
-                            <entry>Option key</entry>
-                            <entry>Description</entry>
-                            <entry>Used in</entry>
-                            <entry>Required</entry>
-                            <entry>Default</entry>
-                        </row>
-                    </thead>
-
-                    <tbody>
-                        <row>
-                            <entry>auth_username</entry>
-                            <entry>Nirvanix user name</entry>
-                            <entry>Constructor</entry>
-                            <entry>Yes</entry>
-                            <entry>None</entry>
-                        </row>
-
-                        <row>
-                            <entry>auth_password</entry>
-                            <entry>Nirvanix password</entry>
-                            <entry>Constructor</entry>
-                            <entry>Yes</entry>
-                            <entry>None</entry>
-                        </row>
-
-                        <row>
-                            <entry>auth_accesskey</entry>
-                            <entry>Nirvanix access key</entry>
-                            <entry>Constructor</entry>
-                            <entry>Yes</entry>
-                            <entry>None</entry>
-                        </row>
-
-                        <row>
-                            <entry>http_adapter</entry>
-                            <entry>HTTP adapter to use in all access operations</entry>
-                            <entry>Constructor</entry>
-                            <entry>No</entry>
-                            <entry><classname>Zend_Http_Client_Adapter_Socket</classname></entry>
-                        </row>
-
-                        <row>
-                            <entry>remote_directory</entry>
-                            <entry>Nirvanix directory to use</entry>
-                            <entry>Constructor (mandatory)</entry>
-                            <entry>Yes</entry>
-                            <entry>None</entry>
-                        </row>
-                    </tbody>
-                </tgroup>
-            </table>
-
             <table frame='all' id="zend.cloud.storageservice.options.filesystem">
                 <title>Zend_Cloud_StorageService_Adapter_Filesystem options</title>
 

documentation/manual/en/module_specs/Zend_Mobile_Push-Gcm.xml

@@ -200,5 +200,5 @@ foreach ($response->getResults() as $k => $v) {
             </para>
 
         </sect3>
-
+    </sect2>
 </sect1>

documentation/manual/en/module_specs/Zend_Service.xml

@@ -65,12 +65,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.nirvanix">Nirvanix</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.recaptcha">ReCaptcha</link>
             </para>
         </listitem>

documentation/manual/en/module_specs/Zend_Service_Nirvanix.xml

@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Reviewed: no -->
-<sect1 id="zend.service.nirvanix">
-    <title>Zend_Service_Nirvanix</title>
-
-    <sect2 id="zend.service.nirvanix.introduction">
-        <title>Introduction</title>
-
-        <para>
-            Nirvanix provides an Internet Media File System (IMFS), an
-            Internet storage service that allows applications to upload, store and
-            organize files and subsequently access them using a standard Web
-            Services interface. An IMFS is distributed clustered file system,
-            accessed over the Internet, and optimized for dealing with media files
-            (audio, video, etc). The goal of an IMFS is to provide massive
-            scalability to deal with the challenges of media storage growth, with
-            guaranteed access and availability regardless of time and location.
-            Finally, an IMFS gives applications the ability to access data
-            securely, without the large fixed costs associated with acquiring and
-            maintaining physical storage assets.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.registering">
-        <title>Registering with Nirvanix</title>
-
-        <para>
-            Before you can get started with <classname>Zend_Service_Nirvanix</classname>, you must
-            first register for an account. Please see the
-            <ulink url="http://www.nirvanix.com/gettingStarted.aspx">Getting Started</ulink>
-            page on the Nirvanix website for more information.
-        </para>
-
-        <para>
-            After registering, you will receive a Username, Password, and Application Key.
-            All three are required to use <classname>Zend_Service_Nirvanix</classname>.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.apiDocumentation">
-        <title>API Documentation</title>
-
-        <para>
-            Access to the Nirvanix IMFS is available through both <acronym>SOAP</acronym> and a
-            faster REST service. <classname>Zend_Service_Nirvanix</classname> provides a
-            relatively thin <acronym>PHP</acronym> 5 wrapper around the REST service.
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> aims to make using the Nirvanix REST
-            service easier but understanding the service itself is still essential to be successful
-            with Nirvanix.
-        </para>
-
-        <para>
-            The <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-            <acronym>API</acronym> Documentation</ulink> provides an overview as well as detailed
-            information using the service. Please familiarize yourself with this document and refer
-            back to it as you use <classname>Zend_Service_Nirvanix</classname>.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.features">
-        <title>Features</title>
-
-        <para>
-            Nirvanix's REST service can be used effectively with <acronym>PHP</acronym> using the
-            <ulink url="http://www.php.net/simplexml">SimpleXML</ulink>
-            extension and <classname>Zend_Http_Client</classname> alone. However, using it this way
-            is somewhat inconvenient due to repetitive operations like passing the
-            session token on every request and repeatedly checking the response body for
-            error codes.
-        </para>
-
-        <para>
-            <classname>Zend_Service_Nirvanix</classname> provides the following functionality:
-
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        A single point for configuring your Nirvanix authentication
-                        credentials that can be used across the Nirvanix namespaces.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        A proxy object that is more convenient to use than an
-                        <acronym>HTTP</acronym> client alone, mostly removing the need to manually
-                        construct <acronym>HTTP</acronym> POST requests to access the REST service.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        A response wrapper that parses each response body and throws an
-                        exception if an error occurred, alleviating the need to repeatedly
-                        check the success of many commands.
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Additional convenience methods for some of the more common operations.
-                    </para>
-                </listitem>
-            </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.storing-your-first">
-        <title>Getting Started</title>
-
-        <para>
-            Once you have registered with Nirvanix, you're ready to store your first
-            file on the IMFS. The most common operations that you will need to do
-            on the IMFS are creating a new file, downloading an existing file, and
-            deleting a file. <classname>Zend_Service_Nirvanix</classname> provides convenience
-            methods for these three operations.
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$imfs->putContents('/foo.txt', 'contents to store');
-
-echo $imfs->getContents('/foo.txt');
-
-$imfs->unlink('/foo.txt');
-]]></programlisting>
-
-        <para>
-            The first step to using <classname>Zend_Service_Nirvanix</classname> is always
-            to authenticate against the service. This is done by passing your
-            credentials to the <classname>Zend_Service_Nirvanix</classname> constructor
-            above. The associative array is passed directly to Nirvanix as POST
-            parameters.
-        </para>
-
-        <para>
-            Nirvanix divides its web services into <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999879">namespaces</ulink>.
-            Each namespace encapsulates a group of related operations. After getting
-            an instance of <classname>Zend_Service_Nirvanix</classname>, call the
-            <methodname>getService()</methodname> method to create a proxy for the namespace
-            you want to use. Above, a proxy for the <constant>IMFS</constant> namespace is created.
-        </para>
-
-        <para>
-            After you have a proxy for the namespace you want to use, call methods on it. The
-            proxy will allow you to use any command available on the REST <acronym>API</acronym>.
-            The proxy may also make convenience methods available, which wrap web service
-            commands. The example above shows using the IMFS convenience methods to create a
-            new file, retrieve and display that file, and finally delete the file.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.understanding-proxy">
-        <title>Understanding the Proxy</title>
-
-        <para>
-            In the previous example, we used the <methodname>getService()</methodname> method to
-            return a proxy object to the <constant>IMFS</constant> namespace. The proxy object
-            allows you to use the Nirvanix REST service in a way that's closer to making a normal
-            <acronym>PHP</acronym> method call, as opposed to constructing your own
-            <acronym>HTTP</acronym> request objects.
-        </para>
-
-        <para>
-            A proxy object may provide convenience methods. These are methods that the
-            <classname>Zend_Service_Nirvanix</classname> provides to simplify the use of
-            the Nirvanix web services. In the previous example, the methods
-            <methodname>putContents()</methodname>, <methodname>getContents()</methodname>, and
-            <methodname>unlink()</methodname> do not have direct equivalents in the REST
-            <acronym>API</acronym>. They are convenience methods provided by
-            <classname>Zend_Service_Nirvanix</classname> that abstract more complicated operations
-            on the REST <acronym>API</acronym>.
-        </para>
-
-        <para>
-            For all other method calls to the proxy object, the proxy will dynamically convert the
-            method call to the equivalent <acronym>HTTP</acronym> POST request to the REST
-            <acronym>API</acronym>. It does this by using the method name as the
-            <acronym>API</acronym> command, and an associative array in the first argument as the
-            POST parameters.
-        </para>
-
-        <para>
-            Let's say you want to call the REST <acronym>API</acronym> method <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999923">RenameFile</ulink>,
-            which does not have a convenience method in
-            <classname>Zend_Service_Nirvanix</classname>:
-        </para>
-
-        <programlisting language="php"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->renameFile(array('filePath' => '/path/to/foo.txt',
-                                  'newFileName' => 'bar.txt'));
-]]></programlisting>
-
-        <para>
-            Above, a proxy for the <constant>IMFS</constant> namespace is created. A method,
-            <methodname>renameFile()</methodname>, is then called on the proxy. This method does not
-            exist as a convenience method in the <acronym>PHP</acronym> code, so it is trapped by
-            <methodname>__call()</methodname> and converted into a POST request to the REST
-            <acronym>API</acronym> where the associative array is used as the POST parameters.
-        </para>
-
-        <para>
-            Notice in the Nirvanix <acronym>API</acronym> documentation that
-            <code>sessionToken</code> is required for this method but we did not give it to the
-            proxy object. It is added automatically for your convenience.
-        </para>
-
-        <para>
-            The result of this operation will either be a
-            <classname>Zend_Service_Nirvanix_Response</classname> object wrapping the
-            <acronym>XML</acronym> returned by Nirvanix, or a
-            <classname>Zend_Service_Nirvanix_Exception</classname> if an error occurred.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.examining-results">
-        <title>Examining Results</title>
-
-        <para>
-            The Nirvanix REST <acronym>API</acronym> always returns its results in
-            <acronym>XML</acronym>. <classname>Zend_Service_Nirvanix</classname> parses this
-            <acronym>XML</acronym> with the <code>SimpleXML</code> extension and then decorates the
-            resulting <code>SimpleXMLElement</code> with a
-            <classname>Zend_Service_Nirvanix_Response</classname> object.
-        </para>
-
-        <para>
-            The simplest way to examine a result from the service is to use the
-            built-in <acronym>PHP</acronym> functions like <methodname>print_r()</methodname>:
-        </para>
-
-        <programlisting language="php"><![CDATA[
-<?php
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-
-$nirvanix = new Zend_Service_Nirvanix($auth);
-$imfs = $nirvanix->getService('IMFS');
-
-$result = $imfs->putContents('/foo.txt', 'fourteen bytes');
-print_r($result);
-?>
-
-Zend_Service_Nirvanix_Response Object
-(
-    [_sxml:protected] => SimpleXMLElement Object
-        (
-            [ResponseCode] => 0
-            [FilesUploaded] => 1
-            [BytesUploaded] => 14
-        )
-)
-]]></programlisting>
-
-        <para>
-            You can access any property or method of the decorated <code>SimpleXMLElement</code>.
-            In the above example, <code>$result->BytesUploaded</code> could be used to see the
-            number of bytes received. Should you want to access the <code>SimpleXMLElement</code>
-            directly, just use <code>$result->getSxml()</code>.
-        </para>
-
-        <para>
-            The most common response from Nirvanix is success (<code>ResponseCode</code> of zero).
-            It is not normally necessary to check <code>ResponseCode</code> because any non-zero
-            result will throw a <classname>Zend_Service_Nirvanix_Exception</classname>. See the next
-            section on handling errors.
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.nirvanix.handling-errors">
-        <title>Handling Errors</title>
-
-        <para>
-            When using Nirvanix, it's important to anticipate errors that can be returned
-            by the service and handle them appropriately.
-        </para>
-
-        <para>
-            All operations against the REST service result in an <acronym>XML</acronym> return
-            payload that contains a <code>ResponseCode</code> element, such as the following
-            example:
-        </para>
-
-        <programlisting language="xml"><![CDATA[
-<Response>
-   <ResponseCode>0</ResponseCode>
-</Response>
-]]></programlisting>
-
-        <para>
-            When the <code>ResponseCode</code> is zero such as in the example
-            above, the operation was successful. When the operation is not
-            successful, the <code>ResponseCode</code> is non-zero and an
-            <code>ErrorMessage</code> element should be present.
-        </para>
-
-        <para>
-            To alleviate the need to repeatedly check if the <code>ResponseCode</code>
-            is non-zero, <classname>Zend_Service_Nirvanix</classname> automatically checks each
-            response returned by Nirvanix. If the <code>ResponseCode</code> indicates an
-            error, a <classname>Zend_Service_Nirvanix_Exception</classname> will be thrown.
-        </para>
-
-        <programlisting language="xml"><![CDATA[
-$auth = array('username' => 'your-username',
-              'password' => 'your-password',
-              'appKey'   => 'your-app-key');
-$nirvanix = new Zend_Service_Nirvanix($auth);
-
-try {
-
-  $imfs = $nirvanix->getService('IMFS');
-  $imfs->unlink('/a-nonexistant-path');
-
-} catch (Zend_Service_Nirvanix_Exception $e) {
-  echo $e->getMessage() . "\n";
-  echo $e->getCode();
-}
-]]></programlisting>
-
-        <para>
-            In the example above, <methodname>unlink()</methodname> is a convenience method that
-            wraps the <code>DeleteFiles</code> command on the REST <acronym>API</acronym>. The
-            <code>filePath</code> parameter required by the <ulink
-                url="http://developer.nirvanix.com/sitefiles/1000/API.html#_Toc175999918">DeleteFiles</ulink>
-            command contains a path that does not exist. This will result in a
-            <classname>Zend_Service_Nirvanix</classname> exception being thrown with the message
-            "Invalid path" and code 70005.
-        </para>
-
-        <para>
-            The <ulink url="http://developer.nirvanix.com/sitefiles/1000/API.html">Nirvanix
-            <acronym>API</acronym> Documentation</ulink> describes the errors associated with each
-            command. Depending on your needs, you may wrap each command in a <code>try</code> block
-            or wrap many commands in the same <code>try</code> block for convenience.
-        </para>
-    </sect2>
-</sect1>

documentation/manual/en/ref/coding_standard.xml

@@ -1078,7 +1078,7 @@ switch ($numPeople) {
  * @category   Zend
  * @package    Zend_Magic
  * @subpackage Wand
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license   BSD License
  * @version    $Id:$
  * @link       http://framework.zend.com/package/PackageName
@@ -1122,7 +1122,7 @@ switch ($numPeople) {
  * @category   Zend
  * @package    Zend_Magic
  * @subpackage Wand
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license   BSD License
  * @version    Release: @package_version@
  * @link       http://framework.zend.com/package/PackageName

documentation/manual/en/ref/requirements-dependencies-table.xml

@@ -4265,89 +4265,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="8" valign="middle">
-                    <emphasis>
-                        <ulink
-                            url="&zf.manual.link;/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="2" valign="middle">&requirements.hard;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.exception.html">
-                        <classname>Zend_Exception</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.http.html">
-                        <classname>Zend_Http</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.loader.html">
-                        <classname>Zend_Loader</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">&requirements.fix;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.locale.html">
-                        <classname>Zend_Locale</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.uri.html">
-                        <classname>Zend_Uri</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.validate.html">
-                        <classname>Zend_Validate</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">&requirements.sub;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.date.html">
-                        <classname>Zend_Date</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.filter.html">
-                        <classname>Zend_Filter</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.registry.html">
-                        <classname>Zend_Registry</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
                 <entry morerows="10" valign="middle">
                     <emphasis>
                         <ulink

documentation/manual/en/ref/requirements-zendcomponents-table.xml

@@ -982,18 +982,6 @@
                 <entry>
                     <emphasis>
                         <ulink
-                            url="&zf.manual.link;/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry>---</entry>
-                <entry>---</entry>
-            </row>
-            <row>
-                <entry>
-                    <emphasis>
-                        <ulink
                             url="&zf.manual.link;/zend.service.recaptcha.html">
                             <classname>Zend_Service_ReCaptcha</classname>
                         </ulink>

documentation/manual/en/tutorials/quickstart-intro-mvc.xml

@@ -12,10 +12,7 @@
             it has many loosely coupled components that you can use more or less independently. But
             Zend Framework also provides an advanced Model-View-Controller (<acronym>MVC</acronym>)
             implementation that can be used to establish a basic structure for your Zend Framework
-            applications. A full list of Zend Framework components along with short descriptions may
-            be found in the <ulink
-                url="http://framework.zend.com/about/components">components overview</ulink>. This
-            QuickStart will introduce you to some of Zend Framework's most commonly used components,
+            applications. This QuickStart will introduce you to some of Zend Framework's most commonly used components,
             including <classname>Zend_Controller</classname>, <classname>Zend_Layout</classname>,
             <classname>Zend_Config</classname>, <classname>Zend_Db</classname>,
             <classname>Zend_Db_Table</classname>, <classname>Zend_Registry</classname>, along

documentation/manual/es/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/es/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(Makefile.in)
-AC_COPYRIGHT([Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)])
+AC_COPYRIGHT([Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)])
 
 XINC=xinc
 XEP=xep

documentation/manual/es/ref/coding_standard.xml

@@ -974,7 +974,7 @@ switch ($numPeople) {
  * @category   Zend
  * @package    Zend_Magic
  * @subpackage Wand
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license   BSD License
  * @version    $Id:$
  * @link       http://framework.zend.com/package/PackageName
@@ -1014,7 +1014,7 @@ switch ($numPeople) {
  * @category   Zend
  * @package    Zend_Magic
  * @subpackage Wand
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license   BSD License
  * @version    Release: @package_version@
  * @link       http://framework.zend.com/package/PackageName

documentation/manual/es/ref/requirements-dependencies-table.xml

@@ -3713,79 +3713,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="8" valign="middle">
-                    <emphasis>
-                        <ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="2" valign="middle">Hard</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.exception.html">
-                        <classname>Zend_Exception</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.http.html">
-                        <classname>Zend_Http</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.loader.html">
-                        <classname>Zend_Loader</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">Fix</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.locale.html">
-                        <classname>Zend_Locale</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.uri.html">
-                        <classname>Zend_Uri</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.validate.html">
-                        <classname>Zend_Validate</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">Sub</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.date.html">
-                        <classname>Zend_Date</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.filter.html">
-                        <classname>Zend_Filter</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.registry.html">
-                        <classname>Zend_Registry</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
                 <entry morerows="10" valign="middle">
                     <emphasis>
                         <ulink url="http://framework.zend.com/manual/en/zend.service.recapchta.html">

documentation/manual/es/ref/requirements-zendcomponents-table.xml

@@ -819,17 +819,6 @@
             <row>
                 <entry>
                     <emphasis>
-                        <ulink url="http://framework.zend.com/manual/en/zend.service.nirvanix.html">
-                            <classname>Zend_Service_Nirvanix</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry>---</entry>
-                <entry>---</entry>
-            </row>
-            <row>
-                <entry>
-                    <emphasis>
                         <ulink url="http://framework.zend.com/manual/en/zend.service.recaptcha.html">
                             <classname>Zend_Service_ReCaptcha</classname>
                         </ulink>

documentation/manual/fa/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/fa/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(Makefile.in)
-AC_COPYRIGHT([Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)])
+AC_COPYRIGHT([Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)])
 
 XINC=xinc
 XEP=xep

documentation/manual/fr/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #
 

documentation/manual/fr/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(Makefile.in)
-AC_COPYRIGHT([Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)])
+AC_COPYRIGHT([Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)])
 
 XINC=xinc
 XEP=xep

documentation/manual/fr/module_specs/Zend_Service.xml

@@ -67,12 +67,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.nirvanix">Nirvanix</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.recaptcha">ReCaptcha</link>
             </para>
         </listitem>
@@ -121,4 +115,4 @@
     </itemizedlist>
 
     <para>D'autres services devraient être ajoutés prochainement.</para>
-</sect1>
+</sect1>

documentation/manual/fr/ref/coding_standard.xml

@@ -1030,7 +1030,7 @@ switch ($numPeople) {
  *
  * LICENSE: Informations sur la licence
  *
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license   BSD License
  * @version    $Id:$
  * @link       http://framework.zend.com/package/PackageName
@@ -1051,7 +1051,7 @@ switch ($numPeople) {
  *
  * Description longue de la classe, s'il y en a une
  *
- * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license   BSD License
  * @version    Release: @package_version@
  * @link       http://framework.zend.com/package/PackageName

documentation/manual/he/Makefile.in

@@ -11,7 +11,7 @@
 # obtain it through the world-wide-web, please send an email
 # to license@zend.com so we can send you a copy immediately.
 #
-# @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # @license    http://framework.zend.com/license/new-bsd     New BSD License
 #