[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - readlicense_oo/docs

[Julien Nabet (via logerrit)]

 readlicense_oo/docs/readme.xrm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d7ba66b2f2922b7625e1ff336e5138031818640a
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Sep 6 15:07:25 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun Sep 6 21:30:59 2020 +0200

    Revert "tdf#136377: Replace yum by dnf for Fedora in readme.xrm"
    
    This reverts commit d96ca67b22e3b42cf79637d3f6497d02a9f48656.
    
    Reason for revert: It breaks the string freeze
    
    Change-Id: I7909b74a9bd4e8eafccbd56cb5a0a19d110a81e9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102114
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 7331787f2293..a7ccf388fbca 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -97,7 +97,7 @@
 			<p id="rpminstall2" xml:lang="en-US">When you unpack the downloaded archive, you will see that the contents have been decompressed into a sub-directory. Open a file manager window, and change directory to the one starting with "LibreOffice_", followed by the version number and some platform information.</p>
 			<p id="rpminstall3" xml:lang="en-US">This directory contains a subdirectory called "RPMS". Change directory to the "RPMS" directory.</p>
 			<p id="rpminstall4" xml:lang="en-US">Right-click within the directory and choose "Open in Terminal". A terminal window will open. From the command line of the terminal window, enter the following command (you will be prompted to enter your root user's password before the command will execute):</p>
-			<p id="rpminstall5" xml:lang="en-US">For Fedora-based systems: sudo dnf install *.rpm</p>
+			<p id="rpminstall5" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *.rpm'</p>
 			<p id="rpminstall6" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *.rpm</p>
 			<p id="rpminstall7" xml:lang="en-US">For other RPM-based systems (openSUSE, etc.): rpm -Uvh *.rpm</p>
 			<p id="rpminstallE" xml:lang="en-US">The installation process is now completed, and you should have icons for all the ${PRODUCTNAME} applications in your desktop's Applications/Office menu.</p>
@@ -112,7 +112,7 @@
 			<p id="linuxlangpack4" xml:lang="en-US">Now change directory to the directory that contains the packages to install. On Debian/Ubuntu-based systems, the directory will be DEBS. On Fedora, openSUSE or Mandriva systems, the directory will be RPMS.</p>
 			<p id="linuxlangpack5" xml:lang="en-US">From the Nautilus file manager, right-click in the directory and choose the command "Open in terminal". In the terminal window you just opened, execute the command to install the language pack (with all of the commands below, you may be prompted to enter your root user's password):</p>
 			<p id="linuxlangpack6" xml:lang="en-US">For Debian/Ubuntu-based systems: sudo dpkg -i *.deb</p>
-			<p id="linuxlangpack7" xml:lang="en-US">For Fedora-based systems: su -c 'dnf install *.rpm'</p>
+			<p id="linuxlangpack7" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *.rpm'</p>
 			<p id="linuxlangpack8" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *.rpm</p>
 			<p id="linuxlangpack9" xml:lang="en-US">For other RPM-using systems (openSUSE, etc.): rpm -Uvh *.rpm</p>
 			<p id="linuxlangpackA" xml:lang="en-US">Now start one of the ${PRODUCTNAME} applications - Writer, for instance. Go to the Tools menu and choose Options. In the Options dialog box, click on "Language Settings" and then click on "Languages". Dropdown the "User interface" list and select the language you just installed. If you want, do the same thing for the "Locale setting", the "Default currency", and the "Default languages for documents".</p>