Skip to content

Commit d4bcac0

Browse files
committed
Fixup docs
1 parent 85be36b commit d4bcac0

3 files changed

Lines changed: 32 additions & 31 deletions

File tree

doc/howto/migration.rst

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,60 +20,61 @@ Choose the guide that matches your current setup:
2020
From Git submodules
2121
-------------------
2222

23-
**Before you start**, make sure:
23+
.. note::
2424

25-
- Your repository is fully up-to-date (``git pull``).
26-
- All submodules are initialised and checked out:
25+
Before you start make sure your repository is fully up-to-date and
26+
all submodules are initialised and checked out:
2727

28-
.. code-block:: console
28+
.. code-block:: console
2929
30-
$ git submodule update --init --recursive
30+
$ git pull
31+
$ git submodule update --init --recursive
3132
3233
**Steps**
3334

3435
1. Generate a manifest from the existing submodules:
3536

36-
.. code-block:: console
37+
.. code-block:: console
3738
38-
$ dfetch import
39+
$ dfetch import
3940
40-
This writes a ``dfetch.yaml`` file in the current directory listing each
41-
submodule as a *Dfetch* project entry, pinned to the commit that is
42-
currently checked out.
41+
This writes a ``dfetch.yaml`` file in the current directory listing each
42+
submodule as a *Dfetch* project entry, pinned to the commit that is
43+
currently checked out.
4344

4445
2. Remove all Git submodules. For each submodule (replace ``<path>`` with
4546
the submodule path, e.g. ``ext/mylib``):
4647

47-
.. code-block:: console
48+
.. code-block:: console
4849
49-
$ git submodule deinit -f <path>
50-
$ git rm -f <path>
51-
$ rm -rf .git/modules/<path>
50+
$ git submodule deinit -f <path>
51+
$ git rm -f <path>
52+
$ rm -rf .git/modules/<path>
5253
53-
Repeat until ``git submodule status`` returns nothing. Commit the
54-
result:
54+
Repeat until ``git submodule status`` returns nothing. Commit the
55+
result:
5556

56-
.. code-block:: console
57+
.. code-block:: console
5758
58-
$ git commit -m "chore: remove git submodules (switching to Dfetch)"
59+
$ git commit -m "chore: remove git submodules (switching to Dfetch)"
5960
60-
.. seealso::
61+
.. seealso::
6162

6263
`How do I remove a submodule?
6364
<https://stackoverflow.com/questions/1260748/>`_
6465

6566
3. Fetch all projects into your repository:
6667

67-
.. code-block:: console
68+
.. code-block:: console
6869
69-
$ dfetch update
70+
$ dfetch update
7071
7172
4. Commit the fetched files:
7273

73-
.. code-block:: console
74+
.. code-block:: console
7475
75-
$ git add .
76-
$ git commit -m "chore: vendor dependencies with Dfetch"
76+
$ git add .
77+
$ git commit -m "chore: vendor dependencies with Dfetch"
7778
7879
.. scenario-include:: ../features/import-from-git.feature
7980

doc/howto/updating-projects.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ Git submodules
105105
When a Git dependency contains submodules, *Dfetch* fetches and resolves them
106106
automatically — no extra manifest entries or ``git submodule`` commands are
107107
needed. Each submodule is checked out at the exact revision pinned by the
108-
parent repository::
108+
parent repository.
109109

110110
.. code-block:: console
111111
112-
$ dfetch update
112+
$ dfetch update
113113
114-
Dfetch (0.13.0)
115-
my-project:
116-
> Found & fetched submodule "./ext/vendor-lib" (https://github.com/example/vendor-lib @ master - 79698c9…)
117-
> Fetched master - e1fda19…
114+
Dfetch (0.13.0)
115+
my-project:
116+
> Found & fetched submodule "./ext/vendor-lib" (https://github.com/example/vendor-lib @ master - 79698c9…)
117+
> Fetched master - e1fda19…
118118
119119
Nested submodules are resolved recursively. Pinned details for each
120120
submodule are recorded in ``.dfetch_data.yaml`` and are visible in

doc/tutorials/getting_started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ My first update
6060
After creating the manifest we can let *Dfetch* perform an update.
6161
Make sure that you have installed *Dfetch* as described in :ref:`Installation`.
6262

63-
From a command-line perform the following command::
63+
From a command-line perform the following command
6464

6565
.. code-block:: console
6666

0 commit comments

Comments
 (0)