fox2mike    05/06/24 19:28:48

  Modified:    xml/htdocs/doc/en/handbook hb-working-portage.xml
  Log:
  #96926 - Updating blockage text as shown by > portage-2.0.51.16

Revision  Changes    Path
1.55      +7 -7      xml/htdocs/doc/en/handbook/hb-working-portage.xml

file : 
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-working-portage.xml?rev=1.55&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: 
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-working-portage.xml?rev=1.55&content-type=text/plain&cvsroot=gentoo
diff : 
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-working-portage.xml.diff?r1=1.54&r2=1.55&cvsroot=gentoo

Index: hb-working-portage.xml
===================================================================
RCS file: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- hb-working-portage.xml      11 Jun 2005 12:16:14 -0000      1.54
+++ hb-working-portage.xml      24 Jun 2005 19:28:48 -0000      1.55
@@ -2,14 +2,14 @@
 <!DOCTYPE sections SYSTEM "/dtd/book.dtd">
 
 <!-- The content of this document is licensed under the CC-BY-SA license -->
-<!-- See http://creativecommons.org/licenses/by-sa/2.0 -->
+<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v 1.54 
2005/06/11 12:16:14 swift Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v 1.55 
2005/06/24 19:28:48 fox2mike Exp $ -->
 
 <sections>
 
-<version>1.49</version>
-<date>2005-06-11</date>
+<version>1.50</version>
+<date>2005-06-25</date>
 
 <section>
 <title>Welcome to Portage</title>
@@ -420,11 +420,11 @@
 <body>
 
 <pre caption="Portage warning about blocked packages (with --pretend)">
-[blocks B     ] gnome-base/bonobo-activation (from pkg 
gnome-base/libbonobo-2.4.0)
+[blocks B     ] mail-mta/ssmtp (is blocking mail-mta/postfix-2.2.2-r1)
 </pre>
 
 <pre caption="Portage warning about blocked packages (without --pretend)">
-!!! Error: the gnome-base/bonobo-activation package conflicts with another 
package.
+!!! Error: the mail-mta/postfix package conflicts with another package.
 !!!        both can't be installed on the same system together.
 !!!        Please use 'emerge --pretend' to determine blockers. 
 </pre>
@@ -440,7 +440,7 @@
 <p>
 To fix a blockage, you can choose to not install the package or unmerge the
 conflicting package first. In the given example, you can opt not to install
-<c>libbonobo</c> or to remove <c>bonobo-activation</c> first.
+<c>postfix</c> or to remove <c>ssmtp</c> first.
 </p>
 
 </body>



-- 
[email protected] mailing list

Reply via email to