OSDN Git Service

(root) / linuxjf / JF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f6c7ff9)
replace 2.6 with 3.x/2.6
authorMasanori Kobayasi <yasikoba@users.sourceforge.jp>
Mon, 5 Sep 2011 12:33:33 +0000 (21:33 +0900)
committerMasanori Kobayasi <yasikoba@users.sourceforge.jp>
Mon, 5 Sep 2011 12:33:33 +0000 (21:33 +0900)
docs/kernel-docs-2.6/support/template.m4 patch | blob | history
docs/kernel-docs-2.6/support/tree-template.m4 patch | blob | history
docs/kernel-docs-2.6/support/tree.pl patch | blob | history
www/workshop/KDoc-2.6-in-Progress.m4 patch | blob | history

diff --git a/docs/kernel-docs-2.6/support/template.m4 b/docs/kernel-docs-2.6/support/template.m4
index f62b26b..3b06968 100644 (file)
--- a/docs/kernel-docs-2.6/support/template.m4
+++ b/docs/kernel-docs-2.6/support/template.m4
@@ -23,7 +23,7 @@ m4_define(`_CODE',<code>$1</code>)
 
 m4_define(`_LINK', <a href="$1">$2</a>)
 
-m4_define(`_VERSION',2.6)
+m4_define(`_VERSION',3.x/2.6)
 
 m4_define(`_HEADER', `
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
diff --git a/docs/kernel-docs-2.6/support/tree-template.m4 b/docs/kernel-docs-2.6/support/tree-template.m4
index 7d52727..40072da 100644 (file)
--- a/docs/kernel-docs-2.6/support/tree-template.m4
+++ b/docs/kernel-docs-2.6/support/tree-template.m4
@@ -20,7 +20,7 @@ m4_changequote(`[[[[[[[[',`]]]]]]]]')
   Linux Kernel _VERSION.x ¥½¡¼¥¹¤Ë´Þ¤Þ¤ì¤ë Documentation ¥Ç¥£¥ì¥¯¥È¥ê¤ÎËÝÌõ¤Ç¤¹¡£
   ËÝÌõ¤Î´°Î»¤·¤¿¤â¤Î¤«¤é¿ï»þ¸ø³«¤·¤Æ¤¤¤Þ¤¹¡£
   ¸ø³«¤·¤¿ËÝÌõʸ½ñ¤¹¤Ù¤Æ¤ò¥¢¡¼¥«¥¤¥Ö¤·¤¿¤â¤Î¤ò
-  _LINK(../kernel-docs-_VERSION-current.tar.gz,kernel-docs-_VERSION-current.tar.gz)
+  _LINK(../kernel-docs-2.6-current.tar.gz,kernel-docs-2.6-current.tar.gz)
   ¤È¤·¤ÆÍÑ°Õ¤·¤Æ¤¢¤ê¤Þ¤¹¡£
   ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¤¹¤Ù¤Æ
   _LINK(http://www.sra.co.jp/public/doc/gnu/gpl-2j.txt,GPL-2)
@@ -37,7 +37,7 @@ m4_changequote(`[[[[[[[[',`]]]]]]]]')
 
 <p>
 ËÝÌõºî¶È¾ðÊó(¿ÊĽ¤äºî¶ÈͽÌó)¤Ë¤Ä¤¤¤Æ¤Ï
-_LINK(../../workshop/KDoc-_VERSION-in-Progress.html,Kernel-Docs _VERSION in progress)
+_LINK(../../workshop/KDoc-2.6-in-Progress.html,Kernel-Docs _VERSION in progress)
 ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
 </p>
 
diff --git a/docs/kernel-docs-2.6/support/tree.pl b/docs/kernel-docs-2.6/support/tree.pl
index c848642..726c030 100755 (executable)
--- a/docs/kernel-docs-2.6/support/tree.pl
+++ b/docs/kernel-docs-2.6/support/tree.pl
@@ -372,7 +372,7 @@ sub get_file_link($)
        $link =~ s/URL/$conf::baseurl.my_uri_escape($url);/igse;
 
        my $title = cleanup(get_file_title($file, $short_url));
-       $title =~ s/JF: Linux Kernel 2.6 Documentation: //;
+       $title =~ s/JF: Linux Kernel 3.x\/2.6 Documentation: //;
        $link =~ s/TITLE/$title/gs;
 
        my $cont = load_cont_part($file);
diff --git a/www/workshop/KDoc-2.6-in-Progress.m4 b/www/workshop/KDoc-2.6-in-Progress.m4
index d6b286d..75b4e5d 100644 (file)
--- a/www/workshop/KDoc-2.6-in-Progress.m4
+++ b/www/workshop/KDoc-2.6-in-Progress.m4
@@ -31,7 +31,7 @@ m4_dnl
 m4_define(`_SUB_ONE',1)m4_dnl
 m4_include(../jf_www.m4)m4_dnl
 
-_HEADER(`Kernel-Docs 2.6 in progress')
+_HEADER(`Kernel-Docs 3.x/2.6 in progress')
 _EDIT_WARNING(KDoc-2.6-in-Progress)
 
  <div class="date">
@@ -39,7 +39,7 @@ _EDIT_WARNING(KDoc-2.6-in-Progress)
  </div>
 
  <p>
-  ¤³¤Îʸ½ñ¤Ï _LINK(../JFdocs/kernel-docs-2.6/index.html,¥«¡¼¥Í¥ë 2.6 ÉÕ°ʸ½ñ)
+  ¤³¤Îʸ½ñ¤Ï _LINK(../JFdocs/kernel-docs-2.6/index.html,¥«¡¼¥Í¥ë 3.x/2.6 ÉÕ°ʸ½ñ)
   ¤ÎËÝÌõºî¶È¾ðÊó¤ò¥ê¥¹¥È¤·¤¿¤â¤Î¤Ç¤¹.
  </p>
 
Linux JF (Japanese FAQ) Project
About OSDN
Find Software
Develop Software
Help