Fossil SCM

Fix minor typos in documentation.

andybradford 2014-06-13 00:38 trunk
Commit a9819ba2671226a88379405025dd419ed39a7afa
1 file changed +6 -6
+6 -6
--- www/sync.wiki
+++ www/sync.wiki
@@ -124,11 +124,11 @@
124124
section details the "x-fossil" content type.</p>
125125
126126
<h3>3.1 Line-oriented Format</h3>
127127
128128
<p>The x-fossil content type consists of zero or more "cards". Cards
129
-are separate by the newline character ("\n"). Leading and trailing
129
+are separated by the newline character ("\n"). Leading and trailing
130130
whitespace on a card is ignored. Blank cards are ignored.</p>
131131
132132
<p>Each card is divided into zero or more space separated tokens.
133133
The first token on each card is the operator. Subsequent tokens
134134
are arguments. The set of operators understood by servers is slightly
@@ -196,13 +196,13 @@
196196
the delta, so both client and server should remember deltas
197197
and be able to apply them when their source arrives.</p>
198198
199199
<h3>3.4 Push and Pull Cards</h3>
200200
201
-<p>Among of the first cards in a client-to-server message are
202
-the push and pull cards. The push card tell the server that
203
-the client is pushing content. The pull card tell the server
201
+<p>Among the first cards in a client-to-server message are
202
+the push and pull cards. The push card tells the server that
203
+the client is pushing content. The pull card tells the server
204204
that the client wants to pull content. In the event of a sync,
205205
both cards are sent. The format is as follows:</p>
206206
207207
<blockquote>
208208
<b>push</b> <i>servercode projectcode</i><br>
@@ -238,21 +238,21 @@
238238
239239
<p>The latest clients send a two-argument clone message with a
240240
protocol version of "2". (Future versions of Fossil might use larger
241241
protocol version numbers.) The sequence-number sent is the number
242242
of artifacts received so far. For the first clone message, the
243
-sequence number if 0. The server will respond by sending file
243
+sequence number is 0. The server will respond by sending file
244244
cards for some number of artifacts up to the maximum message size.
245245
246246
<p>The server will also send a single "clone_seqno" card to the client
247247
so that the client can know where the server left off.
248248
249249
<blockquote>
250250
<b>clone_seqno</b> <i>sequence-number</i>
251251
</blockquote>
252252
253
-<p>The clone message in subquence HTTP requests for the same clone
253
+<p>The clone message in subsequent HTTP requests for the same clone
254254
operation will use the sequence-number from the
255255
clone_seqno of the previous reply.</p>
256256
257257
<p>In response to an initial clone message, the server also sends the client
258258
a push message so that the client can discover the projectcode for
259259
--- www/sync.wiki
+++ www/sync.wiki
@@ -124,11 +124,11 @@
124 section details the "x-fossil" content type.</p>
125
126 <h3>3.1 Line-oriented Format</h3>
127
128 <p>The x-fossil content type consists of zero or more "cards". Cards
129 are separate by the newline character ("\n"). Leading and trailing
130 whitespace on a card is ignored. Blank cards are ignored.</p>
131
132 <p>Each card is divided into zero or more space separated tokens.
133 The first token on each card is the operator. Subsequent tokens
134 are arguments. The set of operators understood by servers is slightly
@@ -196,13 +196,13 @@
196 the delta, so both client and server should remember deltas
197 and be able to apply them when their source arrives.</p>
198
199 <h3>3.4 Push and Pull Cards</h3>
200
201 <p>Among of the first cards in a client-to-server message are
202 the push and pull cards. The push card tell the server that
203 the client is pushing content. The pull card tell the server
204 that the client wants to pull content. In the event of a sync,
205 both cards are sent. The format is as follows:</p>
206
207 <blockquote>
208 <b>push</b> <i>servercode projectcode</i><br>
@@ -238,21 +238,21 @@
238
239 <p>The latest clients send a two-argument clone message with a
240 protocol version of "2". (Future versions of Fossil might use larger
241 protocol version numbers.) The sequence-number sent is the number
242 of artifacts received so far. For the first clone message, the
243 sequence number if 0. The server will respond by sending file
244 cards for some number of artifacts up to the maximum message size.
245
246 <p>The server will also send a single "clone_seqno" card to the client
247 so that the client can know where the server left off.
248
249 <blockquote>
250 <b>clone_seqno</b> <i>sequence-number</i>
251 </blockquote>
252
253 <p>The clone message in subquence HTTP requests for the same clone
254 operation will use the sequence-number from the
255 clone_seqno of the previous reply.</p>
256
257 <p>In response to an initial clone message, the server also sends the client
258 a push message so that the client can discover the projectcode for
259
--- www/sync.wiki
+++ www/sync.wiki
@@ -124,11 +124,11 @@
124 section details the "x-fossil" content type.</p>
125
126 <h3>3.1 Line-oriented Format</h3>
127
128 <p>The x-fossil content type consists of zero or more "cards". Cards
129 are separated by the newline character ("\n"). Leading and trailing
130 whitespace on a card is ignored. Blank cards are ignored.</p>
131
132 <p>Each card is divided into zero or more space separated tokens.
133 The first token on each card is the operator. Subsequent tokens
134 are arguments. The set of operators understood by servers is slightly
@@ -196,13 +196,13 @@
196 the delta, so both client and server should remember deltas
197 and be able to apply them when their source arrives.</p>
198
199 <h3>3.4 Push and Pull Cards</h3>
200
201 <p>Among the first cards in a client-to-server message are
202 the push and pull cards. The push card tells the server that
203 the client is pushing content. The pull card tells the server
204 that the client wants to pull content. In the event of a sync,
205 both cards are sent. The format is as follows:</p>
206
207 <blockquote>
208 <b>push</b> <i>servercode projectcode</i><br>
@@ -238,21 +238,21 @@
238
239 <p>The latest clients send a two-argument clone message with a
240 protocol version of "2". (Future versions of Fossil might use larger
241 protocol version numbers.) The sequence-number sent is the number
242 of artifacts received so far. For the first clone message, the
243 sequence number is 0. The server will respond by sending file
244 cards for some number of artifacts up to the maximum message size.
245
246 <p>The server will also send a single "clone_seqno" card to the client
247 so that the client can know where the server left off.
248
249 <blockquote>
250 <b>clone_seqno</b> <i>sequence-number</i>
251 </blockquote>
252
253 <p>The clone message in subsequent HTTP requests for the same clone
254 operation will use the sequence-number from the
255 clone_seqno of the previous reply.</p>
256
257 <p>In response to an initial clone message, the server also sends the client
258 a push message so that the client can discover the projectcode for
259

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button