diff --git a/docs/ci/bare-metal.rst b/docs/ci/bare-metal.rst index 9d6a0a44088..825e52fbd00 100644 --- a/docs/ci/bare-metal.rst +++ b/docs/ci/bare-metal.rst @@ -71,8 +71,8 @@ call "servo":: Setup ----- -Each board will be registered in fd.o GitLab. You'll want something -like this to register a fastboot board: +Each board will be registered in freedesktop.org GitLab. You'll want +something like this to register a fastboot board: .. code-block:: console @@ -91,8 +91,8 @@ like this to register a fastboot board: For a servo board, you'll need to also volume mount the board's NFS root dir at /nfs and TFTP kernel directory at /tftp. -The registration token has to come from a fd.o GitLab admin going to -https://gitlab.freedesktop.org/admin/runners +The registration token has to come from a freedesktop.org GitLab admin +going to https://gitlab.freedesktop.org/admin/runners The name scheme for Google's lab is google-freedreno-boardname-n, and our tag is something like google-freedreno-db410c. The tag is what diff --git a/docs/repository.rst b/docs/repository.rst index 7151fc3d745..28f1fda8af1 100644 --- a/docs/repository.rst +++ b/docs/repository.rst @@ -150,7 +150,8 @@ Developer Git Tips git add git commit - to get your changes ready to push back into the fd.o repository. + to get your changes ready to push back into the freedesktop.org + repository. It is possible (and likely) that someone has changed master since you did your last pull. Even if your changes do not conflict with their