From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 2 Aug 2012 01:26:07 +0000 (-0400)
Subject: [Bug 2075] Fix spelling of 'incompatible'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8088354943ca3c04b92c19ae1b45b7c96827f30;p=thirdparty%2Fntp.git

[Bug 2075] Fix spelling of 'incompatible'

bk: 5019d72foQSr5a9asS0zm_7bQWpKdg
---

diff --git a/ChangeLog b/ChangeLog
index 653bc0ceee..6b4a25cf15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2075] Fix spelling of 'incompatible'.
 (4.2.7p291) 2012/07/31 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2241] MDNS registration should only happen if requested.
 (4.2.7p290) 2012/07/20 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/include/ntp_request.h b/include/ntp_request.h
index abfb785811..c750b7750a 100644
--- a/include/ntp_request.h
+++ b/include/ntp_request.h
@@ -69,7 +69,7 @@
  *		requested wasn't performed.
  *
  *		0 - no error
- *		1 - incompatable implementation number
+ *		1 - incompatible implementation number
  *		2 - unimplemented request code
  *		3 - format error (wrong data items, data size, packet size etc.)
  *		4 - no data available (e.g. request for details on unknown peer)
@@ -190,7 +190,7 @@ struct resp_pkt {
  * Information error codes
  */
 #define	INFO_OKAY	0
-#define	INFO_ERR_IMPL	1	/* incompatable implementation */
+#define	INFO_ERR_IMPL	1	/* incompatible implementation */
 #define	INFO_ERR_REQ	2	/* unknown request code */
 #define	INFO_ERR_FMT	3	/* format error */
 #define	INFO_ERR_NODATA	4	/* no data for this request */
diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index 474754efbb..cc459a5d2a 100644
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -1029,7 +1029,7 @@ again:
 			if (implcode == IMPL_XNTPD)
 				break;
 			(void) fprintf(stderr,
-				       "***Server implementation incompatable with our own\n");
+				       "***Server implementation incompatible with our own\n");
 			break;
 		case INFO_ERR_REQ:
 			(void) fprintf(stderr,