Permalink
Browse files

Merge branch 'hotfix/ZF-8674-2' of https://github.com/thomasweidner/zf2

… into hotfix/zf-8674

Conflicts:
	documentation/manual/en/module_specs/Zend_Validate-Barcode.xml
	library/Zend/Filter/InputFilter.php
	tests/Zend/Filter/InputTest.php
	tests/Zend/Validator/BarcodeTest.php
  • Loading branch information...
2 parents 0f68501 + b439a21 commit ce30719954b9cc0f758df70b26bfdbf0d5410de3 @weierophinney weierophinney committed Aug 25, 2011
Showing with 12 additions and 0 deletions.
  1. +12 −0 documentation/manual/en/module_specs/Zend_Validate-Barcode.xml
@@ -28,6 +28,18 @@
<listitem>
<para>
+ <emphasis>CODE128</emphasis>: CODE128 is a high density barcode.
+ </para>
+
+ <para>
+ This barcode has no length limitation. It supports the first 128 ascii characters.
+ When used with printing characters it has an checksum which is calculated modulo 103.
+ This standard is used worldwide as it supports upper and lowercase characters.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<emphasis>CODE25</emphasis>: Often called "two of five" or "Code25 Industrial".
</para>

0 comments on commit ce30719

Please sign in to comment.