From beat@FreeBSD.org  Mon Mar 28 07:02:33 2011
Return-Path: <beat@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DCC3D1065672
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 28 Mar 2011 07:02:33 +0000 (UTC)
	(envelope-from beat@FreeBSD.org)
Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55])
	by mx1.freebsd.org (Postfix) with ESMTP id 614F88FC1C
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 28 Mar 2011 07:02:32 +0000 (UTC)
Received: from _HOSTNAME_ (global277.lnk.telstra.net [203.45.62.136])
	(authenticated bits=0)
	by marvin.chruetertee.ch (8.14.3/8.14.3) with ESMTP id p2S72QH5013748
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Mar 2011 07:02:30 GMT
	(envelope-from beat@FreeBSD.org)
Received: by _HOSTNAME_ (sSMTP sendmail emulation); Mon, 28 Mar 2011 09:02:20 +0200
Message-Id: <201103280702.p2S72QH5013748@marvin.chruetertee.ch>
Date: Mon, 28 Mar 2011 09:02:20 +0200
From: Beat Gtzi <beat@FreeBSD.org>
Reply-To: Beat Gtzi <beat@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: [PATCH] Add Firefox 4.0 to the handbook
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         155986
>Category:       docs
>Synopsis:       [PATCH] Add Firefox 4.0 to the handbook
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bcr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 28 07:10:09 UTC 2011
>Closed-Date:    Mon Mar 28 08:57:55 UTC 2011
>Last-Modified:  Mon Mar 28 08:57:55 UTC 2011
>Originator:     Beat Gtzi
>Release:        FreeBSD 9.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD daedalus.network.local 9.0-CURRENT FreeBSD 9.0-CURRENT #5 r217615M: Thu Jan 20 01:02:35 CET 2011 root@daedalus.network.local:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	- Firefox 4.0 has been committed to the ports tree. Attached patch updates
	the desktop chapter of the handbook with the information for Firefox 4.0.
	
>How-To-Repeat:
	
>Fix:

	

--- firefox-4.0-handbook.patch begins here ---
Index: en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v
retrieving revision 1.104
diff -u -r1.104 chapter.sgml
--- en_US.ISO8859-1/books/handbook/desktop/chapter.sgml	27 Mar 2011 17:33:23 -0000	1.104
+++ en_US.ISO8859-1/books/handbook/desktop/chapter.sgml	28 Mar 2011 01:21:17 -0000
@@ -182,8 +182,13 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
-      <para>This will install <application>Firefox</application> 3.6,
-	if you want to run <application>Firefox</application> 3.5,
+      <para>This will install <application>Firefox</application> 4.0,
+	if you want to run <application>Firefox</application> 3.6,
+	use instead:</para>
+
+      <screen>&prompt.root; <userinput>pkg_add -r firefox36</userinput></screen>
+
+      <para>If you want to run <application>Firefox</application> 3.5,
 	use instead:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox35</userinput></screen>
@@ -194,9 +199,10 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>For <application>Firefox</application> 3.5, in the
+      <para>For <application>Firefox</application> 3.6, in the
 	previous command replace <literal>firefox</literal> with
-	<literal>firefox35</literal>.</para>
+	<literal>firefox36</literal>. For <application>Firefox</application>
+	3.5 use <literal>firefox35</literal> instead.</para>
     </sect2>
 
     <sect2 id="moz-java-plugin">
@@ -275,7 +281,7 @@
 	</step>
 
 	<step>
-	  <title>For Firefox 3.6</title>
+	  <title>For Firefox 3.6 and 4.0</title>
 
       <para>Install <application>OpenJDK 6</application>
         through the Ports Collection by typing:</para>
--- firefox-4.0-handbook.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->bcr 
Responsible-Changed-By: bcr 
Responsible-Changed-When: Mon Mar 28 07:16:07 UTC 2011 
Responsible-Changed-Why:  
Grab this one. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155986 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/155986: commit references a PR
Date: Mon, 28 Mar 2011 08:49:08 +0000 (UTC)

 bcr         2011-03-28 08:48:54 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/books/handbook/desktop chapter.sgml 
   Log:
   Mention the new Firefox 4.0 version in the handbook.
   
   While I'm here, correct some indentations.
   
   PR:             docs/155986
   Submitted by:   beat@
   
   Revision  Changes    Path
   1.105     +19 -14    doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: bcr 
State-Changed-When: Mon Mar 28 08:56:45 UTC 2011 
State-Changed-Why:  
Patch committed with minor corrections. Thanks, Beat! 
PR closed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155986 
>Unformatted:
