diff --git a/words.h b/words.h
index 6e5dfb00..5d028bab 100644
--- a/words.h
+++ b/words.h
@@ -11,19 +11,40 @@
 
 NAMESPACE_BEGIN(CryptoPP)
 
-inline size_t CountWords(const word *X, size_t N)
+/// \brief Count the number of words
+/// \param x word array
+/// \param n size of the word array, in elements
+/// \returns number of words used in the array.
+/// \details CountWords counts the number of words in a word array.
+///  Leading 0-words are not included in the count.
+/// \since Crypto++ 1.0
+inline size_t CountWords(const word *x, size_t n)
 {
-	while (N && X[N-1]==0)
-		N--;
-	return N;
+	while (n && x[n-1]==0)
+		n--;
+	return n;
 }
 
+/// \brief Set the value of words
+/// \param r word array
+/// \param a value
+/// \param n size of the word array, in elements
+/// \details SetWords sets all elements in the word array to the
+///  specified value.
+/// \since Crypto++ 1.0
 inline void SetWords(word *r, word a, size_t n)
 {
 	for (size_t i=0; i<n; i++)
 		r[i] = a;
 }
 
+/// \brief Copy word array
+/// \param r destination word array
+/// \param a source word array
+/// \param n size of the word array, in elements
+/// \details CopyWords copies the source word array to the destination
+///  word array.
+/// \since Crypto++ 1.0
 inline void CopyWords(word *r, const word *a, size_t n)
 {
 	if (r != a)
@@ -34,42 +55,97 @@ inline void CopyWords(word *r, const word *a, size_t n)
 #endif
 }
 
+/// \brief XOR word arrays
+/// \param r destination word array
+/// \param a first source word array
+/// \param b second source word array
+/// \param n size of the word array, in elements
+/// \details XorWords XORs the two source word arrays and copies the
+///  result to the destination word array.
+/// \since Crypto++ 1.0
 inline void XorWords(word *r, const word *a, const word *b, size_t n)
 {
 	for (size_t i=0; i<n; i++)
 		r[i] = a[i] ^ b[i];
 }
 
+/// \brief XOR word arrays
+/// \param r destination word array
+/// \param a source word array
+/// \param n size of the word array, in elements
+/// \details XorWords XORs the source word array with the
+///  destination word array.
+/// \since Crypto++ 1.0
 inline void XorWords(word *r, const word *a, size_t n)
 {
 	for (size_t i=0; i<n; i++)
 		r[i] ^= a[i];
 }
 
+/// \brief AND word arrays
+/// \param r destination word array
+/// \param a first source word array
+/// \param b second source word array
+/// \param n size of the word array, in elements
+/// \details AndWords ANDs the two source word arrays and copies the
+///  result to the destination word array.
+/// \since Crypto++ 1.0
 inline void AndWords(word *r, const word *a, const word *b, size_t n)
 {
 	for (size_t i=0; i<n; i++)
 		r[i] = a[i] & b[i];
 }
 
+/// \brief AND word arrays
+/// \param r destination word array
+/// \param a source word array
+/// \param n size of the word array, in elements
+/// \details AndWords ANDs the source word array with the
+///  destination word array.
+/// \since Crypto++ 1.0
 inline void AndWords(word *r, const word *a, size_t n)
 {
 	for (size_t i=0; i<n; i++)
 		r[i] &= a[i];
 }
 
+/// \brief OR word arrays
+/// \param r destination word array
+/// \param a first source word array
+/// \param b second source word array
+/// \param n size of the word array, in elements
+/// \details OrWords ORs the two source word arrays and copies the
+///  result to the destination word array.
+/// \since Crypto++ 1.0
 inline void OrWords(word *r, const word *a, const word *b, size_t n)
 {
 	for (size_t i=0; i<n; i++)
 		r[i] = a[i] | b[i];
 }
 
+/// \brief OR word arrays
+/// \param r destination word array
+/// \param a source word array
+/// \param n size of the word array, in elements
+/// \details OrWords ORs the source word array with the
+///  destination word array.
+/// \since Crypto++ 1.0
 inline void OrWords(word *r, const word *a, size_t n)
 {
 	for (size_t i=0; i<n; i++)
 		r[i] |= a[i];
 }
 
+/// \brief Left shift word array
+/// \param r word array
+/// \param n size of the word array, in elements
+/// \param shiftBits number of bits to shift
+/// \returns word shifted out
+/// \details ShiftWordsLeftByBits shifts the word array left by
+///  shiftBits. ShiftWordsLeftByBits shifts bits out on the left;
+///  it does not extend the array.
+/// \note shiftBits must be less than WORD_BITS.
+/// \since Crypto++ 1.0
 inline word ShiftWordsLeftByBits(word *r, size_t n, unsigned int shiftBits)
 {
 	CRYPTOPP_ASSERT (shiftBits<WORD_BITS);
@@ -84,6 +160,15 @@ inline word ShiftWordsLeftByBits(word *r, size_t n, unsigned int shiftBits)
 	return carry;
 }
 
+/// \brief Right shift word array
+/// \param r word array
+/// \param n size of the word array, in elements
+/// \param shiftBits number of bits to shift
+/// \returns word shifted out
+/// \details ShiftWordsRightByBits shifts the word array shight by
+///  shiftBits. ShiftWordsRightByBits shifts bits out on the right.
+/// \note shiftBits must be less than WORD_BITS.
+/// \since Crypto++ 1.0
 inline word ShiftWordsRightByBits(word *r, size_t n, unsigned int shiftBits)
 {
 	CRYPTOPP_ASSERT (shiftBits<WORD_BITS);
@@ -98,6 +183,14 @@ inline word ShiftWordsRightByBits(word *r, size_t n, unsigned int shiftBits)
 	return carry;
 }
 
+/// \brief Left shift word array
+/// \param r word array
+/// \param n size of the word array, in elements
+/// \param shiftWords number of words to shift
+/// \details ShiftWordsLeftByWords shifts the word array left by
+///  shiftWords. ShiftWordsLeftByWords shifts bits out on the left;
+///  it does not extend the array.
+/// \since Crypto++ 1.0
 inline void ShiftWordsLeftByWords(word *r, size_t n, size_t shiftWords)
 {
 	shiftWords = STDMIN(shiftWords, n);
@@ -109,6 +202,13 @@ inline void ShiftWordsLeftByWords(word *r, size_t n, size_t shiftWords)
 	}
 }
 
+/// \brief Right shift word array
+/// \param r word array
+/// \param n size of the word array, in elements
+/// \param shiftWords number of words to shift
+/// \details ShiftWordsRightByWords shifts the word array right by
+///  shiftWords. ShiftWordsRightByWords shifts bits out on the right.
+/// \since Crypto++ 1.0
 inline void ShiftWordsRightByWords(word *r, size_t n, size_t shiftWords)
 {
 	shiftWords = STDMIN(shiftWords, n);