backports from the p2p-nat-t branch:

 * double assignment of function ''destroy'' in some jobs
 * typos

8 files changed, 12 insertions, 15 deletions

diff --git a/src/charon/bus/bus.h b/src/charon/bus/bus.h
index e54fb1b1b..00f1ab7ac 100644
--- a/src/charon/bus/bus.h
+++ b/src/charon/bus/bus.h
@@ -310,7 +310,7 @@ struct bus_t {
 	 * must register themself to the bus before starting to listen(). When
 	 * a signal occurs, the emitter waits until all threads with listen_state
 	 * TRUE are waiting in the listen() method to process the signal.
-	 * It is important that a thread with liste_state TRUE calls listen()
+	 * It is important that a thread with listen_state TRUE calls listen()
 	 * periodically, or sets it's listening state to FALSE; otherwise
 	 * all signal emitting threads get blocked on the bus.
 	 *
diff --git a/src/charon/encoding/message.h b/src/charon/encoding/message.h
index 73c2e05c6..8f0be56a9 100644
--- a/src/charon/encoding/message.h
+++ b/src/charon/encoding/message.h
@@ -319,7 +319,7 @@ struct message_t {
 	iterator_t * (*get_payload_iterator) (message_t *this);
 	
 	/**
-	 * @brief Find a payload of a spicific type.
+	 * @brief Find a payload of a specific type.
 	 * 
 	 * Returns the first occurance. 
 	 *
diff --git a/src/charon/encoding/payloads/payload.h b/src/charon/encoding/payloads/payload.h
index 9a8c2f482..e00b874df 100644
--- a/src/charon/encoding/payloads/payload.h
+++ b/src/charon/encoding/payloads/payload.h
@@ -129,7 +129,7 @@ enum payload_type_t{
 	/**
 	 * Header has a value of PRIVATE USE space.
 	 * 
-	 * This payload type is not send over wire and just 
+	 * This payload type is not sent over wire and just 
 	 * used internally to handle IKEv2-Header like a payload.
 	 */
 	HEADER = 140,
@@ -137,7 +137,7 @@ enum payload_type_t{
 	/**
 	 * PROPOSAL_SUBSTRUCTURE has a value of PRIVATE USE space.
 	 * 
-	 * This payload type is not send over wire and just 
+	 * This payload type is not sent over wire and just 
 	 * used internally to handle a proposal substructure like a payload.
 	 */
 	PROPOSAL_SUBSTRUCTURE = 141,
@@ -145,7 +145,7 @@ enum payload_type_t{
 	/**
 	 * TRANSFORM_SUBSTRUCTURE has a value of PRIVATE USE space.
 	 * 
-	 * This payload type is not send over wire and just 
+	 * This payload type is not sent over wire and just 
 	 * used internally to handle a transform substructure like a payload.
 	 */
 	TRANSFORM_SUBSTRUCTURE = 142,
@@ -153,7 +153,7 @@ enum payload_type_t{
 	/**
 	 * TRANSFORM_ATTRIBUTE has a value of PRIVATE USE space.
 	 * 
-	 * This payload type is not send over wire and just 
+	 * This payload type is not sent over wire and just 
 	 * used internally to handle a transform attribute like a payload.
 	 */
 	TRANSFORM_ATTRIBUTE = 143,
@@ -161,7 +161,7 @@ enum payload_type_t{
 	/**
 	 * TRAFFIC_SELECTOR_SUBSTRUCTURE has a value of PRIVATE USE space.
 	 * 
-	 * This payload type is not send over wire and just 
+	 * This payload type is not sent over wire and just 
 	 * used internally to handle a transform selector like a payload.
 	 */	
 	TRAFFIC_SELECTOR_SUBSTRUCTURE = 144,
@@ -169,7 +169,7 @@ enum payload_type_t{
 	/**
 	 * CONFIGURATION_ATTRIBUTE has a value of PRIVATE USE space.
 	 * 
-	 * This payload type is not send over wire and just 
+	 * This payload type is not sent over wire and just 
 	 * used internally to handle a transform attribute like a payload.
 	 */
 	CONFIGURATION_ATTRIBUTE = 145,
@@ -177,7 +177,7 @@ enum payload_type_t{
 	/**
 	 * A unknown payload has a value of PRIVATE USE space.
 	 * 
-	 * This payload type is not send over wire and just 
+	 * This payload type is not sent over wire and just 
 	 * used internally to handle a unknown payload.
 	 */
 	UNKNOWN_PAYLOAD = 146,
diff --git a/src/charon/processing/jobs/roam_job.c b/src/charon/processing/jobs/roam_job.c
index 3b5cd0ed2..842f57405 100644
--- a/src/charon/processing/jobs/roam_job.c
+++ b/src/charon/processing/jobs/roam_job.c
@@ -104,7 +104,6 @@ roam_job_t *roam_job_create(bool address)
 {
 	private_roam_job_t *this = malloc_thing(private_roam_job_t);
 	
-	this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
 	this->public.job_interface.execute = (void (*) (job_t *)) execute;
 	this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
 	
diff --git a/src/charon/processing/jobs/send_dpd_job.c b/src/charon/processing/jobs/send_dpd_job.c
index f6786bfb4..d9c457ab6 100644
--- a/src/charon/processing/jobs/send_dpd_job.c
+++ b/src/charon/processing/jobs/send_dpd_job.c
@@ -86,7 +86,6 @@ send_dpd_job_t *send_dpd_job_create(ike_sa_id_t *ike_sa_id)
 	private_send_dpd_job_t *this = malloc_thing(private_send_dpd_job_t);
 	
 	/* interface functions */
-	this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
 	this->public.job_interface.execute = (void (*) (job_t *)) execute;
 	this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
 	
diff --git a/src/charon/processing/jobs/send_keepalive_job.c b/src/charon/processing/jobs/send_keepalive_job.c
index 8cb51e5dd..34198deb0 100644
--- a/src/charon/processing/jobs/send_keepalive_job.c
+++ b/src/charon/processing/jobs/send_keepalive_job.c
@@ -80,7 +80,6 @@ send_keepalive_job_t *send_keepalive_job_create(ike_sa_id_t *ike_sa_id)
 	private_send_keepalive_job_t *this = malloc_thing(private_send_keepalive_job_t);
 	
 	/* interface functions */
-	this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
 	this->public.job_interface.execute = (void (*) (job_t *)) execute;
 	this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
 	
diff --git a/src/charon/sa/ike_sa_manager.c b/src/charon/sa/ike_sa_manager.c
index 56b865891..d4cf675ce 100644
--- a/src/charon/sa/ike_sa_manager.c
+++ b/src/charon/sa/ike_sa_manager.c
@@ -368,7 +368,7 @@ static ike_sa_t *checkout_new(private_ike_sa_manager_t* this, bool initiator)
 }
 
 /**
- * Implementation of of ike_sa_manager.checkout_by_id.
+ * Implementation of of ike_sa_manager.checkout_by_message.
  */
 static ike_sa_t* checkout_by_message(private_ike_sa_manager_t* this,
 									 message_t *message)
@@ -483,7 +483,7 @@ static ike_sa_t* checkout_by_message(private_ike_sa_manager_t* this,
 }
 
 /**
- * Implementation of of ike_sa_manager.checkout_by_id.
+ * Implementation of of ike_sa_manager.checkout_by_peer.
  */
 static ike_sa_t* checkout_by_peer(private_ike_sa_manager_t *this,
 								  host_t *my_host, host_t *other_host,
diff --git a/src/ipsec/ipsec.in b/src/ipsec/ipsec.in
index e4cedd09a..34b1eae58 100755
--- a/src/ipsec/ipsec.in
+++ b/src/ipsec/ipsec.in
@@ -72,7 +72,7 @@ case "$1" in
 	echo "	starter"
 	echo "	version"
 	echo "	whack"
-	echo "	stoke"
+	echo "	stroke"
 	echo
 	echo "Some of these functions have their own manual pages, e.g. ipsec_scepclient(8)."
 	exit 0