Limnoria/Limnoria-doc
1
0
Fork 0
mirror of https://github.com/Limnoria/Limnoria-doc.git synced 2025-04-04 14:29:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to the 'testing' branch

Browse Source
This commit is contained in:
Valentin Lorentz
2024-07-16 18:37:09 +02:00
parent 1e9d3e3419
commit b59129240b
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contribute/develop.rst
View File

@ -34,8 +34,7 @@ I learnt how to use Git with an ebook, also available as a real book:
`Pro Git`_. `Pro Git`_.
Our preferred way of contributing is through GitHub pull requests to Our preferred way of contributing is through GitHub pull requests to
`Limnoria's repository`_. Please send your pull requests to the `testing` `Limnoria's repository`_.
branch.
.. _Pro Git: https://git-scm.com/book/ .. _Pro Git: https://git-scm.com/book/
.. _Limnoria's repository: https://github.com/ProgVal/Limnoria/ .. _Limnoria's repository: https://github.com/ProgVal/Limnoria/

19
contribute/translate.rst
View File

@ -59,10 +59,10 @@ I won't have this write access).
Then, open a console, and write (replace *YourName* by the name of your Then, open a console, and write (replace *YourName* by the name of your
GitHub account):: GitHub account)::
git clone https://github.com/<YourName>/Limnoria.git --branch=testing git clone https://github.com/<YourName>/Limnoria.git
If you are experienced with git, you can If you are experienced with git, you can
``git clone git@github.com:<YourName>/Limnoria.git --branch=testing`` ``git clone git@github.com:<YourName>/Limnoria.git``
instead. instead.
This will create a new directory, called *Limnoria*, where all the code and 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 things below affect to you only if you didn't specify the branch in
the git clone command. 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. Ok, now, you can translate.
Pushing translations Pushing translations
@ -118,7 +107,7 @@ Internet yet. To send it, run::
Simple, isn't it? Simple, isn't it?
Now, go back to GitHub and your forked repository, and click the *Pull request* 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 I will by mailed that you asked me to merge your changes, and I will do it
soon. soon.
@ -135,7 +124,7 @@ need to teach Git how to get this updates::
Now, every time you want to download updates, run:: Now, every time you want to download updates, run::
git fetch upstream git fetch upstream
git merge upstream/testing git merge upstream/master
Another way: mailing me your translations Another way: mailing me your translations
========================================= =========================================

3
use/install.rst
View File

@ -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 If you are logged in as root, you can remove ``sudo`` from the install
commands. 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 First, install Limnoria's optional dependencies (you can skip this
step, but some features won't be available):: step, but some features won't be available)::