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

New commits:
commit caad64af7b3a7fb143ba5db6ec167a72e50b983c
Author: Lionel Elie Mamane <[email protected]>
Date:   Fri Jul 19 03:16:54 2013 +0200

    fdo#67061 bring install readme in sync with changed reality
    
    Change-Id: I919311bf8e84b3bd4fbdc595b45625862575405c

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 57204c2..018f29d 100755
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -129,35 +129,26 @@
                        </div>
                        <p id="Precautions" xml:lang="en-US">Please make sure 
you have enough free memory in the temporary directory on your system, and 
please ensure that read, write and run access rights have been granted. Close 
all other programs before starting the installation process.</p>
                        <h3 id="sdfsdfgf42s" xml:lang="en-US">Installation of 
${PRODUCTNAME} on Debian/Ubuntu-based Linux systems</h3>
-                       <p id="debianinstall1" xml:lang="en-US">If you have a 
previous version of ${PRODUCTNAME} already installed, then you will need to 
de-install it before proceeding further. For instructions on how to install a 
language pack (after having installed the US English version of 
${PRODUCTNAME}), please read the section below entitled Installing a Language 
Pack.</p>
+                       <p id="debianinstall1" xml:lang="en-US">For 
instructions on how to install a language pack (after having installed the US 
English version of ${PRODUCTNAME}), please read the section below entitled 
Installing a Language Pack.</p>
                        <p id="debianinstall2" 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="debianinstall3" xml:lang="en-US">This directory 
contains a subdirectory called "DEBS". Change directory to the "DEBS" 
directory.</p>
                        <p id="debianinstall4" 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="debianinstall5" xml:lang="en-US">The following 
commands will install LibreOffice and the desktop integration packages (you may 
just copy and paste them into the terminal screen rather than trying to type 
them):</p>
                        <p id="debianinstall6" xml:lang="en-US">sudo dpkg -i 
*.deb</p>
-                       <p id="debianinstall7" xml:lang="en-US">cd 
desktop-integration</p>
-                       <p id="debianinstall8" xml:lang="en-US">sudo dpkg -i 
*.deb</p>
                        <p id="debianinstall9" 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>
                        <h3 id="sdfsdfgf42t" xml:lang="en-US">Installation of 
${PRODUCTNAME} on Fedora, openSUSE, Mandriva and other Linux systems using RPM 
packages</h3>
-                       <p id="rpminstall1" xml:lang="en-US">If you have a 
previous version of ${PRODUCTNAME} already installed, then you will need to 
de-install it before proceeding further. For instructions on how to install a 
language pack (after having installed the US English version of 
${PRODUCTNAME}), please read the section below entitled Installing a Language 
Pack.</p>
+                       <p id="rpminstall1" xml:lang="en-US">For instructions 
on how to install a language pack (after having installed the US English 
version of ${PRODUCTNAME}), please read the section below entitled Installing a 
Language Pack.</p>
                        <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: 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="rpminstall7a" xml:lang="en-US">Alternatively, 
you can use the 'install' script, located in the toplevel directory of this 
archive to perform an installation as a user. The script will set up 
${PRODUCTNAME} to have its own profile for this installation, separated from 
your normal ${PRODUCTNAME} profile.</p>
-                       <p id="rpminstall8" xml:lang="en-US">The above command 
does the first part of the installation process. To complete the process, you 
also need to install the desktop integration packages. To do this, change 
directory to the "desktop-integration" directory that is within the "RPMS" 
directory, using the following command:</p>
-                       <p id="rpminstall9" xml:lang="en-US">cd 
desktop-integration</p>
-                       <p id="rpminstallA" xml:lang="en-US">Now run the 
installation command again:</p>
-                       <p id="rpminstallB" xml:lang="en-US">For Fedora-based 
systems: su -c 'yum install *freedesktop*.rpm'</p>
-                       <p id="rpminstallC" xml:lang="en-US">For Mandriva-based 
systems: sudo urpmi *mandriva*.rpm</p>
-                       <p id="rpminstallF" xml:lang="en-US">For SUSE-based 
systems: rpm -Uvh *suse*.rpm</p>
-                       <p id="rpminstallD" xml:lang="en-US">For other 
RPM-based systems: rpm -Uvh *freedesktop*.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>
+                       <p id="rpminstall7a" xml:lang="en-US">Alternatively, 
you can use the 'install' script, located in the toplevel directory of this 
archive to perform an installation as a user. The script will set up 
${PRODUCTNAME} to have its own profile for this installation, separated from 
your normal ${PRODUCTNAME} profile.</p>
                        <h3 id="sdfsdfgf42t2" xml:lang="en-US">Notes Concerning 
Desktop Integration for Linux Distributions Not Covered in the Above 
Installation Instructions</h3>
                        <p id="otherinstall1" xml:lang="en-US">It should be 
easily possible to install ${PRODUCTNAME} on other Linux distributions not 
specifically covered in these installation instructions. The main aspect for 
which differences might be encountered is desktop integration.</p>
-                       <p id="otherinstall2" xml:lang="en-US">The 
desktop-integration directory also contains a package named 
libreoffice3.3-freedesktop-menus-3.3.1.noarch.rpm (or similar). This is a 
package for all Linux distributions that support the Freedesktop.org 
specifications/recommendations (<a 
href="http://en.wikipedia.org/wiki/Freedesktop.org";>http://en.wikipedia.org/wiki/Freedesktop.org</a>),
 and is provided for installation on other Linux distributions not covered in 
the aforementioned instructions.</p>
+                       <p id="otherinstall2" xml:lang="en-US">The RPMS (or 
DEBS, respectively) directory also contains a package named 
libreoffice4.1-freedesktop-menus-4.1.0-3.noarch.rpm (or 
libreoffice4.1-debian-menus_4.1.0-3_all.deb, respectively, or similar). This is 
a package for all Linux distributions that support the Freedesktop.org 
specifications/recommendations (<a 
href="http://en.wikipedia.org/wiki/Freedesktop.org";>http://en.wikipedia.org/wiki/Freedesktop.org</a>),
 and is provided for installation on other Linux distributions not covered in 
the aforementioned instructions.</p>
                        <h3 id="sdfsdfgf42t3" xml:lang="en-US">Installing a 
Language Pack</h3>
                        <p id="linuxlangpack1" xml:lang="en-US">Download the 
language pack for your desired language and platform. They are available from 
the same location as the main installation archive. From the Nautilus file 
manager, extract the downloaded archive into a directory (your desktop, for 
instance). Ensure that you have exited all ${PRODUCTNAME} applications 
(including the QuickStarter, if it is started).</p>
                        <p id="linuxlangpack2" xml:lang="en-US">Change 
directory to the directory in which you extracted your downloaded language 
pack.</p>
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to