neysx       05/06/05 16:25:51

  Modified:    xml/htdocs/doc/en new-upgrade-to-gentoo-1.4.xml
  Log:
  #95131 Improved coding style **No content change**

Revision  Changes    Path
1.13      +181 -135  xml/htdocs/doc/en/new-upgrade-to-gentoo-1.4.xml

file : 
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/new-upgrade-to-gentoo-1.4.xml?rev=1.13&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: 
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/new-upgrade-to-gentoo-1.4.xml?rev=1.13&content-type=text/plain&cvsroot=gentoo
diff : 
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/new-upgrade-to-gentoo-1.4.xml.diff?r1=1.12&r2=1.13&cvsroot=gentoo

Index: new-upgrade-to-gentoo-1.4.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/new-upgrade-to-gentoo-1.4.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- new-upgrade-to-gentoo-1.4.xml       6 Apr 2005 09:40:00 -0000       1.12
+++ new-upgrade-to-gentoo-1.4.xml       5 Jun 2005 16:25:51 -0000       1.13
@@ -1,118 +1,145 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/new-upgrade-to-gentoo-1.4.xml,v 1.12 
2005/04/06 09:40:00 neysx Exp $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/new-upgrade-to-gentoo-1.4.xml,v 1.13 
2005/06/05 16:25:51 neysx Exp $ -->
+
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
 <guide link="new-upgrade-to-gentoo-1.4.xml">
 
 <title>Gentoo 1.4 Upgrade Guide</title>
 
-       <author title = "Author">
-<mail link = "[EMAIL PROTECTED]">Robert Coie</mail>
+<author title="Author">
+  <mail link="[EMAIL PROTECTED]">Robert Coie</mail>
 </author>
 
-       <author title = "Copy Editor">
-<mail link = "[EMAIL PROTECTED]">Jon Portnoy</mail>
+<author title="Copy Editor">
+  <mail link="[EMAIL PROTECTED]">Jon Portnoy</mail>
 </author>
 
-       <abstract>A method for upgrading older Gentoo installations in place to 
Gentoo 1.4</abstract>
-  <license/>
+<abstract>A method for upgrading older Gentoo installations in place to Gentoo 
1.4</abstract>
+
+<!-- The content of this document is licensed under the CC-BY-SA license -->
+<!-- See http://creativecommons.org/licenses/by-sa/2.0 -->
+<license/>
+
 <version>0.3</version>
-<date>October 2, 2004</date>
+<date>2004-10-02</date>
+
+<chapter>
+<title>Before you begin</title>
+<section>
+<title>Be prepared</title>
+<body>
+
+<p>
+As with any major upgrade to the core of your Gentoo system, there is always 
the
+possibility that unforeseen problems will ensue. It is always prudent to back
+up all important data before beginning this process. If possible, try to
+allocate a large block of time for this upgrade, so that you will not feel
+rushed. All the software on your machine will need to be recompiled.
+</p>
 
+</body>
+</section>
+<section>
+<title>Other options</title>
+<body>
+
+<p>
+This is not the only way to upgrade your system. You can install a new 1.4
+system onto a separate partition and reuse some of your system configuration
+instead. This method also has the advantage that you can always go back to your
+old system in the meantime as a fallback. You may also decide to simply not
+upgrade your system. If you decide you want to upgrade in place, read on.
+</p>
+
+</body>
+</section>
+<section>
+<title>General notes</title>
+<body>
+
+<p>
+Whenever the code listings suggest running the <c>emerge</c> command, it is
+always a good idea to make a test run of the command using the <c>-p</c> or
+<c>--pretend</c> option to make sure that the command will do what you expect 
it
+to do.
+</p>
 
+</body>
+</section>
+</chapter>
+<chapter>
+<title>Upgrading in place</title>
+<section>
+<title>Get Portage as current as possible</title>
+<body>
 
