14 files changed, 1234 insertions, 27 deletions

diff --git a/README b/README
index ad528b0a..2d82a22a 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ Prerequisites
 QPDF depends on external libraries "zlib" and "pcre".  These are part
 of virtually all Linux distributions and are readily available;
 download information appears in the documentation.  For Windows, you
-can download pre-built binary verisons of those libraries for some
+can download pre-built binary versions of those libraries for some
 compilers; see README-windows.txt for additional details.
 
 QPDF requires a C++ compiler that works with STL.  Your compiler must
@@ -72,7 +72,7 @@ Building on Windows
 QPDF is known to build and pass its test suite with mingw (latest
 version tested: gcc 4.6.2), mingw64 (latest version tested: 4.7.0) and
 Microsoft Visual C++ 2010, both 32-bit and 64-bit versions.  MSYS plus
-ActivateState Perl is required to build as well in order to get make
+ActiveState Perl is required to build as well in order to get make
 and other related tools.  See README-windows.txt for details on how to
 build under Windows, see README-windows.txt.
 
diff --git a/README-what-to-download.txt b/README-what-to-download.txt
index 287e5a84..3229323a 100644
--- a/README-what-to-download.txt
+++ b/README-what-to-download.txt
@@ -7,7 +7,7 @@ download.
 

  * qpdf-<version>-bin-mingw32.zip

 

-   If you just want to use the qpdf commandline program or use the

+   If you just want to use the qpdf command line program or use the

    qpdf DLL's C-language interface, you can download this file.  You

    can also download this version if you are using MINGW's gcc 4.4 and

    want to program using the C++ interface.

diff --git a/README-windows.txt b/README-windows.txt
index 33183880..682920ce 100644
--- a/README-windows.txt
+++ b/README-windows.txt
@@ -25,7 +25,7 @@ Make sure perl --version shows ActiveState perl.
 

 To install MinGW-w64, first install msys and mingw32 as above.

 

-From MinGW-w64 download page, go to "Toolchains targetting

+From MinGW-w64 download page, go to "Toolchains targeting

 Win64/Automated Builds" and find the latest mingw-w64 that runs under

 i686-mingw.  It will be called something like

 mingw-w64-bin_i686-mingw_yyyymmdd.zip.  The compiler binaries are

@@ -55,8 +55,8 @@ There are packages called external-libs-bin.zip and
 external-libs-src.zip.  If you are building with MSVC 2010 or MINGW,

 you can just extract the qpdf-external-libs-bin.zip zip file into the

 top-level qpdf source tree.  Note that you need the 2012-06-20 version

-(at least) to build qpdf 3.0 or greater since this incldues 64-bit

-libaries.  It will create a directory called external-libs which

+(at least) to build qpdf 3.0 or greater since this includes 64-bit

+libraries.  It will create a directory called external-libs which

 contains header files and precompiled libraries.  Passing

 --enable-external-libs to ./configure (which is done automatically if

 you follow the instructions below) is sufficient to find them.

@@ -83,7 +83,7 @@ Building with MinGW
 QPDF is known to build and pass its test suite with mingw (latest

 version tested: gcc 4.6.2), mingw64 (latest version tested: 4.7.0) and

 Microsoft Visual C++ 2010, both 32-bit and 64-bit versions.  MSYS plus

-ActivateState Perl is required to build as well in order to get make

+ActiveState Perl is required to build as well in order to get make

 and other related tools.  While it is possible that Cygwin could be

 used to build native Windows versions of qpdf, this configuration has

 not been tested recently.

diff --git a/README.maintainer b/README.maintainer
index bbf99461..e400034f 100644
--- a/README.maintainer
+++ b/README.maintainer
@@ -5,7 +5,7 @@ Release Reminders
    image comparison tests (--enable-test-compare-images
    --with-large-file-test-path=/path).  For a major release, consider
    running a spelling checker over the source code to catch errors in
