spelling fixes from Josh Soref via github

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1816055 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/md/md_acme.c b/modules/md/md_acme.c
index c4569fbf4fde2d3ca03686bd9fa9362ac7fbb4c3..90bdf3ce324eefaae3d1a9472749dc0711fe0cac 100644 (file)
--- a/modules/md/md_acme.c
+++ b/modules/md/md_acme.c
@@ -284,7 +284,7 @@ static apr_status_t inspect_problem(md_acme_req_t *req, const md_http_response_t
                 return APR_ENOENT;
             default:
                 md_log_perror(MD_LOG_MARK, MD_LOG_WARNING, 0, req->p,
-                              "acme problem unknonw: http status %d", res->status);
+                              "acme problem unknown: http status %d", res->status);
                 return APR_EGENERAL;
         }
     }

diff --git a/modules/md/md_acme.h b/modules/md/md_acme.h
index 1a3540f1bbf9205f09cdf26935f6b0d778450814..30dfbbc8e13039ec1012cd515543a9a5f1769ef6 100644 (file)
--- a/modules/md/md_acme.h
+++ b/modules/md/md_acme.h
@@ -72,7 +72,7 @@ apr_status_t md_acme_init(apr_pool_t *pool, const char *base_version);
 
 /**
  * Create a new ACME server instance. If path is not NULL, will use that directory
- * for persisting information. Will load any inforation persisted in earlier session.
+ * for persisting information. Will load any information persisted in earlier session.
  * url needs only be specified for instances where this has never been persisted before.
  *
  * @param pacme   will hold the ACME server instance on success
@@ -125,7 +125,7 @@ apr_status_t md_acme_agree(md_acme_t *acme, apr_pool_t *p, const char *tos);
  * given in the agreement url.
  * If the known agreement is equal to this, nothing is done.
  * If it differs, the account is re-validated in the hope that the server
- * accounces the Tos URL it wants. If this is equal to the agreement specified,
+ * announces the Tos URL it wants. If this is equal to the agreement specified,
  * the server is notified of this. If the server requires a ToS that the account
  * thinks it has already given, it is resend.
  *
@@ -176,7 +176,7 @@ apr_status_t md_acme_unstore_acct(struct md_store_t *store, apr_pool_t *p, const
 /* request handling */
 
 /**
- * Request callback on a successfull HTTP response (status 2xx).
+ * Request callback on a successful HTTP response (status 2xx).
  */
 typedef apr_status_t md_acme_req_res_cb(md_acme_t *acme, 
                                         const struct md_http_response_t *res, void *baton);
