docs/155986: [PATCH] Add Firefox 4.0 to the handbook

[Beat Gätzi]

>Number:         155986
>Category:       docs
>Synopsis:       [PATCH] Add Firefox 4.0 to the handbook
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 28 07:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Beat Gätzi
>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 at 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:
>Unformatted: