summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorHubert Figuiere <hub@figuiere.net>2006-10-07 13:20:49 +0000
committerHubert Figuiere <hub@figuiere.net>2006-10-07 13:20:49 +0000
commit29cd0647558dd51dedc6b4565ad6491790d957ba (patch)
treec6f6d3bfdb1c850635fac82bed35f9a27fc900f9 /doc
parent2def9b55b11f51a124b236f842f8f9bc2e12d205 (diff)
downloadlibgphoto2-29cd0647558dd51dedc6b4565ad6491790d957ba.tar.gz
* camlibs/canon/canon.c, camlibs/konica/qm150.c,
camlibs/ptp2/ptp.c, camlibs/sierra/library.c, camlibs/sierra/sierra-desc.c, doc/camlib_devel.lyx, libgphoto2/gphoto2-abilities-list.c: s/occured/occurred/ From Launchpad bug 61163: https://launchpad.net/distros/ubuntu/+source/libgphoto2/+bug/61163 git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9294 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'doc')
-rw-r--r--doc/camlib_devel.lyx2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/camlib_devel.lyx b/doc/camlib_devel.lyx
index b1e8fc2fe..95e1cfd1e 100644
--- a/doc/camlib_devel.lyx
+++ b/doc/camlib_devel.lyx
@@ -184,7 +184,7 @@ Cameras like to ping.
It usually starts out the communications, as well as confirms each packet
in any sort of "mass" transfer.
The opposite, a "NAK", is sent to basically say the last packet was not
- received, or an error has occured.
+ received, or an error has occurred.
Again, this is usually just a single byte as well.
\newline