Skip to content

Commit a7120bd

Browse files
committed
Proofread fiber.rst, remove links from index.rst
Resolve #17
1 parent 0351af6 commit a7120bd

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

source/fiber.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Fibers do not start execution automatically, we have to call
257257
ev_run(loop(), 0);
258258
259259
Here once the fiber is created we kick it to execute. This is done
260-
inside ``fiber_call_impl` which uses ``core_transfer``
260+
inside ``fiber_call_impl`` which uses ``core_transfer``
261261
routine to jump into ``fiber_loop`` and invoke ``run_script_f``
262262
inside.
263263

source/index.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Tarantool internals
33

44
.. toctree::
55
:maxdepth: 2
6-
:caption: Contents:
76

87
fiber
98
replication
@@ -12,11 +11,3 @@ Tarantool internals
1211
wal
1312
wal-fmt
1413
allocators
15-
16-
17-
Indices and tables
18-
==================
19-
20-
* :ref:`genindex`
21-
* :ref:`modindex`
22-
* :ref:`search`

source/replication.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,11 @@ are linked into red-black tree ``uniq`` for fast lookup via their UUID.
226226
We allocate new replica and assign an applier to it.
227227

228228
Note that replica state is driven by ``replica_on_applier_state_f``
229-
trigger. We won't be juming into it right now but the important thing is
229+
trigger. We won't be jumping into it right now but the important thing is
230230
that this trigger sends ``fiber_cond_signal(&replicaset.applier.cond)``
231231
to the main replicaset instance.
232232

233-
Now back to the caller, ie ``applier_sync_state``. The replica
233+
Now back to the caller, i.e. ``applier_sync_state``. The replica
234234
instances are created we continue walking over appliers
235235

236236
.. code-block:: c
@@ -278,7 +278,7 @@ and they are moved to global ``replicaset.hash`` tree.
278278
...
279279
rlist_swap(&replicaset.anon, &anon_replicas);
280280
281-
At the end the anonimous replicas (which is not connected)
281+
At the end the anonymous replicas (which is not connected)
282282
are moved to global ``replicaset.anon``. So we have
283283
global ``replicaset`` fully consistent and ready for use.
284284

@@ -293,14 +293,14 @@ Now we need to jump up to the initial caller ``bootstrap``.
293293
replicaset_foreach(replica) {
294294
// Walk over unique replicas
295295
// from replicaset hash and
296-
// choose one with more advinsed
296+
// choose one with more advanced
297297
// vclock or one with lowest UUID
298298
return leader;
299299
300300
We need to find out how exactly we should start, either
301301
we are the master node or we should start from another
302-
node which is choosen as a cluster leader (ie it has
303-
most advansed vclock and low UUID).
302+
node which is chosen as a cluster leader (i.e. it has
303+
most advanced vclock and low UUID).
304304

305305
Bootstrap first replica
306306
~~~~~~~~~~~~~~~~~~~~~~~
@@ -687,7 +687,7 @@ Replication in 2.x series
687687
-------------------------
688688

689689
Generally replication in 2.x series very similar to 1.10 in ideas
690-
still there are some significant diffierences.
690+
still there are some significant differences.
691691

692692
The initialization starts with ``box_cfg_xc``.
693693

@@ -748,7 +748,7 @@ with anonymous replication and we have some appliers running.
748748
}
749749
750750
On a cold start if we gonna be an anonymous replica we just remember the
751-
setting in `replication_anon`. Then we continue bootstrap procesure
751+
setting in ``replication_anon``. Then we continue bootstrap procedure
752752
(we don't consider local recovery for simplicity sake).
753753

754754
First we're trying to reify appliers.

source/toctree.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
.. toctree::
44
:caption: Contents:
5-
:maxdepth: 2
5+
:maxdepth: 5
66
:includehidden:
77

88
fiber

0 commit comments

Comments
 (0)