1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
Description: correct a couple of spelling errors
Author: Markus Wanner <markus@bluegap.ch>
Last-Update: 2016-07-11
Forwarded: no
--- a/extra/mtn-hooks/monotone-mail-notify.lua
+++ b/extra/mtn-hooks/monotone-mail-notify.lua
@@ -270,7 +270,7 @@
end
if status ~= 200 then
- -- some error occured, no further processing takes place
+ -- some error occurred, no further processing takes place
return "continue", nil
end
--- a/src/sanity.cc
+++ b/src/sanity.cc
@@ -337,7 +337,7 @@
char const * file, int line)
{
if (!imp)
- throw std::logic_error("sanity::generic_failure occured "
+ throw std::logic_error("sanity::generic_failure occurred "
"before sanity::initialize");
log(FL("Encountered an error while musing upon the following:"),
@@ -378,7 +378,7 @@
char const * pattern
= N_("%s:%d: index '%s' = %d overflowed vector '%s' with size %d");
if (!imp)
- throw std::logic_error("sanity::index_failure occured "
+ throw std::logic_error("sanity::index_failure occurred "
"before sanity::initialize");
if (debug_p())
log(FL(pattern) % file % line % idx_expr % idx % vec_expr % sz,
--- a/src/netxx/datagram.h
+++ b/src/netxx/datagram.h
@@ -139,7 +139,7 @@
* @param buffer The buffer to send to the peer.
* @param length The size of the buffer.
* @return Greater than or equal to 0: The number of bytes sent to the peer.
- * @return -1: A timeout occured.
+ * @return -1: A timeout occurred.
* @author Peter Jones
**/
//####################################################################
@@ -155,7 +155,7 @@
* @param buffer A place to store the incoming datagram message.
* @param length The size of the buffer.
* @return receive_type.first greater than or equal to 0: The number of bytes that were placed in the buffer.
- * @return receive_type.first == -1: A timeout occured.
+ * @return receive_type.first == -1: A timeout occurred.
* @author Peter Jones
**/
//####################################################################
@@ -170,7 +170,7 @@
* @param buffer The buffer that contains the messeage to send to the peer.
* @param length The size of the buffer.
* @return Greater than or equal to 0: The number of bytes sent to the peer.
- * @return -1 A timeout occured.
+ * @return -1 A timeout occurred.
* @author Peter Jones
**/
//####################################################################
@@ -185,7 +185,7 @@
* @param buffer The place to store the received message from the peer.
* @param length The size of the buffer.
* @return Greater than or equal to 0:The number of bytes placed in your buffer.
- * @return -1 A timeout occured.
+ * @return -1 A timeout occurred.
* @author Peter Jones
**/
//####################################################################
--- a/src/netxx/stream.h
+++ b/src/netxx/stream.h
@@ -169,7 +169,7 @@
* @param length The size of the given buffer.
* @return Greater than 0: The number of bytes read from the peer and placed into your buffer.
* @return 0: The peer closed the connection.
- * @return -1: A timeout occured.
+ * @return -1: A timeout occurred.
* @see Netxx::SockOpt
* @author Peter Jones
**/
@@ -190,7 +190,7 @@
* @param length The amount of data to use from the buffer.
* @return Greater than 0: The number of bytes that were sent to the peer.
* @return 0: The peer closed the connection.
- * @return -1: A timeout occured.
+ * @return -1: A timeout occurred.
* @see Netxx::SockOpt
* @author Peter Jones
**/
--- a/src/netxx/streamserver.h
+++ b/src/netxx/streamserver.h
@@ -95,7 +95,7 @@
/**
* Try to accept a connection from a Peer. The returned value will
* indicate whether or not a connection was established or a timeout
- * occured. This member function will throw an exception if there is an
+ * occurred. This member function will throw an exception if there is an
* error.
*
* @return A Peer that contains info about the connected peer.
--- a/src/work.hh
+++ b/src/work.hh
@@ -184,7 +184,7 @@
void get_work_rev(revision_t & rev);
// read the revision id that was the parent of this workspace before
- // the last update occured. this is used for the u: (update) selector
+ // the last update occurred. this is used for the u: (update) selector
void get_update_id(revision_id & update_id);
// write the revision id that was the parent of this workspace before
--- a/src/schema.sql
+++ b/src/schema.sql
@@ -21,7 +21,7 @@
BEGIN EXCLUSIVE;
-- primary data structures concerned with storing and
--- versionning state-of-tree configurations
+-- versioning state-of-tree configurations
CREATE TABLE files
(
|
