From fba62eef7bd8ab1bb1534750e4a6bdedca98afd7 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 19 Jul 2022 19:02:30 +0200 Subject: [PATCH] Fix some typos (found by codespell) Signed-off-by: Stefan Weil --- RELEASE-NOTES.md | 30 +++++++++---------- src/contribs/davmailpd/davmailpd | 2 +- src/contribs/init/davmail-init | 2 +- src/contribs/wrapper/bin/davmail | 2 +- src/contribs/wrapper/bin/davmail_2 | 2 +- src/etc/davmail.properties | 2 +- src/java/davmail/exchange/VCalendar.java | 4 +-- .../auth/HttpURLConnectionWrapper.java | 2 +- src/java/davmail/exchange/ews/EWSMethod.java | 10 +++---- .../exchange/ews/EwsExchangeSession.java | 10 +++---- src/java/davmail/http/HttpClientAdapter.java | 2 +- src/java/davmail/http/URIUtil.java | 2 +- src/java/davmail/pop/PopConnection.java | 2 +- src/site/xdoc/gettingstarted.xml | 2 +- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 7cffdbdc1..ebd4e379a 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -440,10 +440,10 @@ value is a comma separated list of emails or domains (user@company.com or @compa - HTTP: improve HttpClientAdapter interface - HTTP: switch check released version to HttpClient 4 - HTTP: implement Get and Rest requests with HttpClient 4 -- HTTP: reenable basic proxy authentication on Java >= 1.8.111 in HttpClientAdapter +- HTTP: re-enable basic proxy authentication on Java >= 1.8.111 in HttpClientAdapter - HTTP: reimplement URIUtil to prepare HttpClient 4 migration - HTTP: Cleanup from audit -- HTTP: reenable basic proxy authentication on Java >= 1.8.111: jdk.http.auth.tunneling.disabledSchemes="" +- HTTP: re-enable basic proxy authentication on Java >= 1.8.111: jdk.http.auth.tunneling.disabledSchemes="" - HTTP: Implement JCIFS NTLM authentication with HttpClient 4 ### GUI: @@ -542,7 +542,7 @@ Also upgraded libraries to prepare HttpClient 4 upgrade. - Caldav: adjust isOrganizer check (again) to work on all Exchange server versions - Caldav: workaround for missing DTEND in event, avoid NullPointerException - Caldav: fix recurrence options and implement interval over EWS -- Caldav: fix montly recurrence handling +- Caldav: fix monthly recurrence handling ### IMAP: - IMAP: fix #704 implement [TRYCREATE] on folder not found @@ -603,7 +603,7 @@ Also upgraded libraries to prepare HttpClient 4 upgrade. - Linux: fix spec file regression ### Maven: -- Maven: reenable site plugins in pom +- Maven: re-enable site plugins in pom ## DavMail 5.1.0 2018-12-18 @@ -1320,7 +1320,7 @@ Another bug fix release with some efforts on packaging. ### Packaging: - Compute distribution packages checksums -- Maven: set mimimum Maven version and fix FindBugs filter +- Maven: set minimum Maven version and fix FindBugs filter - Maven: add Gtk lib in repo to avoid ClassNotFound - Maven: exclude non DavMail classes from FindBugs report - Maven: Update POM to Maven 3 @@ -1638,7 +1638,7 @@ Also fixed a few bugs reported by users and improved documentation. ### Caldav: - Caldav: flag ORGANIZER participant status as ACCEPTED instead of NEEDS-ACTION - Caldav: do not overwrite X-MICROSOFT-CDO-BUSYSTATUS if TRANSP is not provided -- Merge patch to set sensitivy on VTODO +- Merge patch to set sensitivity on VTODO ### OSX: - OSX: Get application path from library path with Java7 launcher @@ -1892,7 +1892,7 @@ and additional enhancements and bugfixes. ### Caldav: - Caldav: encode semicolon in urlcompname -- Caldav: fix attendees in modified occurences +- Caldav: fix attendees in modified occurrences - Caldav: additional timezone names for Exchange 2010 - Caldav: additional timezones available in Exchange 2007 - Caldav: Partial fix for missing items on Exchange 2010 @@ -2357,8 +2357,8 @@ on Linux 64 and many other bugfixes. - IMAP: test custom header search - IMAP: workaround for Exchange 2003 search deleted support - IMAP: fix 3303767, do not send line count for non text bodyparts -- IMAP: another fix for 3297849, ENVELOPE formating error/bogus quotes -- IMAP: fix 3297849, ENVELOPE formating error/bogus quotes +- IMAP: another fix for 3297849, ENVELOPE formatting error/bogus quotes +- IMAP: fix 3297849, ENVELOPE formatting error/bogus quotes - IMAP: Fix nullpointer in broken message handling - IMAP: fix infinite loop detection - IMAP: detect infinite loop on the client side @@ -2417,7 +2417,7 @@ Also implemented Microsoft Forefront Unified Access Gateway support. - Implement Microsoft Forefront Unified Access Gateway logon form compatibility ### IMAP: -- IMAP: fix 3201374 envelope superflous space +- IMAP: fix 3201374 envelope superfluous space - IMAP: fix LOGOUT implementation to improve SquirrelMail compatibility ### OSX: @@ -2880,7 +2880,7 @@ Exchange Web Services support, LDAP optimizations and many other bufixes. - Caldav: more vcalendar patches - Caldav: start new VCalendar fixICS implementation - Caldav: call fixICS on download -- Caldav: reenable Lightning 1.0b2 bug workaround +- Caldav: re-enable Lightning 1.0b2 bug workaround - Caldav: failover for 404 not found on items containing '+' in url, search item by urlcompname to get permanenturl ### LDAP: @@ -3267,7 +3267,7 @@ and DavMail can now retrieve proxy settings directly from system configuration. - SMTP: implement AUTH LOGIN username (with optional initial-response, see RFC2554) ### IMAP: -- IMAP: Keep a single message in MessageList cache to handle chunked fetch, reenable maxSize in ImapConnection. +- IMAP: Keep a single message in MessageList cache to handle chunked fetch, re-enable maxSize in ImapConnection. - IMAP: implement subparts partial fetch - IMAP: Fix message write, double dot only for POP, not IMAP - IMAP: Do not advertise not yet supported custom flags @@ -3509,7 +3509,7 @@ describe DavMail features. - LDAP: implement startsWith on Contact search, only objectclass=* is a full search - LDAP: fix for iCal4 attendee completion, send localhost if current socket is local, else send fully qualified domain name - LDAP: major refactoring from Dan Foody to improve complex filters handling -- LDAP: improve contact search, reencode uids to hex to avoid case sensitivity issues +- LDAP: improve contact search, re-encode uids to hex to avoid case sensitivity issues ### Documentation: - Doc: Set Dan Foody as main java contributor @@ -3710,7 +3710,7 @@ and a lot of bug fixes. ### Enhancements: - Remove NTLM authentication, breaks Basic authentication (missing domain in username) - Set NTLM as last authentication scheme -- Experimental: reenable NTLM authentication +- Experimental: re-enable NTLM authentication - Upgrade SWT to 3.5 - Use getFolderPath in getSubFolders - Make API more consistent: createMessage must get a folder path, not URL @@ -3910,7 +3910,7 @@ Also added client to gateway encryption (SSL) support, started I18N - Fixed 2717547: Unsupported filter attribute: apple-group-memberguid - URI encode alias in getEmail() - Fix SSLProtocolSocketFactory with HttpClient 3.1 -- Reenable limited timeout on getReleasedVersion +- Re-enable limited timeout on getReleasedVersion - Always exclude NTLM authentication, not only for proxy authorization - Fix 2717446 from Eivind Tagseth diff --git a/src/contribs/davmailpd/davmailpd b/src/contribs/davmailpd/davmailpd index 98cf0b0dc..34ae7c8f1 100644 --- a/src/contribs/davmailpd/davmailpd +++ b/src/contribs/davmailpd/davmailpd @@ -13,7 +13,7 @@ usage() { restart: stops and starts davmail status: tells if davmail is running for the executing user start: starts davmail - stop: sends SIGHUP to davmail proces of the executing user + stop: sends SIGHUP to davmail process of the executing user USAGE } diff --git a/src/contribs/init/davmail-init b/src/contribs/init/davmail-init index 9f43b6c46..dc0351730 100644 --- a/src/contribs/init/davmail-init +++ b/src/contribs/init/davmail-init @@ -1,7 +1,7 @@ #!/bin/bash # # chkconfig: 345 99 05 -# # description: Java deamon script for davmail (http://davmail.sourceforge.net/) write by qk4l@tem4uk.ru 2011 +# # description: Java daemon script for davmail (http://davmail.sourceforge.net/) write by qk4l@tem4uk.ru 2011 # # Derived from - # Home page: http://www.source-code.biz diff --git a/src/contribs/wrapper/bin/davmail b/src/contribs/wrapper/bin/davmail index 59ad6320c..214132b5c 100644 --- a/src/contribs/wrapper/bin/davmail +++ b/src/contribs/wrapper/bin/davmail @@ -510,7 +510,7 @@ start() { exit 1 fi - # Sleep for a few seconds to allow for intialization if required + # Sleep for a few seconds to allow for initialization if required # then test to make sure we're still running. # i=0 diff --git a/src/contribs/wrapper/bin/davmail_2 b/src/contribs/wrapper/bin/davmail_2 index b6603b2bc..ba84d323c 100644 --- a/src/contribs/wrapper/bin/davmail_2 +++ b/src/contribs/wrapper/bin/davmail_2 @@ -510,7 +510,7 @@ start() { exit 1 fi - # Sleep for a few seconds to allow for intialization if required + # Sleep for a few seconds to allow for initialization if required # then test to make sure we're still running. # i=0 diff --git a/src/etc/davmail.properties b/src/etc/davmail.properties index eb8f0ed09..a360d63b1 100644 --- a/src/etc/davmail.properties +++ b/src/etc/davmail.properties @@ -11,7 +11,7 @@ davmail.server=true # - O365Manual Office 365 with interactive dialog, not available in headless mode # - O365 Office 365 EWS mode # - EWS Exchange 2007 and later -# - WebDav Exchange 2007 and earliear WebDav mode +# - WebDav Exchange 2007 and earlier WebDav mode # - Auto WebDav mode with EWS failover davmail.mode=EWS # base Exchange OWA or EWS url diff --git a/src/java/davmail/exchange/VCalendar.java b/src/java/davmail/exchange/VCalendar.java index 34af7f0fc..42eabdfa1 100644 --- a/src/java/davmail/exchange/VCalendar.java +++ b/src/java/davmail/exchange/VCalendar.java @@ -858,9 +858,9 @@ public VObject getFirstVevent() { } /** - * Get recurring VCalendar occurence exceptions. + * Get recurring VCalendar occurrence exceptions. * - * @return event occurences + * @return event occurrences */ public List getModifiedOccurrences() { boolean first = true; diff --git a/src/java/davmail/exchange/auth/HttpURLConnectionWrapper.java b/src/java/davmail/exchange/auth/HttpURLConnectionWrapper.java index 193d7909b..89602db64 100644 --- a/src/java/davmail/exchange/auth/HttpURLConnectionWrapper.java +++ b/src/java/davmail/exchange/auth/HttpURLConnectionWrapper.java @@ -150,7 +150,7 @@ public String getRequestProperty(String key) { /** * Fix missing content type - * @return content type or text/html if mising + * @return content type or text/html if missing */ @Override public String getContentType() { diff --git a/src/java/davmail/exchange/ews/EWSMethod.java b/src/java/davmail/exchange/ews/EWSMethod.java index 868f2024b..88ed612be 100644 --- a/src/java/davmail/exchange/ews/EWSMethod.java +++ b/src/java/davmail/exchange/ews/EWSMethod.java @@ -545,12 +545,12 @@ public static class Attendee { */ public static class Occurrence { /** - * Original occurence start date + * Original occurrence start date */ public String originalStart; /** - * Occurence itemid + * Occurrence itemid */ public ItemId itemId; } @@ -741,7 +741,7 @@ public void addAttendee(Attendee attendee) { /** * Add occurrence. * - * @param occurrence event occurence + * @param occurrence event occurrence */ public void addOccurrence(Occurrence occurrence) { if (occurrences == null) { @@ -751,9 +751,9 @@ public void addOccurrence(Occurrence occurrence) { } /** - * Get occurences. + * Get occurrences. * - * @return event occurences + * @return event occurrences */ public List getOccurrences() { return occurrences; diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java index 196770793..bcd933f2f 100644 --- a/src/java/davmail/exchange/ews/EwsExchangeSession.java +++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java @@ -1492,7 +1492,7 @@ protected void handleExcludedDates(ItemId currentItemId, VCalendar vCalendar) th int instanceIndex = 0; - // let's try to find occurence + // let's try to find occurrence while (true) { instanceIndex++; try { @@ -1546,7 +1546,7 @@ protected void handleModifiedOccurrences(ItemId currentItemId, VCalendar vCalend LOGGER.debug("Looking for occurrence " + convertedValue); int instanceIndex = 0; - // let's try to find occurence + // let's try to find occurrence while (true) { instanceIndex++; try { @@ -2173,10 +2173,10 @@ public byte[] getEventContent() throws IOException { } fixAttendees(getItemMethod, localVCalendar.getFirstVevent()); // fix UID and RECURRENCE-ID, broken at least on Exchange 2007 - List occurences = getItemMethod.getResponseItem().getOccurrences(); - if (occurences != null) { + List occurrences = getItemMethod.getResponseItem().getOccurrences(); + if (occurrences != null) { Iterator modifiedOccurrencesIterator = localVCalendar.getModifiedOccurrences().iterator(); - for (EWSMethod.Occurrence occurrence : occurences) { + for (EWSMethod.Occurrence occurrence : occurrences) { if (modifiedOccurrencesIterator.hasNext()) { VObject modifiedOccurrence = modifiedOccurrencesIterator.next(); // fix modified occurrences attendees diff --git a/src/java/davmail/http/HttpClientAdapter.java b/src/java/davmail/http/HttpClientAdapter.java index 0019a8ffc..dc19962fb 100644 --- a/src/java/davmail/http/HttpClientAdapter.java +++ b/src/java/davmail/http/HttpClientAdapter.java @@ -103,7 +103,7 @@ public class HttpClientAdapter implements Closeable { // DavMail is Kerberos configuration provider Security.setProperty("login.configuration.provider", "davmail.http.KerberosLoginConfiguration"); - // reenable basic proxy authentication on Java >= 1.8.111 + // re-enable basic proxy authentication on Java >= 1.8.111 System.setProperty("jdk.http.auth.tunneling.disabledSchemes", ""); RegistryBuilder schemeRegistry = RegistryBuilder.create(); diff --git a/src/java/davmail/http/URIUtil.java b/src/java/davmail/http/URIUtil.java index f41460108..684b66b34 100644 --- a/src/java/davmail/http/URIUtil.java +++ b/src/java/davmail/http/URIUtil.java @@ -277,7 +277,7 @@ public class URIUtil { public static final BitSet allowed_abs_path = new BitSet(256); static { allowed_abs_path.or(abs_path); - // allowed_abs_path.set('/'); // aleady included + // allowed_abs_path.set('/'); // already included allowed_abs_path.andNot(percent); allowed_abs_path.clear('+'); } diff --git a/src/java/davmail/pop/PopConnection.java b/src/java/davmail/pop/PopConnection.java index 031122cc7..40669fdbf 100644 --- a/src/java/davmail/pop/PopConnection.java +++ b/src/java/davmail/pop/PopConnection.java @@ -254,7 +254,7 @@ public void run() { } catch (IndexOutOfBoundsException e) { sendERR("invalid message index: " + message); } catch (Exception e) { - sendERR("error retreiving top of messages"); + sendERR("error retrieving top of messages"); DavGatewayTray.error(e); } } else if ("RSET".equalsIgnoreCase(command)) { diff --git a/src/site/xdoc/gettingstarted.xml b/src/site/xdoc/gettingstarted.xml index e721845aa..f9fccec62 100644 --- a/src/site/xdoc/gettingstarted.xml +++ b/src/site/xdoc/gettingstarted.xml @@ -34,7 +34,7 @@
  • O365Manual Office 365 with interactive dialog, not available in headless mode
  • O365 Office 365 EWS mode
  • EWS Exchange 2007 and later
    • -
  • WebDav Exchange 2007 and earliear WebDav mode
    • +
  • WebDav Exchange 2007 and earlier WebDav mode
  • Auto WebDav mode with EWS failover