diff options
| author | Adam <Adam@anope.org> | 2015-10-27 18:57:37 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2015-10-27 18:58:48 -0400 |
| commit | 64dac60071fab652745a6e7a06cf6b7bdbbd3625 (patch) | |
| tree | f8f30161150451672b381f6370a8fdcab654bbb8 /src/win32 | |
| parent | 162fdbe5815bbdf187f549fefac94ff476d72e62 (diff) | |
| parent | 830361e97d03c74e54cb1cf1bbf329dffdeb66f7 (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/Config.cs | 2 | ||||
| -rw-r--r-- | src/win32/socket.cpp | 2 | ||||
| -rw-r--r-- | src/win32/windows.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/win32/Config.cs b/src/win32/Config.cs index 8fbf31a65..ea94e338a 100644 --- a/src/win32/Config.cs +++ b/src/win32/Config.cs @@ -257,7 +257,7 @@ namespace Config if (!string.IsNullOrWhiteSpace(CacheResponse) && string.IsNullOrWhiteSpace(InstallerResponse))
InstallerResponse = CacheResponse;
- // Question 4-6 are optional
+ // Question 4+ are optional
if (i < 3 && string.IsNullOrWhiteSpace(InstallerResponse))
{
Console.WriteLine("Invalid option");
diff --git a/src/win32/socket.cpp b/src/win32/socket.cpp index 320e46f48..7f6ef4df1 100644 --- a/src/win32/socket.cpp +++ b/src/win32/socket.cpp @@ -51,7 +51,7 @@ int windows_accept(int fd, struct sockaddr *addr, int *addrlen) * @param af The protocol type, AF_INET or AF_INET6 * @param src The address * @param dst Struct to put results in - * @return 1 on sucess, -1 on error + * @return 1 on success, -1 on error */ int windows_inet_pton(int af, const char *src, void *dst) { diff --git a/src/win32/windows.cpp b/src/win32/windows.cpp index a70ff53c3..f5bbde2f8 100644 --- a/src/win32/windows.cpp +++ b/src/win32/windows.cpp @@ -194,7 +194,7 @@ Anope::string GetWindowsVersion() buf = "Microsoft Windows 98" + extra; } if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 90) - buf = "Microsoft Windows Millenium Edition"; + buf = "Microsoft Windows Millennium Edition"; } return buf; } |