@@ -193,7 +193,7 @@ typedef struct md_acme_req_t md_acme_req_t;
 typedef apr_status_t md_acme_req_init_cb(md_acme_req_t *req, void *baton);
 
 /**
- * Request callback on a successfull response (HTTP response code 2xx) and content
+ * Request callback on a successful response (HTTP response code 2xx) and content
  * type matching application/.*json.
  */
 typedef apr_status_t md_acme_req_json_cb(md_acme_t *acme, apr_pool_t *p, 
@@ -210,7 +210,7 @@ struct md_acme_req_t {
     struct md_json_t *req_json;    /* JSON to be POSTed in request body */
 
     apr_table_t *resp_hdrs;        /* HTTP response headers */
-    struct md_json_t *resp_json;   /* JSON response body recevied */
+    struct md_json_t *resp_json;   /* JSON response body received */
     
     apr_status_t rv;               /* status of request */
     

diff --git a/modules/md/md_acme_authz.c b/modules/md/md_acme_authz.c
index aaca6ebf88b091284fa46c98604635a5af202c77..2fb893c393698080c032e7727b2d1330a214f61d 100644 (file)
--- a/modules/md/md_acme_authz.c
+++ b/modules/md/md_acme_authz.c
@@ -185,7 +185,7 @@ apr_status_t md_acme_authz_register(struct md_acme_authz_t **pauthz, md_acme_t *
 }
 
 /**************************************************************************************************/
-/* Update an exiosting authorization */
+/* Update an existing authorization */
 
 apr_status_t md_acme_authz_update(md_acme_authz_t *authz, md_acme_t *acme, 
                                   md_store_t *store, apr_pool_t *p)
@@ -379,7 +379,7 @@ static apr_status_t cha_tls_sni_01_setup(md_acme_authz_cha_t *cha, md_acme_authz
         || APR_STATUS_IS_ENOENT(rv)) {
         
         if (APR_SUCCESS != (rv = md_pkey_gen(&cha_key, p, key_spec))) {
-            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "%s: create tls-sni-01 challgenge key",
+            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "%s: create tls-sni-01 challenge key",
                           authz->domain);
             goto out;
         }

diff --git a/modules/md/md_cmd_main.c b/modules/md/md_cmd_main.c
index 865d6def9918f0d06466272d8fe19d08b19bb4b9..181ed56034c90ba899bc4a70655e252271753633 100644 (file)
--- a/modules/md/md_cmd_main.c
+++ b/modules/md/md_cmd_main.c
@@ -384,7 +384,7 @@ static md_cmd_t MainCmd = {
     main_opts, NULL,
     MainOptions, MainSubCmds,
     "a2md [options] cmd [cmd options] [args]", 
-    "Show and manipulate Apache Manged Domains", 
+    "Show and manipulate Apache Managed Domains", 
 };
 
 #define BASE_VERSION "apachemd/" MOD_MD_VERSION

diff --git a/modules/md/md_cmd_reg.c b/modules/md/md_cmd_reg.c
index e8cb11725cb50d81d1265646e1ff3fcbb297dabf..380699fb6434bae93d151522abe8600b69cc4b8e 100644 (file)
--- a/modules/md/md_cmd_reg.c
+++ b/modules/md/md_cmd_reg.c
@@ -61,7 +61,7 @@ md_cmd_t MD_RegAddCmd = {
     "add", MD_CTX_REG,  
     NULL, cmd_reg_add, MD_NoOptions, NULL,
     "add [opts] domain [domain...]", 
-    "Adds a new mananged domain. Must not overlap with existing domains.", 
+    "Adds a new managed domain. Must not overlap with existing domains.", 
 };
 
 /**************************************************************************************************/

diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c
index 626274edf1ae78a36034cb25216fb164eee7d77e..2a6dd24428c7f7046b73a9c0001845825bbccbc1 100644 (file)
--- a/modules/md/md_crypt.c
+++ b/modules/md/md_crypt.c
@@ -1237,7 +1237,7 @@ apr_status_t md_cert_self_sign(md_cert_t **pcert, const char *cn,
         md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, "%s: name add entry", cn);
         rv = APR_EGENERAL; goto out;
     }
-    /* cert are uncontrained (but not very trustworthy) */
+    /* cert are unconstrained (but not very trustworthy) */
     if (APR_SUCCESS != (rv = add_ext(x, NID_basic_constraints, "CA:FALSE, pathlen:0", p))) {
         md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "%s: set basic constraints ext", cn);
         goto out;

diff --git a/modules/md/md_json.c b/modules/md/md_json.c
index 94157a4204d2cf2f3b6db175136d54021792e174..bbbefd977b0c9e2911008d600bc3b8055ea5ed97 100644 (file)
--- a/modules/md/md_json.c
+++ b/modules/md/md_json.c
@@ -52,7 +52,7 @@ struct md_json_t {
 };
 
 /**************************************************************************************************/
-/* lifecylce */
+/* lifecycle */
 
 static apr_status_t json_pool_cleanup(void *data)
 {

diff --git a/modules/md/md_reg.c b/modules/md/md_reg.c
index 78d38a9ca0db0906b8071fe8290822f7ea811eb9..33e7f75cc840fe0664862ee6dd15cc9a7204a600 100644 (file)
--- a/modules/md/md_reg.c
+++ b/modules/md/md_reg.c
@@ -263,7 +263,7 @@ apr_status_t md_reg_assess(md_reg_t *reg, md_t *md, int *perrored, int *prenew,
     (void)reg;
     switch (md->state) {
         case MD_S_UNKNOWN:
-            md_log_perror( MD_LOG_MARK, MD_LOG_ERR, 0, p, "md(%s): in unkown state.", md->name);
+            md_log_perror( MD_LOG_MARK, MD_LOG_ERR, 0, p, "md(%s): in unknown state.", md->name);
             break;
         case MD_S_ERROR:
             md_log_perror( MD_LOG_MARK, MD_LOG_ERR, 0, p,  

diff --git a/modules/md/md_reg.h b/modules/md/md_reg.h
index 19682a759dde97633ca4276053ba27912f9c496a..74a831f33dfab963cd331473689459468990e5a9 100644 (file)
--- a/modules/md/md_reg.h
+++ b/modules/md/md_reg.h
@@ -75,7 +75,7 @@ apr_status_t md_reg_assess(md_reg_t *reg, md_t *md, int *perrored, int *prenew,
 typedef int md_reg_do_cb(void *baton, md_reg_t *reg, md_t *md);
 
 /**
- * Invoke callback for all mds in this registry. Order is not guarantueed.
+ * Invoke callback for all mds in this registry. Order is not guaranteed.
  * If the callback returns 0, iteration stops. Returns 0 if iteration was
  * aborted.
  */

diff --git a/modules/md/md_version.h b/modules/md/md_version.h
index 6b116f7c8ccbe0cfb51dd3a6d327867b2bb02021..f8d82b25dc7e4a1325c1d647dd4d4e4dd5939a55 100644 (file)
--- a/modules/md/md_version.h
+++ b/modules/md/md_version.h
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the md module as c string
  */
-#define MOD_MD_VERSION "1.0.3"
+#define MOD_MD_VERSION "1.0.3-git"
 
 /**
  * @macro

diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c
index c7599bb4c6830efed69c2ebbc7cb194842c8b63f..87121a86f867639f1b807f9b4d2e1ec1e45a50ae 100644 (file)
--- a/modules/md/mod_md.c
+++ b/modules/md/mod_md.c
@@ -812,7 +812,7 @@ static apr_status_t run_watchdog(int state, void *baton, apr_pool_t *ptemp)
         if (n > 0) {
             int notified = 1;
 
-            /* Run notifiy command for ready MDs (if configured) and persist that
+            /* Run notify command for ready MDs (if configured) and persist that
              * we have done so. This process might be reaped after n requests or die
              * of another cause. The one taking over the watchdog need to notify again.
              */
@@ -846,7 +846,7 @@ static apr_status_t run_watchdog(int state, void *baton, apr_pool_t *ptemp)
                 }
             }
             
-            /* FIXME: the server needs to start gracefully to take the new certficate in.
+            /* FIXME: the server needs to start gracefully to take the new certificate in.
              * This poses a variety of problems to solve satisfactory for everyone:
              * - I myself, have no implementation for Windows 
              * - on *NIX, child processes run with less privileges, preventing
@@ -1025,7 +1025,7 @@ static apr_status_t md_post_config(apr_pool_t *p, apr_pool_t *plog,
     sc = md_config_get(s);
     mc = sc->mc;
     
-    /* Synchronize the defintions we now have with the store via a registry (reg). */
+    /* Synchronize the definitions we now have with the store via a registry (reg). */
     if (APR_SUCCESS != (rv = setup_reg(&reg, p, s, mc->can_http, mc->can_https))) {
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10072)
                      "setup md registry");
@@ -1348,7 +1348,7 @@ static int md_require_https_maybe(request_rec *r)
 }
 
 /* Runs once per created child process. Perform any process 
- * related initionalization here.
+ * related initialization here.
  */
 static void md_child_init(apr_pool_t *pool, server_rec *s)
 {

diff --git a/modules/md/mod_md.h b/modules/md/mod_md.h
index 421e5c5f17ce885d4f0e01b0792024968e890128..34edba8a1f1b5ce3f038741f658e4f997037f56a 100644 (file)
--- a/modules/md/mod_md.h
+++ b/modules/md/mod_md.h
@@ -27,7 +27,7 @@ APR_DECLARE_OPTIONAL_FN(int,
 /**
  * Get the certificate/key for the managed domain (md_is_managed != 0).
  * 
- * @return APR_EAGAIN if the real certicate is not available yet
+ * @return APR_EAGAIN if the real certificate is not available yet
  */
 APR_DECLARE_OPTIONAL_FN(apr_status_t, 
                         md_get_certificate, (struct server_rec *, apr_pool_t *,

diff --git a/modules/md/mod_md_config.c b/modules/md/mod_md_config.c
index 1c68df7f931032a3b78a216bc1a92d40c70c8665..4eff7afbf064d9336c83255d6da8e314e59230b5 100644 (file)
--- a/modules/md/mod_md_config.c
+++ b/modules/md/mod_md_config.c
@@ -734,7 +734,7 @@ static const char *md_config_set_pkeys(cmd_parms *cmd, void *dc,
             }
         }
         else {
-            return "key type 'RSA' has only one optinal parameter, the number of bits";
+            return "key type 'RSA' has only one optional parameter, the number of bits";
         }
 
         if (!config->pkey_spec) {
@@ -762,7 +762,7 @@ static const char *md_config_set_notify_cmd(cmd_parms *cmd, void *arg, const cha
 
 const command_rec md_cmds[] = {
     AP_INIT_TAKE1(     MD_CMD_CA, md_config_set_ca, NULL, RSRC_CONF, 
-                  "URL of CA issueing the certificates"),
+                  "URL of CA issuing the certificates"),
     AP_INIT_TAKE1(     MD_CMD_CAAGREEMENT, md_config_set_agreement, NULL, RSRC_CONF, 
                   "URL of CA Terms-of-Service agreement you accept"),
     AP_INIT_TAKE_ARGV( MD_CMD_CACHALLENGES, md_config_set_cha_tyes, NULL, RSRC_CONF, 
@@ -774,7 +774,7 @@ const command_rec md_cmds[] = {
     AP_INIT_TAKE_ARGV( MD_CMD_MD, md_config_set_names, NULL, RSRC_CONF, 
                       "A group of server names with one certificate"),
     AP_INIT_RAW_ARGS(  MD_CMD_MD_SECTION, md_config_sec_start, NULL, RSRC_CONF, 
-                     "Container for a manged domain with common settings and certificate."),
+                     "Container for a managed domain with common settings and certificate."),
     AP_INIT_TAKE_ARGV( MD_CMD_MEMBER, md_config_sec_add_members, NULL, RSRC_CONF, 
                       "Define domain name(s) part of the Managed Domain. Use 'auto' or "
                       "'manual' to enable/disable auto adding names from virtual hosts."),