Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 May 2002 21:59:28 +0200 (CEST)
From:      Marc Fonvieille <marc@blackend.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   docs/38777: In articles 4.x, 3.x should be 4.X and 3.X
Message-ID:  <200205311959.g4VJxSSs078796@abigail.blackend.org>

next in thread | raw e-mail | index | archive | help

>Number:         38777
>Category:       docs
>Synopsis:       In articles 4.x, 3.x should be 4.X and 3.X
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 31 13:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Marc Fonvieille
>Release:        FreeBSD 4.6-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD abigail.blackend.org 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #5: Sun May 12 00:30:43 CEST 2002 marc@abigail.blackend.org:/usr/src/sys/compile/ABIGAIL i386


	
>Description:
In articles 4.x, 3.x should be 4.X and 3.X
Read the patch below for more details.
	
>How-To-Repeat:
	
>Fix:
Apply the patch to articles/
	

--- articles.diff begins here ---
diff -ruN articles.org/committers-guide/article.sgml articles/committers-guide/article.sgml
--- articles.org/committers-guide/article.sgml	Mon May 27 11:16:22 2002
+++ articles/committers-guide/article.sgml	Fri May 31 21:51:52 2002
@@ -76,7 +76,7 @@
 	  
 	  <row>	  
 	    <entry><emphasis>Noteworthy CVS Tags</emphasis></entry>
-	    <entry><literal>RELENG_4</literal> (4.x-STABLE), <literal>HEAD</literal> (-CURRENT)</entry>
+	    <entry><literal>RELENG_4</literal> (4.X-STABLE), <literal>HEAD</literal> (-CURRENT)</entry>
 	  </row>
 	</tbody>
       </tgroup>
@@ -323,7 +323,7 @@
 
           <listitem>
             <para>Check out the <filename>miscfs</filename> module as
-              it is in the 4.x branch:</para>
+              it is in the 4.X branch:</para>
 
             <screen>&prompt.user; <userinput>cvs co -rRELENG_4 miscfs</userinput></screen>
 
diff -ruN articles.org/java-tomcat/article.sgml articles/java-tomcat/article.sgml
--- articles.org/java-tomcat/article.sgml	Sat Apr 27 09:32:34 2002
+++ articles/java-tomcat/article.sgml	Fri May 31 21:53:26 2002
@@ -118,7 +118,7 @@
 
     <para>The Tomcat portion of the install is very straight forward, but
       the difficulty I had was getting Java Development Kit up and
-      running for FreeBSD 4.x, as Sun Microsystems only supplies
+      running for FreeBSD 4.X, as Sun Microsystems only supplies
       Binaries for Linux, Solaris, and Windows NT.  This means that I
       had to compile my own JDK for FreeBSD.  I began by searching for
       documentation on the Internet.  I quickly found that there is more
diff -ruN articles.org/releng/branches.ascii articles/releng/branches.ascii
--- articles.org/releng/branches.ascii	Tue Jan  1 06:25:13 2002
+++ articles/releng/branches.ascii	Fri May 31 21:54:27 2002
@@ -8,7 +8,7 @@
            |                                   RELENG_3
 H    ______|____   _ _ _   _ _ _   _ _ _   _ _ _   _ _ _ _    + - - - - - - +
 E   /           \ |     | |     | |     | |     | |       |   |             |
-A   |3.1-RELEASE|-|3.2R |-|3.3R |-|3.4R |-|3.5R |-| 3.5.1R|---| 3.x-STABLE  |
+A   |3.1-RELEASE|-|3.2R |-|3.3R |-|3.4R |-|3.5R |-| 3.5.1R|---| 3.X-STABLE  |
 D   \___________/ |_ _ _| |_ _ _| |_ _ _| |_ _ _| |_ _ _ _|   |             |
           |                                                   + - - - - - - +
           |
