diff --git a/HACKING.md b/HACKING.md index 127be34..1357502 100644 --- a/HACKING.md +++ b/HACKING.md @@ -22,7 +22,7 @@ Gitlab: You can use git clone to get the latest version from any of the above repositories. -if you haven't already, grab the ZBar git repository. For example, to +If you haven't already, grab the ZBar git repository. For example, to get it from Github, use: git clone https://github.com/mchehab/zbar.git @@ -30,9 +30,9 @@ get it from Github, use: autoreconf -vfi This will generate ./configure and all that other foo you usually get with -a release. you will need to have recent versions of some basic "developer +a release. You will need to have recent versions of some basic "developer tools" installed in order for this to work, particularly GNU autotools. -these versions of autotools are known to work (newer versions should also +These versions of autotools are known to work (newer versions should also be fine): GNU autoconf 2.61 GNU automake 1.10.1 @@ -40,9 +40,9 @@ be fine): GNU gettext 0.18.1.1 GNU pkg-config 0.25 xmlto 0.0.20-5 (for docs building) -all above mentioned tools (except xmlto) must be installed in the same -prefix. mixing prefixes (i.g. /usr/bin and /usr/local/bin) may lead to -errors in configuration stages +All above mentioned tools (except xmlto) must be installed in the same +prefix. Mixing prefixes (e.g. /usr/bin and /usr/local/bin) may lead to +errors in configuration stages. Writing descriptions for your patches ===================================== @@ -60,7 +60,7 @@ In practice, please add: Signed-off-by: your name -on your pathes. +on your patches. Submitting patches ================== @@ -81,7 +81,7 @@ your e-mails for us to not mix them with patches for the Kernel or for other media tools. - and want to make your patch, run: + To make your patch, run: git diff > hacked.patch diff --git a/NEWS.md b/NEWS.md index bb69b97..36e21b4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -35,7 +35,7 @@ Version 0.21 (2019-02-12) Added support for SQ code, and the ability of compiling ZBar with the LLVM/Clang compiler. Several bugs fixes and enhancements are also found - in this release; qexisting users are encouraged to upgrade. + in this release; existing users are encouraged to upgrade. Version 0.20.1 (2018-08-08) =========================== diff --git a/README-windows.md b/README-windows.md index 0cf678d..f90e8ce 100644 --- a/README-windows.md +++ b/README-windows.md @@ -6,7 +6,7 @@ from various sources, such as video streams, image files and raw intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code. Included with the library are basic applications for decoding captured bar code images and using a video device -(eg, webcam) as a bar code scanner. For application developers, language +(e.g. webcam) as a bar code scanner. For application developers, language bindings are included for C, C++, Python and Perl as well as GUI widgets for Qt, GTK and PyGTK. @@ -199,7 +199,7 @@ To start the webcam reader using the default camera, type: zbarcam -To decode an image file, type eg: +To decode an image file, type e.g.: zbarimg -d examples\barcode.png diff --git a/README.md b/README.md index 9f05a93..0214cfd 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code. Included with the library are basic applications for decoding captured bar -code images and using a video device (eg, webcam) as a bar code scanner. +code images and using a video device (e.g. webcam) as a bar code scanner. For application developers, language bindings are included for C, C++, Python 2 and Perl as well as GUI widgets for Qt, GTK and PyGTK 2.0. diff --git a/android/README b/android/README index bbdee3e..392cdf8 100644 --- a/android/README +++ b/android/README @@ -19,7 +19,7 @@ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt Copyright 2008-2012 © Jeff Brown et al The Android distribution also includes pre-compiled binaries of -supporting libaries, for which copyright, license and source code +supporting libraries, for which copyright, license and source code locations are as follows: * The GNU libiconv character set conversion library Copyright (C) 1999-2011 Free Software Foundation, Inc. @@ -47,7 +47,7 @@ Option 2 - via Eclipse Right click on Android Project Select "Import" -> "File System" Select "Browse" (next to "From directory File" and select the - ZBar-Android-SDK-/libs directory and click "Open". + ZBar-Android-SDK-/libs directory and click "Open". Click the check box next to "libs" and the "Options" "Create top-level folder" check box (below). Then click "Finish". @@ -63,7 +63,7 @@ You have to add the zbar.jar file to your build path 2) right-click, select "Build Path" -> "Add to Build Path" Via command-line -You are all set; ant will automatcially find jar files under the "libs" +You are all set; ant will automatically find jar files under the "libs" subdirectory. Documentation