Skip to content

Commit e388897

Browse files
author
Mike Willbanks
committed
Merge pull request zendframework#1077 
2 parents 1f8411a + 552850d commit e388897

File tree

12 files changed

+93
-237
lines changed

12 files changed

+93
-237
lines changed

‎docs/languages/de/modules/zend.pdf.usage.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ Dort gibt es auch die Datei ``test.pdf``, die für diese Demo zu Testzwecken ver
1717
.. code-block:: php
1818
:linenos:
1919
20-
/**
21-
* @package ZendPdf
22-
* @subpackage demo
23-
*/
24-
2520
if (!isset($argv[1])) {
2621
echo "VERWENDUNG: php demo.php <pdf_file> [<output_pdf_file>]\n";
2722
exit;

‎docs/languages/de/ref/coding.standard.rst

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -873,31 +873,15 @@ phpDocumentor Tags enthält:
873873
:linenos:
874874
875875
/**
876-
* Kurze Beschreibung der Datei
876+
* Zend Framework (http://framework.zend.com/)
877877
*
878-
* Lange Beschreibung der Datei (wenn vorhanden)...
878+
* Long description for file (if any)...
879879
*
880-
* LICENSE: Einige Lizenz Informationen
881-
*
882-
* @category Zend
883-
* @package Zend_Magic
884-
* @subpackage Wand
885-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
886-
* @license http://framework.zend.com/license BSD License
887-
* @version $Id:$
888-
* @link http://framework.zend.com/package/PackageName
889-
* @since Datei vorhanden seit Release 1.2.0
890-
*/
891-
892-
Das ``@category`` Tag muß den Wert "Zend" haben.
893-
894-
Das ``@package`` Tag muß hinzugefügt sein, und sollte mit dem Namen der Komponente identisch sein dessen Klasse
895-
in der Datei enthalten ist; typischerweise wird dieser zwei Segmente haben, den Präfix "Zend", und den Namen der
896-
Komponente.
897-
898-
Das ``@subpackage`` Tag ist optional. Wenn es angegeben wird, sollte es der Name der Subkomponente sein, ohne den
899-
Präfix der Klasse. Im obigen Beispiel ist die Annahme das die Klasse in der Datei entweder "``Zend\Magic\Wand``"
900-
ist oder den Klassennamen als Teil seines Präfixes verwendet.
880+
* @link http://github.com/zendframework/zf2 for the canonical source repository
881+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
882+
* @license http://framework.zend.com/license/new-bsd New BSD License
883+
* @since File available since Release 1.5.0
884+
*/
901885
902886
.. _coding-standards.inline-documentation.classes:
903887

@@ -910,30 +894,14 @@ Jede Klasse muß einen Docblock haben welche mindestens diese phpDocumentor Tags
910894
:linenos:
911895
912896
/**
913-
* Kurze Beschreibung für die Klasse
897+
* Short description for class
914898
*
915-
* Lange Beschreibung für die Klasse (wenn vorhanden)...
899+
* Long description for class (if any)...
916900
*
917-
* @category Zend
918-
* @package Zend_Magic
919-
* @subpackage Wand
920-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
921-
* @license http://framework.zend.com/license BSD License
922-
* @version Release: @package_version@
923-
* @link http://framework.zend.com/package/PackageName
924-
* @since Klasse vorhanden seit Release 1.5.0
925-
* @deprecated Klasse abgeraten ab Release 2.0.0
901+
* @since Class available since Release 1.5.0
902+
* @deprecated Class deprecated in Release 2.0.0
926903
*/
927904
928-
Das ``@category`` Tag muß den Wert "Zend" haben.
929-
930-
Das ``@package`` Tag muß hinzugefügt sein, und sollte mit der Komponente identisch sein der die Klasse gehört;
931-
typischerweise wird dieser zwei Segmente haben, den Präfix "Zend", und den Namen der Komponente.
932-
933-
Das ``@subpackage`` Tag ist optional. Wenn es angegeben wird, sollte es der Name der Subkomponente sein, ohne den
934-
Präfix der Klasse. Im obigen Beispiel ist die Annahme das die Klasse in der Datei entweder "``Zend\Magic\Wand``"
935-
ist oder den Klassennamen als Teil seines Präfixes verwendet.
936-
937905
.. _coding-standards.inline-documentation.functions:
938906

939907
Funktionen

‎docs/languages/en/modules/zend.form.quick-start.rst

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,12 +454,7 @@ factory to create an input. Every HTML5 (email, url, color…) elements have a b
454454
use Zend\InputFilter\InputProviderInterface;
455455
use Zend\Validator\Regex as RegexValidator;
456456
use Zend\Validator\ValidatorInterface;
457-
458-
/**
459-
* @category Zend
460-
* @package Zend_Form
461-
* @subpackage Element
462-
*/
457+
463458
class Color extends Element implements InputProviderInterface
464459
{
465460
/**

‎docs/languages/en/modules/zendpdf.usage.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ There are also ``test.pdf`` file, which can be used with this demo for test purp
1616
.. code-block:: php
1717
:linenos:
1818
19-
/**
20-
* @package ZendPdf
21-
* @subpackage demo
22-
*/
23-
2419
if (!isset($argv[1])) {
2520
echo "USAGE: php demo.php <pdf_file> [<output_pdf_file>]\n";
2621
exit;

‎docs/languages/en/ref/coding.standard.rst

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -849,26 +849,15 @@ tags at a minimum:
849849
:linenos:
850850
851851
/**
852-
* Short description for file
852+
* Zend Framework (http://framework.zend.com/)
853853
*
854854
* Long description for file (if any)...
855855
*
856-
* LICENSE: Some license information
857-
*
858-
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
859-
* @license http://framework.zend.com/license BSD License
860-
* @link http://framework.zend.com/package/PackageName
861-
* @since File available since Release 1.5.0
862-
*/
863-
864-
The ``@category`` annotation must have a value of "Zend".
865-
866-
The ``@package`` annotation must be assigned, and should be equivalent to the component name of the class contained
867-
in the file; typically, this will only have two segments, the "Zend" prefix, and the component name.
868-
869-
The ``@subpackage`` annotation is optional. If provided, it should be the subcomponent name, minus the class
870-
prefix. In the example above, the assumption is that the class in the file is either "``Zend\Magic\Wand``", or uses
871-
that classname as part of its prefix.
856+
* @link http://github.com/zendframework/zf2 for the canonical source repository
857+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
858+
* @license http://framework.zend.com/license/new-bsd New BSD License
859+
* @since File available since Release 1.5.0
860+
*/
872861
873862
.. _coding-standards.inline-documentation.classes:
874863

@@ -885,23 +874,10 @@ Every class must have a docblock that contains these phpDocumentor tags at a min
885874
*
886875
* Long description for class (if any)...
887876
*
888-
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
889-
* @license http://framework.zend.com/license BSD License
890-
* @version Release: @package_version@
891-
* @link http://framework.zend.com/package/PackageName
892877
* @since Class available since Release 1.5.0
893878
* @deprecated Class deprecated in Release 2.0.0
894879
*/
895880
896-
The ``@category`` annotation must have a value of "Zend".
897-
898-
The ``@package`` annotation must be assigned, and should be equivalent to the component to which the class belongs;
899-
typically, this will only have two segments, the "Zend" prefix, and the component name.
900-
901-
The ``@subpackage`` annotation is optional. If provided, it should be the subcomponent name, minus the class
902-
prefix. In the example above, the assumption is that the class described is either "``Zend\Magic\Wand``", or uses
903-
that classname as part of its prefix.
904-
905881
.. _coding-standards.inline-documentation.functions:
906882

907883
Functions

‎docs/languages/es/modules/zend.pdf.usage.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ También está el archivo ``test.pdf``, que puede ser usado con esta demo con fi
1717
.. code-block:: php
1818
:linenos:
1919
20-
/**
21-
* @package ZendPdf
22-
* @subpackage demo
23-
*/
24-
2520
if (!isset($argv[1])) {
2621
echo "USAGE: php demo.php <pdf_file> [<output_pdf_file>]\n";
2722
exit;

‎docs/languages/es/ref/coding.standard.rst

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -839,29 +839,15 @@ contenga como mínimo las siguientes etiquetas phpDocumentor:
839839
:linenos:
840840
841841
/**
842-
* Descripción corta del fichero
842+
* Zend Framework (http://framework.zend.com/)
843843
*
844-
* Descripción larga del fichero (si la hubiera)...
844+
* Long description for file (if any)...
845845
*
846-
* LICENSE: Some license information
847-
*
848-
* @category Zend
849-
* @package Zend_Magic
850-
* @subpackage Wand
851-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
852-
* @license http://framework.zend.com/license BSD License
853-
* @link http://framework.zend.com/package/PackageName
854-
* @since File available since Release 1.5.0
855-
*/
856-
857-
The ``@category`` annotation must have a value of "Zend".
858-
859-
The ``@package`` annotation must be assigned, and should be equivalent to the component name of the class contained
860-
in the file; typically, this will only have two segments, the "Zend" prefix, and the component name.
861-
862-
The ``@subpackage`` annotation is optional. If provided, it should be the subcomponent name, minus the class
863-
prefix. In the example above, the assumption is that the class in the file is either "``Zend\Magic\Wand``", or uses
864-
that classname as part of its prefix.
846+
* @link http://github.com/zendframework/zf2 for the canonical source repository
847+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
848+
* @license http://framework.zend.com/license/new-bsd New BSD License
849+
* @since File available since Release 1.5.0
850+
*/
865851
866852
.. _coding-standards.inline-documentation.classes:
867853

@@ -875,30 +861,14 @@ phpDocumentor:
875861
:linenos:
876862
877863
/**
878-
* Descripción corta de la clase
864+
* Short description for class
879865
*
880-
* Descripcion larga de la clase (si la hubiera)...
866+
* Long description for class (if any)...
881867
*
882-
* @category Zend
883-
* @package Zend_Magic
884-
* @subpackage Wand
885-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
886-
* @license http://framework.zend.com/license BSD License
887-
* @version Release: @package_version@
888-
* @link http://framework.zend.com/package/PackageName
889868
* @since Class available since Release 1.5.0
890869
* @deprecated Class deprecated in Release 2.0.0
891870
*/
892871
893-
The ``@category`` annotation must have a value of "Zend".
894-
895-
The ``@package`` annotation must be assigned, and should be equivalent to the component to which the class belongs;
896-
typically, this will only have two segments, the "Zend" prefix, and the component name.
897-
898-
The ``@subpackage`` annotation is optional. If provided, it should be the subcomponent name, minus the class
899-
prefix. In the example above, the assumption is that the class described is either "``Zend\Magic\Wand``", or uses
900-
that classname as part of its prefix.
901-
902872
.. _coding-standards.inline-documentation.functions:
903873

904874
Funciones

‎docs/languages/fr/modules/zend.pdf.usage.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ Il y a aussi un fichier ``test.pdf``, qui peut être utilisé pour réaliser des
1717
.. code-block:: php
1818
:linenos:
1919
20-
/**
21-
* @package ZendPdf
22-
* @subpackage demo
23-
*/
24-
2520
if (!isset($argv[1])) {
2621
echo "USAGE: php demo.php <pdf_file> [<output_pdf_file>]\n";
2722
exit;

‎docs/languages/fr/ref/coding.standard.rst

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -882,23 +882,19 @@ Fichiers
882882
Chaque fichier qui contient du code PHP doit avoir un bloc d'entête en haut du fichier qui contient au minimum ces
883883
balises phpDocumentor :
884884

885-
.. code-block:: php
886-
:linenos:
887-
888-
/**
889-
* Description courte du fichier
890-
*
891-
* Description longue du fichier s'il y en a une
892-
*
893-
* LICENSE: Informations sur la licence
894-
*
895-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
896-
* @license http://framework.zend.com/license BSD License
897-
* @link http://framework.zend.com/package/PackageName
898-
* @since File available since Release 1.5.0
899-
*/
900-
885+
.. code-block:: php
886+
:linenos:
901887
888+
/**
889+
* Zend Framework (http://framework.zend.com/)
890+
*
891+
* Long description for file (if any)...
892+
*
893+
* @link http://github.com/zendframework/zf2 for the canonical source repository
894+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
895+
* @license http://framework.zend.com/license/new-bsd New BSD License
896+
* @since File available since Release 1.5.0
897+
*/
902898
903899
.. _coding-standards.inline-documentation.classes:
904900

@@ -907,23 +903,17 @@ Classes
907903

908904
Chaque classe doit avoir un docblock qui contient au minimum ces balises phpDocumentor :
909905

910-
.. code-block:: php
911-
:linenos:
912-
913-
/**
914-
* Description courte de la classe
915-
*
916-
* Description longue de la classe, s'il y en a une
917-
*
918-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
919-
* @license http://framework.zend.com/license BSD License
920-
* @version Release: @package_version@
921-
* @link http://framework.zend.com/package/PackageName
922-
* @since Class available since Release 1.5.0
923-
* @deprecated Class deprecated in Release 2.0.0
924-
*/
925-
906+
.. code-block:: php
907+
:linenos:
926908
909+
/**
910+
* Short description for class
911+
*
912+
* Long description for class (if any)...
913+
*
914+
* @since Class available since Release 1.5.0
915+
* @deprecated Class deprecated in Release 2.0.0
916+
*/
927917
928918
.. _coding-standards.inline-documentation.functions:
929919

‎docs/languages/ru/modules/zendpdf.usage.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
:linenos:
1818
1919
<?php
20-
/**
21-
* @package ZendPdf
22-
* @subpackage demo
23-
*/
24-
2520
/** ZendPdf */
2621
require_once 'Zend/Pdf.php';
2722

0 commit comments

Comments
 (0)