Skip to content

Commit 1104238

Browse files
committed
mkdocs fixups
1 parent a32b960 commit 1104238

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docs/sapling-comparison.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Introduction
44

55
This document attempts to describe how jj is different
6-
from [Sapling](sapling-scm.com). Sapling is a VCS developed by Meta. It is a
6+
from [Sapling](https://sapling-scm.com). Sapling is a VCS developed by Meta. It is a
77
heavily modified fork of [Mercurial](https://www.mercurial-scm.org/). Because
88
jj has copied many ideas from Mercurial, there are many similarities between the
99
two tools, such as:

docs/technical/architecture.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ graph TD;
7676

7777
### Backend
7878

79-
The [`Backend`](../../lib/src/backend.rs) trait defines the interface each
79+
The `Backend` trait defines the interface each
8080
commit backend needs to implement. The current in-tree commit backends
81-
are [`GitBackend`](../../lib/src/git_backend.rs)
82-
and [`LocalBackend`](../../lib/src/local_backend.rs).
81+
are `GitBackend`
82+
and `LocalBackend`.
8383

8484
Since there are non-commit backends, the `Backend` trait should probably be
8585
renamed to `CommitBackend`.

docs/technical/concurrency.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ tags, and the working-copy commit in each workspace. The operation object
6060
contains a pointer to the view object (like how commit objects point to tree
6161
objects), pointers to parent operation(s) (like how commit objects point to
6262
parent commit(s)), and metadata about the operation. These types are defined
63-
[here](../../lib/protos/op_store.proto). The operation log is normally linear.
63+
in `op_store.proto` The operation log is normally linear.
6464
It becomes non-linear if there are concurrent operations.
6565

6666
When a command starts, it loads the repo at the latest operation. Because the
@@ -90,7 +90,7 @@ it will do a 3-way merge of the view objects based on their common ancestor
9090
are recorded in the resulting view object. For example, if branch `main` was
9191
moved from commit A to commit B in one operation and moved to commit C in a
9292
concurrent operation, then `main` will be recorded as "moved from A to B or C".
93-
See the `RefTarget` [definition](../../lib/protos/op_store.proto).
93+
See the `RefTarget` definition in `op_store.proto`.
9494

9595
Because we allow branches (etc.) to be in a conflicted state rather than just
9696
erroring out when there are multiple heads, the user can continue to use the

0 commit comments

Comments
 (0)