From b59129240b8db1a5992efd4406738a6800364be4 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 16 Jul 2024 18:37:09 +0200 Subject: [PATCH] Remove references to the 'testing' branch --- contribute/develop.rst | 3 +-- contribute/translate.rst | 19 ++++--------------- use/install.rst | 3 --- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/contribute/develop.rst b/contribute/develop.rst index bf493dc..8f4d3e0 100644 --- a/contribute/develop.rst +++ b/contribute/develop.rst @@ -34,8 +34,7 @@ I learnt how to use Git with an ebook, also available as a real book: `Pro Git`_. Our preferred way of contributing is through GitHub pull requests to -`Limnoria's repository`_. Please send your pull requests to the `testing` -branch. +`Limnoria's repository`_. .. _Pro Git: https://git-scm.com/book/ .. _Limnoria's repository: https://github.com/ProgVal/Limnoria/ diff --git a/contribute/translate.rst b/contribute/translate.rst index 886aab2..2d2bd48 100644 --- a/contribute/translate.rst +++ b/contribute/translate.rst @@ -59,10 +59,10 @@ I won't have this write access). Then, open a console, and write (replace *YourName* by the name of your GitHub account):: - git clone https://github.com//Limnoria.git --branch=testing + git clone https://github.com//Limnoria.git If you are experienced with git, you can -``git clone git@github.com:/Limnoria.git --branch=testing`` +``git clone git@github.com:/Limnoria.git`` instead. This will create a new directory, called *Limnoria*, where all the code and @@ -73,17 +73,6 @@ project history are copied. Now, cd to the directory:: The things below affect to you only if you didn't specify the branch in the git clone command. -Then, you need to checkout the *testing* branch. What does that mean? It means -that there is differents stages in Limnoria: all changes are made in testing, -and when I think *testing* is stable, I merge it into *master*. -So, checking out *testing* means Git will use the code in *testing*, you -will translate strings that are in *testing*, and changes you make will be -in *testing*. Now, do it:: - - git checkout testing - -Git will reply you that it understood what you mean by *testing*. - Ok, now, you can translate. Pushing translations @@ -118,7 +107,7 @@ Internet yet. To send it, run:: Simple, isn't it? Now, go back to GitHub and your forked repository, and click the *Pull request* -button. Then, set *testing* on the both side, and run *Update Commit Range*. +button. I will by mailed that you asked me to merge your changes, and I will do it soon. @@ -135,7 +124,7 @@ need to teach Git how to get this updates:: Now, every time you want to download updates, run:: git fetch upstream - git merge upstream/testing + git merge upstream/master Another way: mailing me your translations ========================================= diff --git a/use/install.rst b/use/install.rst index 130bed9..f9c92d9 100644 --- a/use/install.rst +++ b/use/install.rst @@ -74,9 +74,6 @@ If you do not have root access, skip this section. If you are logged in as root, you can remove ``sudo`` from the install commands. -If you want to use the testing branch which might be more up-to -date BUT LESS TESTED, replace ``master`` with ``testing`` in the commands. - First, install Limnoria's optional dependencies (you can skip this step, but some features won't be available)::