-   variable names, strings, and comments.
+   variable names, strings, and comments.  Use ispell -p ispell-words.
 
  * Consider running tests with latest gcc and/or valgrind.  To do
    this, replace, build with debugging and without shared libraries.
@@ -101,7 +101,7 @@ Release Reminders
 
    git tag -s release-qpdf-$version HEAD -m'qpdf $version'
 
- * When releasing on source forge, external-libs distributions go in
+ * When releasing on sourceforge, external-libs distributions go in
    external-libs/yyyymmdd, and qpdf distributions go in qpdf/vvv
 
 
diff --git a/TODO b/TODO
index 3e27f0e5..a753b8da 100644
--- a/TODO
+++ b/TODO
@@ -96,8 +96,8 @@ Index: QPDFWriter.cc
 ------------------------------
 
  * Handle embedded files.  PDF Reference 1.7 section 3.10, "File
-   Specifications", discusses this.  Once we can definitely recongize
-   all embedded files in a docucment, we can update the encryption
+   Specifications", discusses this.  Once we can definitely recognize
+   all embedded files in a document, we can update the encryption
    code to handle it properly.  In QPDF_encryption.cc, search for
    cf_file.  Remove exception thrown if cf_file is different from
    cf_stream, and write code in the stream decryption section to use
@@ -171,5 +171,5 @@ Index: QPDFWriter.cc
    providing some mechanism to recover earlier versions of a file
    embedded prior to appended sections.
 
- * From a suggestion in bug 3152169, consisder having an option to
+ * From a suggestion in bug 3152169, consider having an option to
    re-encode inline images with an ASCII encoding.
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh
index a8ef1085..0375b832 100644
--- a/include/qpdf/QPDFObjectHandle.hh
+++ b/include/qpdf/QPDFObjectHandle.hh
@@ -173,7 +173,7 @@ class QPDFObjectHandle
     // of the data buffer.  If additional keys are required, the
     // stream's dictionary may be retrieved by calling getDict(), and
     // the resulting dictionary may be modified.  This method is just
-    // a convient wrapper around the newStream() and
+    // a convenient wrapper around the newStream() and
     // replaceStreamData().  It is a convenience methods for streams
     // that require no parameters beyond the stream length.  Note that
     // you don't have to deal with compression yourself if you use