@@ -19,7 +19,7 @@
           |                                    RELENG_4 
      _____|_____   _ _ _   _ _ _ _   _ _ _   _ _ _   _ _ _    + - - - - - - +
     /           \ |     | |       | |     | |     | |     |   |             |
-    |4.0-RELEASE|-|4.1R |-|4.1.1R |-|4.2R |-|4.3R |-|4.4R |---| 4.x-STABLE  |
+    |4.0-RELEASE|-|4.1R |-|4.1.1R |-|4.2R |-|4.3R |-|4.4R |---| 4.X-STABLE  |
     \___________/ |_ _ _| |_ _ _ _| |_ _ _| |_ _ _| |_ _ _|   |             |
           |                                 ___|      |__     + - - - - - - +
           |                          _ _ _ | _ _ _   _ _ |_ _ _ __
diff -ruN articles.org/vm-design/article.sgml articles/vm-design/article.sgml
--- articles.org/vm-design/article.sgml	Fri Feb 15 00:57:13 2002
+++ articles/vm-design/article.sgml	Fri May 31 21:55:33 2002
@@ -312,7 +312,7 @@
       However, the swap management structure has had problems
       historically.</para>
 
-    <para>Under FreeBSD 3.x the swap management structure preallocates an
+    <para>Under FreeBSD 3.X the swap management structure preallocates an
       array that encompasses the entire object requiring swap backing
       store&mdash;even if only a few pages of that object are swap-backed.
       This creates a kernel memory fragmentation problem when large objects
@@ -329,7 +329,7 @@
       fly for additional swap management structures when a swapout occurs.  It
       is evident that there was plenty of room for improvement.</para>
 
-    <para>For FreeBSD 4.x, I completely rewrote the swap subsystem.  With this
+    <para>For FreeBSD 4.X, I completely rewrote the swap subsystem.  With this
       rewrite, swap management structures are allocated through a hash table
       rather than a linear array giving them a fixed allocation size and much
       finer granularity.  Rather then using a linearly linked list to keep
@@ -558,7 +558,7 @@
       <qandaentry>
 	<question>
 	  <para>What is <quote>the interleaving algorithm</quote> that you
-	    refer to in your listing of the ills of the FreeBSD 3.x swap
+	    refer to in your listing of the ills of the FreeBSD 3.X swap
 	    arrangements?</para>
 	</question>
 
@@ -574,7 +574,7 @@
 
 	  <literallayout>A B C D A B C D A B C D A B C D</literallayout>
 
-	  <para>FreeBSD 3.x uses a <quote>sequential list of free
+	  <para>FreeBSD 3.X uses a <quote>sequential list of free
 	    regions</quote> approach to accounting for the free swap areas.
 	    The idea is that large blocks of free linear space can be
 	    represented with a single list node
@@ -593,16 +593,16 @@
 	    it is to try to put that sophistication elsewhere.</para>
 
 	  <para>The fragmentation causes other problems.  Being a linear list
-	    under 3.x, and having such a huge amount of inherent
+	    under 3.X, and having such a huge amount of inherent
 	    fragmentation, allocating and freeing swap winds up being an O(N)
 	    algorithm instead of an O(1) algorithm.  Combined with other
 	    factors (heavy swapping) and you start getting into O(N^2) and
-	    O(N^3) levels of overhead, which is bad.  The 3.x system may also
+	    O(N^3) levels of overhead, which is bad.  The 3.X system may also
 	    need to allocate KVM during a swap operation to create a new list
 	    node which can lead to a deadlock if the system is trying to
 	    pageout pages in a low-memory situation.</para>
 
-	  <para>Under 4.x we do not use a sequential list.  Instead we use a
+	  <para>Under 4.X we do not use a sequential list.  Instead we use a
 	    radix tree and bitmaps of swap blocks rather than ranged list
 	    nodes.  We take the hit of preallocating all the bitmaps required
 	    for the entire swap area up front but it winds up wasting less
--- articles.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205311959.g4VJxSSs078796>