Skip to content

Commit 17b572f

Browse files
committed
Fix upstream
1 parent 3059132 commit 17b572f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/doc/en/developer/git_advanced.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ out without requiring internet access::
4545
HEAD is now at f9a0d54099 Fix a slow doctest in matrix_integer_dense_hnf.py
4646

4747
If it is not stored in your local git repository, you need to download
48-
it from the upstream repo first::
48+
it from the ``upstream`` repo first::
4949

5050
[alice@localhost sage]$ git fetch upstream f9a0d54099d758ccec731a38929902b2b9d0b988
5151
From https://github.com/sagemath/sage

src/doc/en/developer/github.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ If you already have a local Git repo and only want to link your fork as ``origin
143143
From https://github.com/alice/sage
144144
* [new branch] develop -> origin/develop
145145

146-
You also add the Sage repo ``sagemath/sage`` as your remote "upstream"::
146+
You also add the Sage repo ``sagemath/sage`` as your remote ``upstream``::
147147

148148
[alice@localhost sage]$ git remote add upstream https://github.com/sagemath/sage.git
149149
[alice@localhost sage]$ git remote -v

src/doc/en/developer/packaging.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ We recommend the following workflow for maintaining a set of patches.
957957
commands.
958958
959959
- When a new upstream version becomes available, merge (or import) it
960-
into ``upstream``, then create a new branch and rebase in on top of
960+
into ``upstream``, then create a new branch and rebase it on top of
961961
the updated upstream:
962962
963963
.. CODE-BLOCK:: bash
@@ -1052,7 +1052,7 @@ Sage mirrors when a new release is prepared. On GitHub PRs
10521052
upgrading a package, the PR description should no longer contain
10531053
the upstream URL to avoid duplication of information.
10541054
1055-
Note that, like the ``tarball`` field, the ``upstream_url`` is a
1055+
Note that, like the ``tarball`` field, the ``tpstream_url`` is a
10561056
template; the substring ``VERSION`` is substituted with the actual
10571057
version.
10581058

0 commit comments

Comments
 (0)