diff --git a/ispell-words b/ispell-words
new file mode 100644
index 00000000..51f70a1d
--- /dev/null
+++ b/ispell-words
@@ -0,0 +1,1207 @@
+aaa
+ab
+abc
+ABCD
+abcde
+abcdefABCDEF
+abcdefghijklmnopqrstuvwxyz
+ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi
+abÏ
+abs
+abuild
+ac
+accessor
+aclocal
+AcroForm
+acroread
+activatePipelineStack
+ActiveState
+acyclic
+addPage
+addPageAt
+addPageContents
+addToTable
+adjustAESStreamLength
+admon
+Adobeâ
+aes
+AESv
+ageneration
+AHx
+AIX
+alloc
+allocator
+allowAccessibility
+allowExtractAll
+allowModifyAll
+allowModifyAnnotation
+allowModifyAssembly
+allowModifyForm
+allowModifyOther
+allowPoundAnywhereInName
+allowPrintHighRes
+allowPrintLowRes
+antivirus
+aobjid
+apexcovantage
+API
+APIs
+appendItem
+appendString
+arg
+argc
+argv
+arko
+arko's
+ArtBox
+ascii
+asciiHex
+ASCIIHexDecode
+ASCIIHexDecoder
+assertArray
+assertBool
+assertDictionary
+assertIndirect
+assertInitialized
+assertInteger
+assertName
+assertNull
+assertNumber
+assertPageObject
+assertReal
+assertReserved
+assertScalar
+assertStream
+assertString
+assertType
+assignCompressedObjectNumbers
+atof
+atoi
+AuthEvent
+autobuilder
+autoconf
+autogen
+autoheader
+autolabel
+automake
+autotools
+backref
+backreference
+backrefs
+badLength
+BADMAGIC
+BADOPTION
+BaseFont
+basename
+Berkenbilt
+betweenTokens
+binmode
+BitsPerComponent
+bitstream
+BitStream
+BitWriter
+BleedBox
+boldseq
+bookinfo
+bool
+bp
+bs
+BT
+buf
+BufferInputSource
+buflen
+bufpl
+bufsize
+BUGREPORT
+buildrules
+bw
+bytesNeeded
+calculateHOutline
+calculateHPageOffset
+calculateHSharedObject
+calculateLinearizationData
+calculateXrefStreamPadding
+callHello
+CAPTURECOUNT
+cbc
+cc
+ccase
+CCF
+CCITTFaxDecode
+cd
+cdict
+ce
+cerr
+cf
+CFM
+ch
+ChangeLog
+Checkboxes
+checkDataChecksum
+checkError
+checkFileChecksum
+checkHOutlines
+checkHPageOffset
+checkHSharedObject
+checkLinearization
+checkLinearizationInternal
+checkPageContents
+checkUnread
+CHGeneric
+cho
+CHPageOffset
+CHPageOffsetEntry
+CHSharedObject
+CHSharedObjectEntry
+CHSomething
+ciphertext
+cl
+classname
+clearPipelineStack
+cleartext
+closeObject
+cmd
+codepoint
+ColorSpace
+com
+compareVersions
+compatbility
+concat
+Cond
+config
+const
+contrib
+CopiedStreamDataProvider
+copyEncryptionParameters
+copyForeign
+copyForeignObject
+cout
+CoVantage
+cp
+cph
+cphe
+cplusplus
+CPPFLAGS
+cr
+createPageContents
+createWhat
+CreationDate
+CRNL
+CropBox
+CryptFilterDecodeParms
+cso
+csoe
+css
+cstr
+cstring
+ctest
+ctype
+cygwin
+daae
+DCT
+DCTDecode
+ddd
+de
+debian
+declspec
+DecodeParms
+decodeRow
+decodeStreams
+decrypt
+decrypted
+decrypter
+decrypting
+decryptStream
+decryptString
+def
+deflateEnd
+deflateInit
+defq
+delphi
+dereference
+dereferenced
+dest
+DESTDIR
+detecet
+DeviceGray
+DeviceRGB
+dict
+diff
+diffs
+diffutils
+DIR
+dirname
+disableCBC
+disableIncompatibleEncryption
+dist
+distclean
+dlfcn
+DLL
+DLL's
+dllexport
+dlls
+DLLs
+docbook
+DOCBOOKX
+docdir
+DocOpen
+DOCTYPE
+doubleBoxSize
+DTD
+dtdvalid
+dumpHGeneric
+dumpHPageOffset
+dumpHSharedObject
+dumpInfoDict
+dumpLinearizationDataInternal
+dwHighDateTime
+dwLowDateTime
+DWORD
+earlychange
+EarlyChange
+EF
+EFF
+efgh
+EI
+elif
+elt
+EmbeddedFiles
+emptyPDF
+en
+encodeDataIncrementally
+encodeFile
+encodeRow
+encodeString
+EncryptionData
+EncryptionParameters
+EncryptMetadata
+endian
+endif
+endl
+endobj
+endpos
+endstream
+enqueue
+enqueueing
+enqueueObject
+enqueuePart
+enqueues
+enqueuing
+enum
+env
+envar
+eod
+eof
+eol
+epub
+eraseItem
+Erdelsky's
+errno
+erroffset
+errptr
+esize
+exc
+exe
+exp
+extern
+fb
+fBqpdf
+fclose
+fcntl
+fd
+ferror
+FF
+ffff
+fflush
+fghij
+fi
+fI
+fIinfilename
+fileinfo
+FileInputSource
+fileno
+filenow
+filep
+FILETIME
+filetrailer
+filterCompressedObjects
+findAndSkipNextEOL
+findPage
+fIoptions
+fIoutfilename
+firstname
+firstterm
+fl
+flate
+FlateDecode
+flattenPagesTree
+flattenScalarReferences
+fn
+fname
+fo
+fopen
+forcePDFVersion
+fprintf
+fR
+fread
+fseek
+fseeki
+fseeko
+ftell
+ftelli
+ftello
+fullinfo
+fullpad
+func
+fwrite
+GajiÄ
+gcc
+gen
+generateHintStream
+generateID
+generateObjectStreams
+genok
+getAllPages
+getAllPagesInternal
+getArrayAsVector
+getArrayItem
+getArrayNItems
+getAsArray
+getAsMap
+getAsVector
+getBits
+getBoolValue
+getBuffer
+getCompressibleObjects
+getCount
+getDataChecksum
+getDict
+getDictAsMap
+getenv
+GetEnvironmentVariable
+getErrorCode
+getErrorMessage
+getFileChecksum
+getFilename
+getFilePosition
+getFirstChar
+getGeneration
+getHexDigest
+getIntValue
+getItem
+getKey
+getKeyForObject
+getKeys
+getLastChar
+getLastOffset
+getLength
+getLinearizationOffset
+getLinearizedParts
+getMatch
+getMessageDetail
+getName
+getNext
+getNItems
+getNumericValue
+getObject
+getObjectByID
+getObjectID
+getObjectStreamData
+getObjStreamIndex
+getObjStreamNumber
+getOffset
+getOffsetLength
+getOwningQPDF
+getPaddedUserPassword
+getPageContents
+getPageImages
+getPDFVersion
+getPointer
+getRawStreamData
+getRawValue
+getRealValue
+getRefcount
+getRoot
+getSize
+getStreamData
+getStringValue
+GetSystemTime
+getToken
+getTrailer
+getTrimmedUserPassword
+getTrimmedUserPassword's
+getType
+GETU
+getUncompressedObject
+getUserPassword
+getUTF
+getVal
+getValue
+getWarnings
+getWhoami
+GG
+ghostscript
+GhostScript
+github
+glerbl
+glibc
+gm
+grayscale
+gt
+GUIs
+gz
+gzip
+HAGOOGAMAGOOGLE
+handleCode
+handleData
+hasKey
+hb
+hbp
+Hdict
+Helvetica
+hexkey
+hexkeylen
+hexstring
+hexstrings
+HGeneric
+hh
+HighPart
+hlen
+Hoffmann
+HOi
+HPageOffset
+HPageOffsetEntry
+href
+HS
+HSharedObject
+HSharedObjectEntry
+HSi
+HSomething
+HSomethingEntry
+htm
+html
+http
+https
+ic
+icc
+iconv
+IDs
+idx
+ifdef
+ifeq
+iff
+ifndef
+Im
+ImageC
+ImageChecker
+ImageInverter
+ImageMask
+ImageProvider
+inbuf
+INDOC
+indx
+inf
+infile
+infilename
+inflateEnd
+inflateInit
+inflateReset
+init
+initializeEncryption
+initializePipelineStack
+initializeSpecialStreams
+initializeVector
+inline
+inode
+inputLen
+InputSource
+insertItem
+insertPage
+insertPageobjToPage
+insertXrefEntry
+inst
+int
+interpretCF
+interpretR
+ints
+inttypes
+inv
+inverter
+io
+IOLBF
+iostream
+isArray
+isBool
+isDictionary
+isdigit
+isEncrypted
+isIndirect
+isInitialized
+isInteger
+isLinearized
+isName
+isNull
+isNumber
+iso
+isOrHasName
+isPageObject
+isPagesObject
+ispell
+isReal
+isReserved
+isScalar
+isspace
+isStream
+isString
+istype
+italicseq
+itemizedlist
+iter
+ith
+Jian
+jklmnopqrstuvwxyz
+keybits
+keylen
+KEYLENGTH
+LARGEFILE
+lastnum
+lastreleased
+latin
+lbuf
+lc
+ld
+LDFLAGS
+ldquo
+len
+lengthNextN
+Lexer
+lhs
+libgcc
+libqpdf
+libs
+libtests
+libtiff
+libtool
+libtool's
+libtoolize
+libtools
+libz
+lin
+lindict
+linearization
+linearize
+linearized
+linearizing
+linefeeds
+linkend
+linkey
+linp
+LinParameters
+linux
+listitem
+ll
+lld
+lookup
+lossy
+LowPart
+lpcre
+lqpdf
+lsb
+lt
+ltmain
+lu
+lval
+lx
+lz
+lzw
+LZWDecode
+LZWDecoder
+m'qpdf
+makeDirect
+makeDirectInternal
+Makefile
+makeIndirectObject
+malloc
+manualFinish
+maxEnd
+maxval
+md
+mdash
+MDd
+mediabox
+MediaBox
+MEM
+Memcheck
+memchr
+memcmp
+memcpy
+memmove
+memset
+merchantability
+metadata
+min
+mingw
+MinGW
+MINGW's
+mins
+misc
+MixColumn
+mk
+mkinstalldirs
+monoseq
+MSC
+msg
+msvc
+MSVC's
+msys
+multibyte
+multithreaded
+Mutator
+mutators
+mv
+nbackrefs
+nbits
+nbsp
+nbytes
+nch
+ndash
+nendobj
+nendstream
+newArray
+newBool
+NewDict
+newDictionary
+newIndirect
+newInteger
+newName
+newNull
+newpage
+newpdf
+newReal
+newReserved
+newStream
+newString
+nfirst
+nitems
+nl
+nmatches
+nMatches
+NoBackref
+nobjects
+NOMATCH
+NOMEMORY
+nonprintable
+noout
+normalizeName
+normalizer
+npages
+npos
+nrounds
+nshared
+nspaces
+nstream
+nstripes
+ntotal
+NUL
+num
+numrange
+nval
+nwalsh
+obj
+ObjAccessor
+ObjCache
+ObjCopier
+OBJDIR
+ObjectHolder
+ObjGen
+ObjGens
+objGenToIndirect
+objid
+objidok
+objok
+ObjStm
+ObjUser
+objusers
+oc
+og
+ogs
+oiter
+okey
+ol
+olist
+omap
+op
+OpenAction
+openObject
+opensource
+ord
+org
+orig
+orred
+os
+ostream
+ostringstream
+OtherPage
+ou
+ous
+outbuf
+OUTDOC
+outfile
+outfilename
+outputLengthNextN
+ovecsize
+ovector
+padLen
+Paeth
+pagemode
+PageMode
+pageno
+pageobj
+PageSpec
+para
+param
+parms
+parseInternal
+parseVersion
+partLen
+pathsep
+Pavlyuk
+pb
+pbytes
+pcre
+pcreapi
+pdf
+PDFâ
+pdfDumpInfoDict
+PDFS
+pdlin
+pe
+perl
+ph
+phe
+php
+pipeStreamData
+pipeStringAndFinish
+Pkey
+PKI
+pl
+plaintext
+png
+PNGFilter
+pngify
+PointerHolder
+popPipelineStack
+pos
+POSIX
+PP
+pre
+precompiled
+prefilering
+prefiltering
+presentCharacter
+presentEOF
+preserveObjectStreams
+prev
+printability
+printf
+processChar
+processFile
+processMemoryFile
+processRow
+processXRefStream
+procset
+ProcSet
+procsets
+programlisting
+provideStreamData
+PSâ
+pt
+pthread
+ptr
+pushDiscardFilter
+pushEncryptionFilter
+pushInheritedAttributesToPage
+pushInheritedAttributesToPageInternal
+pushOutlinesToPart
+pushPipeline
+PUTU
+qarray
+QArray
+qdf
+QDFObject
+QDFWriter
+qdict
+QDict
+QEXC
+qnumbers
+QNumbers
+qpdf
+qpdf's
+QPDF's
+QPDFCONSTANTS
+QPDFExc
+QPDFObject
+QPDFObjectHandle
+QPDFObjectTypeAccessor
+QPDFPageData
+qpdfs
+QPDFStream
+QPDFTokenizer
+QPDFTYPES
+QPDFVersion
+QPDFWriter
+QPDFXRefEntry
+qqqcqqq
+qstream
+QStream
+QStreams
+qstrings
+QStrings
+QTC
+qtest
+QTest
+QuadPart
+QUtil
+qwert
+rand
+rb
+rbegin
+rc
+rcon
+RDONLY
+rdquo
+readHGeneric
+readHintStream
+readHPageOffset
+readHSharedObject
+readLine
+readLinearizationData
+README
+readObject
+readObjectAtOffset
+readToken
+reattached
+recompress
+recompressing
+recomputation
+recoverStreamLength
+refcount
+refpage
+refpos
+regexp
+registerForeignStream
+releaseResolved
+ReleaseResolver
+remotesensing
+removeKey
+removePage
+repl
+replaceDict
+replaceFilterData
+replaceForeignIndirectObjects
+replaceKey
+replaceObject
+replaceOrRemoveKey
+replaceReserved
+replaceStreamData
+reserveObjects
+resolveObjectsInStream
+retargeted
+retested
+reverseResolved
+rf
+rfont
+rhs
+rijndael
+rijndaelDecrypt
+rijndaelEncrypt
+rijndaelSetupDecrypt
+rijndaelSetupEncrypt
+rk
+Rkey
+RKLENGTH
+RL
+rm
+roundoff
+RSA
+rstream
+RStream
+RunLengthDecode
+runtest
+sAlT
+se
+sed
+seekable
+sendNextCode
+sep
+seq
+serif
+setArrayFromVector
+setArrayItem
+setAttemptRecovery
+setContentNormalization
+setDataKey
+setEncryptionParameters
+setEncryptionParametersInternal
+setFile
+setFilename
+setFromVector
+setIgnoreXRefStreams
+setItem
+setLastObjectDescription
+setLastOffset
+setLinearization
+setLineBuf
+setMinimumPDFVersion
+setmode
+setObjectStreamMode
+setObjGen
+setOutputFile
+setOutputFilename
+setOutputMemory
+setOutputStreams
+setPreserveEncryption
+setQDFMode
+setR
+setStaticAesIV
+setStaticID
+setStreamDataMode
+setSuppressOriginalObjectIDs
+setSuppressWarnings
+setTrailer
+setvbuf
+shallowCopy
+showLinearizationData
+showXRefTable
+sizeof
+skipToNextByte
+soe
+sourceforge
+SourceForge
+sprintf
+srand
+srandom
+src
+sstream
+startoffset
+startxref
+stat
+std
+STDC
+StdCF
+stderr
+stdexcept
+stdin
+stdint
+StdioFile
+stdlib
+stdout
+STL
+StmF
+str
+strchr
+strcmp
+strcpy
+StreamDataProvider
+strerror
+StrF
+StringDecrypter
+stripesize
+strlen
+strncmp
+stronghorse
+strrchr
+strstr
+strtoi
+strtol
+strtoll
+struct
+stylesheet
+stylesheets
+subclasses
+SubFilter
+SubFilters
+Subramanyam
+substr
+substring
+Subtype
+supp
+suppressions
+swapObjects
+swversion
+Symlink
+sys
+sysnow
+SYSTEMTIME
+SystemTimeToFileTime
+TARNAME
+tbuf
+tc
+Td
+Te
+TESTSUITE
+Tf
+tgen
+th
+Tj
+tmp
+tnum
+Tobias
+tobj
+tobjid
+TODO
+toffset
+tokenized
+tokenizer
+tokenizing
+toolchain
+Toolchains
+toupper
+toUTF
+TrimBox
+trimTrailerForWrite
+tt
+txt
+uc
+udata
+uinow
+uint
+uiter
+UL
+ULARGE
+ulink
+uLong
+ULONGLONG
+uncompresesd
+uncompress
+uncompressing
+undef
+unencrypted
+unfilterable
+ungetc
+unicode
+uninstalled
+unistd
+unlink
+unlinked
+unparse
+unparseChild
+unparseObject
+unparseResolved
+unreadCh
+unreferenced
+unresolvable
+unretrieved
+upass
+updateAllPagesCache
+updateObjectMaps
+updateObjectMapsInternal
+updatePagesCache
+url
+UseOutlines
+useStaticIV
+USLetter
+usr
+utf
+Util
+utils
+uval
+val
+valgrind
+valstr
+var
+variablelist
+varlistentry
+varname
+vc
+vec
+vecs
+VER
+viewable
+ViewerPreferences
+Vitaliy
+Vkey
+vlen
+voidpf
+vvv
+wb
+werror
+whoami
+WinAnsiEncoding
+writeBinary
+writeBits
+writeBuffer
+writeEncryptionDictionary
+writeHeader
+writeHGeneric
+writeHintStream
+writeHPageOffset
+writeHSharedObject
+writeLinearized
+writeNext
+writeObject
+writeObjectStream
+writeObjectStreamOffsets
+writePad
+writeStandard
+writeString
+writeStringNoQDF
+writeStringQDF
+writeToken
+writeTrailer
+writeXRefStream
+writeXRefTable
+www
+wxWindows
+xA
+xa
+xABUL
+xbebfbc
+xbf
+xc
+xD
+xDC
+xeaa
+xefcdab
+xF
+xf
+xFC
+xfcefa
+xfde
+xfe
+xff
+xffeff
+xfffa
+xfffe
+xgen
+xhtml
+xml
+XMLLINT
+xmlns
+xobj
+xobject
+XObject
+xor
+xpacket
+xpdf
+XRef
+xref
+XRefStm
+xrefStream
+xrefTable
+xsl
+XSLTPROC
+XXX
+yn
+yuiop
+yyyymmdd
+z's
+zalloc
+zdata
+Zeroize
+zeroizing
+zfree
+zlib
+zstream
+zzzzz
+zzzzzz
diff --git a/libqpdf/QPDF_pages.cc b/libqpdf/QPDF_pages.cc
index ddb672a1..36ca951d 100644
--- a/libqpdf/QPDF_pages.cc
+++ b/libqpdf/QPDF_pages.cc
@@ -151,7 +151,7 @@ QPDF::insertPageobjToPage(QPDFObjectHandle const& obj, int pos,
 void
 QPDF::insertPage(QPDFObjectHandle newpage, int pos)
 {
-    // pos is numbered from 0, so pos = 0 inserts at the begining and
+    // pos is numbered from 0, so pos = 0 inserts at the beginning and
     // pos = npages adds to the end.
 
     flattenPagesTree();
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index 1c7e390f..20143087 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -1,4 +1,4 @@
-// Include qpdf-config.h first so off_t is gauaranteed to have the right size.
+// Include qpdf-config.h first so off_t is guaranteed to have the right size.
 #include <qpdf/qpdf-config.h>
 
 #include <qpdf/QUtil.hh>
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 1b87fdf9..e6671d9f 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -1083,7 +1083,7 @@ outfile.pdf</option>
     <option>--normalize-content=y</option> is also given, qpdf will
     attempt to normalize the stream data as if it is a page content
     stream.  This attempt will be made even if it is not a page
-    content stream, in which case it will produce unusuable results.
+    content stream, in which case it will produce unusable results.
    </para>
   </sect1>
  </chapter>
@@ -2861,7 +2861,7 @@ print "\n";
         On Windows, it is possible to build a DLL.  Additionally, a
         partial C-language API has been introduced, which makes it
         possible to call qpdf functions from non-C++ environments.  I
-        am very grateful to Zarko Gagic (<ulink
+        am very grateful to <!-- Žarko Gajić --> Zarko Gagic (<ulink
         url="http://delphi.about.com/">http://delphi.about.com/</ulink>)
         for tirelessly testing numerous pre-release versions of this
         DLL and providing many excellent suggestions on improving the
diff --git a/qpdf/qpdf-ctest.c b/qpdf/qpdf-ctest.c
index 0b6c5f1f..072e5a7c 100644
--- a/qpdf/qpdf-ctest.c
+++ b/qpdf/qpdf-ctest.c
@@ -350,7 +350,7 @@ static void test16(char const* infile,
     print_info("/Producer");
     print_info("/Creator");
     qpdf_set_info_key(qpdf, "/Author", "Mr. Potato Head");
-    qpdf_set_info_key(qpdf, "/Producer", "QPDF libary");
+    qpdf_set_info_key(qpdf, "/Producer", "QPDF library");
     qpdf_set_info_key(qpdf, "/Creator", 0);
     print_info("/Author");
     print_info("/Producer");
diff --git a/qpdf/qtest/qpdf/c-info-out.pdf b/qpdf/qtest/qpdf/c-info-out.pdf
index 5b4c46cf..4a816889 100644
--- a/qpdf/qtest/qpdf/c-info-out.pdf
+++ b/qpdf/qtest/qpdf/c-info-out.pdf
@@ -4,7 +4,7 @@
 << /Pages 3 0 R /Type /Catalog >>
 endobj
 2 0 obj
-<< /Author (Mr. Potato Head) /Producer (QPDF libary) >>
+<< /Author (Mr. Potato Head) /Producer (QPDF library) >>
 endobj
 3 0 obj
 << /Count 1 /Kids [ 4 0 R ] /Type /Pages >>
@@ -33,12 +33,12 @@ xref
 0000000000 65535 f 
 0000000015 00000 n 
 0000000064 00000 n 
-0000000135 00000 n 
-0000000194 00000 n 
-0000000337 00000 n 
-0000000430 00000 n 
-0000000537 00000 n 
+0000000136 00000 n 
+0000000195 00000 n 
+0000000338 00000 n 
+0000000431 00000 n 
+0000000538 00000 n 
 trailer << /Info 2 0 R /Root 1 0 R /Size 8 /ID [<31415926535897932384626433832795><31415926535897932384626433832795>] >>
 startxref
-567
+568
 %%EOF
diff --git a/qpdf/qtest/qpdf/c-info1.out b/qpdf/qtest/qpdf/c-info1.out
index 8ec9497f..625eaa36 100644
--- a/qpdf/qtest/qpdf/c-info1.out
+++ b/qpdf/qtest/qpdf/c-info1.out
@@ -2,5 +2,5 @@ Info key /Author: (null)
 Info key /Producer: (null)
 Info key /Creator: (null)
 Info key /Author: Mr. Potato Head
-Info key /Producer: QPDF libary
+Info key /Producer: QPDF library
 Info key /Creator: (null)
diff --git a/qpdf/qtest/qpdf/c-info2.out b/qpdf/qtest/qpdf/c-info2.out
index 0b25722b..61d37359 100644
--- a/qpdf/qtest/qpdf/c-info2.out
+++ b/qpdf/qtest/qpdf/c-info2.out
@@ -2,5 +2,5 @@ Info key /Author: Someone Else
 Info key /Producer: Something Else
 Info key /Creator: A. Nony Mous
 Info key /Author: Mr. Potato Head
-Info key /Producer: QPDF libary
+Info key /Producer: QPDF library
 Info key /Creator: (null)