[deployment-guide/comm-rel: 108/727] procFS: fix mtrr.txt kernel doc location

Jaromir Hradilek jhradile at fedoraproject.org
Tue Oct 19 12:33:16 UTC 2010


commit f31640ffd03c3e39688e980ce89ded81ea05c882
Author: Douglas Silas <dhensley at redhat.com>
Date:   Thu Jul 22 16:57:07 2010 +0200

    procFS: fix mtrr.txt kernel doc location

 en-US/The_proc_File_System.xml |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/en-US/The_proc_File_System.xml b/en-US/The_proc_File_System.xml
index 32f2245..692f346 100644
--- a/en-US/The_proc_File_System.xml
+++ b/en-US/The_proc_File_System.xml
@@ -706,9 +706,7 @@ Block devices:
 	 installed documentation:
        </para>
 
-      <screen>
-/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/devices.txt
-</screen>
+      <screen>/usr/share/doc/kernel-doc-<replaceable>&lt;kernel_version&gt;</replaceable>/Documentation/devices.txt</screen>
 
     </section>
 
@@ -1733,10 +1731,7 @@ reg01: base=0xe8000000 (3712MB), size=  32MB: write-combining, count=1
 	 default. More information on manually configuring this file
 	 can be found locally at the following location:
        </para>
-
-      <screen>
-/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/mtrr.txt
-</screen>
+      <screen>/usr/share/doc/kernel-doc-<replaceable>&lt;kernel_version&gt;</replaceable>/Documentation/<replaceable>&lt;arch&gt;</replaceable>/mtrr.txt</screen>
     </section>
 
     <section
@@ -2690,7 +2685,7 @@ batt_status     : okay
 	</para>
 
       <para>
-        <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/rtc.txt</filename>.
+        <filename>/usr/share/doc/kernel-doc-<replaceable>&lt;kernel_version&gt;</replaceable>/Documentation/rtc.txt</filename>.
 	</para>
     </section>
 
@@ -2749,7 +2744,7 @@ batt_status     : okay
        </para>
 
       <screen>
-/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/filesystems/proc.txt
+/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/filesystems/proc.txt
 </screen>
     </section>
 
@@ -4089,7 +4084,7 @@ Can write RAM:          0
             </warning>
 
             <para>
-		    Refer to <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/sysrq.txt</filename>
+		    Refer to <filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/sysrq.txt</filename>
 		    for more information about the System Request Key.
 		  </para>
           </listitem>
@@ -4512,7 +4507,7 @@ Can write RAM:          0
 	      </para>
 
         <screen>
-<filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/networking/ip-sysctl.txt</filename>
+<filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/networking/ip-sysctl.txt</filename>
         </screen>
 
         <para>
@@ -4575,7 +4570,7 @@ Can write RAM:          0
 	      </para>
 
         <screen>
-/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/filesystems/proc.txt
+/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/filesystems/proc.txt
 </screen>
 
       </section>
@@ -4712,7 +4707,7 @@ Can write RAM:          0
 	     </para>
 
             <para>
-              <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/laptop-mode.txt</filename>
+              <filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/laptop-mode.txt</filename>
             </para>
           </listitem>
 
@@ -4740,7 +4735,7 @@ Can write RAM:          0
 
 	     <para>
 	       <filename
-	      >/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/filesystems/proc.txt</filename>
+	      >/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/filesystems/proc.txt</filename>
 	     </para>
 	   </listitem> -->
 
@@ -4779,7 +4774,7 @@ Can write RAM:          0
 	     </para>
 
             <para>
-              <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/vm/hugetlbpage.txt</filename>
+              <filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/vm/hugetlbpage.txt</filename>
             </para>
           </listitem>
 
@@ -4885,7 +4880,7 @@ Can write RAM:          0
 	 </para>
 
         <para>
-          <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/</filename>,
+          <filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/</filename>,
 	   which contains additional information.
 	 </para>
       </section>
@@ -5215,7 +5210,7 @@ kernel.sysrq = 1
       <itemizedlist>
         <listitem>
           <para>
-            <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/filesystems/proc.txt</filename>
+            <filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/filesystems/proc.txt</filename>
 	     &mdash; Contains assorted, but limited, information about
 	     all aspects of the <filename>/proc/</filename> directory.
 	   </para>
@@ -5223,14 +5218,14 @@ kernel.sysrq = 1
 
         <listitem>
           <para>
-            <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/sysrq.txt</filename>
+            <filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/sysrq.txt</filename>
 	     &mdash; An overview of System Request Key options.
 	   </para>
         </listitem>
 
         <listitem>
           <para>
-            <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/sysctl/</filename>
+            <filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/sysctl/</filename>
 	     &mdash; A directory containing a variety of <command>sysctl</command> tips, including
 	     modifying values that concern the kernel (<filename>kernel.txt</filename>), accessing file
 	     systems (<filename>fs.txt</filename>),
@@ -5240,7 +5235,7 @@ kernel.sysrq = 1
 
         <listitem>
           <para>
-            <filename>/usr/share/doc/kernel-doc-<replaceable>version</replaceable>/Documentation/networking/ip-sysctl.txt</filename>
+            <filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/networking/ip-sysctl.txt</filename>
 	     &mdash; A detailed overview of IP networking options.
 	   </para>
         </listitem>


More information about the docs-commits mailing list