-       <chapter>
-               <title>Before you begin</title>
-               <section>
-                       <title>Be prepared</title>
-                       <body>
-                               <p>As with any major upgrade to the core of 
your Gentoo
-                               system, there is always the possibility that 
unforeseen
-                               problems will ensue.  It is always prudent to 
back up all
-                               important data before beginning this process.  
If possible,
-                               try to allocate a large block of time for this 
upgrade, so
-                               that you will not feel rushed.  All the 
software on your
-                               machine will need to be recompiled.</p>
-                       </body>
-               </section>
-               <section>
-                       <title>Other options</title>
-                       <body>
-                               <p>This is not the only way to upgrade your 
system.  You can
-                               install a new 1.4 system onto a separate 
partition and
-                               reuse some of your system configuration 
instead.  This method also has
-                               the advantage that you can always go back to 
your old system
-                               in the meantime as a fallback.  You may also 
decide to simply 
-                               not upgrade your system.  If you decide you 
want to upgrade
-                               in place, read on.</p>
-                       </body>
-               </section>
-               <section>
-                       <title>General notes</title>
-                       <body>
-                               <p>Whenever the code listings suggest running 
the
-                               <c>emerge</c> command, it is always a good idea 
to make a test
-                               run of the command using the <c>-p</c> or 
<c>--pretend</c>
-                               option to make sure that the command will do 
what you expect
-                               it to do.</p>
-                       </body>
-               </section>
-       </chapter>
-       <chapter>
-               <title>Upgrading in place</title>
-               <section>
-                       <title>Get Portage as current as possible</title>
-                       <body>
-                               <p>Some of the syntax of current ebuilds is 
unreadable by
-                               older versions of Portage. If you don't have at 
least Portage 2.0.44, try upgrading Portage.</p>
-                               <pre>
+<p>
+Some of the syntax of current ebuilds is unreadable by older versions of
+Portage. If you don't have at least Portage 2.0.44, try upgrading Portage.
+</p>
+
+<pre>
 # <i>emerge --sync</i>
 # <i>emerge -u portage</i>
 </pre>
-                               <note>If your Portage version is very old, you 
may get an
-                               error message containing the phrase 
"unscriptable object".
-                               Read and follow the instructions in
-                               
<path>/usr/portage/sys-apps/portage/files/README.RESCUE</path>.
-                               Your Portage install should then be
-                               current.</note>
-</body></section>
-
-               <section>
-                       <title>Preparing GCC for cohabitation</title>
-                       <body>
-                               <p>You will be installing a newer version of 
GCC during this
-                               upgrade.  Versions of GCC older than 2.95.3-r8 
are not
-                               designed to have multiple versions of GCC 
installed.  You must
-                               therefore upgrade GCC to at least version 
2.95.3-r8.  This
-                               will also have the beneficial side-effect of 
installing the
-                               <c>gcc-config</c> package on your system, which 
can be used to
-                               switch back and forth between various installed 
versions of
-                               GCC.</p>
 
-                               <pre>
+<note>
+If your Portage version is very old, you may get an error message containing 
the
+phrase "unscriptable object". Read and follow the instructions in
+<path>/usr/portage/sys-apps/portage/files/README.RESCUE</path>. Your Portage
+install should then be current.
+</note>
+
+</body>
+</section>
+<section>
+<title>Preparing GCC for cohabitation</title>
+<body>
+
+<p>
+You will be installing a newer version of GCC during this upgrade. Versions of
+GCC older than 2.95.3-r8 are not designed to have multiple versions of GCC
+installed. You must therefore upgrade GCC to at least version 2.95.3-r8. This
+will also have the beneficial side-effect of installing the <c>gcc-config</c>
+package on your system, which can be used to switch back and forth between
+various installed versions of GCC.
+</p>
+
+<pre>
 # <i>emerge -u gcc</i>
 </pre>
 
-                               <p>You can now check to see if gcc-config is 
working properly:</p>
-                               <pre>
+<p>
        <<Truncated>>


-- 
[email protected] mailing list

Reply via email to