--- apps/openssl.cnf	2011-12-05 19:00:51.000000000 -0500
+++ apps/openssl.cnf	2012-06-29 16:33:25.000000000 -0400
@@ -1,3 +1,4 @@
+# $FreeBSD$
 #
 # OpenSSL example configuration file.
 # This is mostly being used for generation of certificate requests.
--- docs/apps/ca.pod	2009-04-10 07:25:53.000000000 -0400
+++ docs/apps/ca.pod	2012-06-29 16:24:27.000000000 -0400
@@ -88,7 +88,7 @@
 =item B<-infiles>
 
 if present this should be the last option, all subsequent arguments
-are assumed to the the names of files containing certificate requests. 
+are assumed to be the names of files containing certificate requests. 
 
 =item B<-out filename>
 
--- doc/apps/config.pod	2004-11-25 12:47:29.000000000 -0500
+++ doc/apps/config.pod	2012-06-29 16:26:26.000000000 -0400
@@ -246,7 +246,7 @@
 
 Suppose you want a variable called B<tmpfile> to refer to a
 temporary filename. The directory it is placed in can determined by
-the the B<TEMP> or B<TMP> environment variables but they may not be
+the B<TEMP> or B<TMP> environment variables but they may not be
 set to any value at all. If you just include the environment variable
 names and the variable doesn't exist then this will cause an error when
 an attempt is made to load the configuration file. By making use of the
--- doc/apps/dgst.pod	2009-04-10 12:42:27.000000000 -0400
+++ doc/apps/dgst.pod	2012-06-29 16:25:23.000000000 -0400
@@ -86,7 +86,7 @@
 
 =item B<-verify filename>
 
-verify the signature using the the public key in "filename".
+verify the signature using the public key in "filename".
 The output is either "Verification OK" or "Verification Failure".
 
 =item B<-prverify filename>
--- doc/crypto/engine.pod	2007-11-19 04:18:03.000000000 -0500
+++ doc/crypto/engine.pod	2012-06-29 16:26:52.000000000 -0400
@@ -517,7 +517,7 @@
 this symbol is considered a "generic" command is handled directly by the
 OpenSSL core routines.
 
-It is using these "core" control commands that one can discover the the control
+It is using these "core" control commands that one can discover the control
 commands implemented by a given ENGINE, specifically the commands;
 
  #define ENGINE_HAS_CTRL_FUNCTION		10
--- doc/ssl/SSL_CTX_set_psk_client_callback.pod	2006-03-10 18:06:17.000000000 -0500
+++ doc/ssl/SSL_CTX_set_psk_client_callback.pod	2012-07-02 13:09:18.000000000 -0400
@@ -59,7 +59,7 @@
 or SSL_set_psk_client_callback(). The callback function is given the
 connection in parameter B<ssl>, a B<NULL>-terminated PSK identity hint
 sent by the server in parameter B<hint>, a buffer B<identity> of
-length B<max_identity_len> bytes where the the resulting
+length B<max_identity_len> bytes where the resulting
 B<NULL>-terminated identity is to be stored, and a buffer B<psk> of
 length B<max_psk_len> bytes where the resulting pre-shared key is to
 be stored.
--- ssl/srtp.h	2011-11-21 17:52:01.000000000 -0500
+++ ssl/srtp.h	2012-06-29 19:08:33.000000000 -0400
@@ -135,7 +135,6 @@
 SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
 
 STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
 
 #ifdef  __cplusplus
 }