[ttssh2-commit] [9391] ヘルプファイル内の各ライセンスファイルへのリンクを修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2021年 8月 30日 (月) 00:24:11 JST


Revision: 9391
          https://osdn.net/projects/ttssh2/scm/svn/commits/9391
Author:   nmaya
Date:     2021-08-30 00:24:11 +0900 (Mon, 30 Aug 2021)
Log Message:
-----------
ヘルプファイル内の各ライセンスファイルへのリンクを修正

4-stable の r9390 相当

- ヘルプの目次・ヘルプのトップページ・プロジェクトファイルに Argon2 が不足していたのを追加
- ヘルプのトップページ・プロジェクトファイルに cJSON が不足していたのを追加
- 並び順を統一(使っているのが Tera Term, Tera Term Macro, TTSSH の順)
- HTML 構造を修正

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9390

Modified Paths:
--------------
    trunk/doc/en/html/about/copyright.html
    trunk/doc/en/html/index.html
    trunk/doc/en/teraterm.hhc
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/html/about/copyright.html
    trunk/doc/ja/html/index.html
    trunk/doc/ja/teraterm.hhc
    trunk/doc/ja/teraterm.hhp
    trunk/teraterm/common/helpid.h

-------------- next part --------------
Modified: trunk/doc/en/html/about/copyright.html
===================================================================
--- trunk/doc/en/html/about/copyright.html	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/doc/en/html/about/copyright.html	2021-08-29 15:24:11 UTC (rev 9391)
@@ -27,6 +27,7 @@
 </ul>
 <h3>Using Library(Source Code)</h3>
 <ul>
+  <li>cJSON ... <a href="../reference/cJSON-LICENSE.txt">MIT License</a> <a href="https://github.com/DaveGamble/cJSON">(github)</a></li>
   <li>Oniguruma ... <a href="../reference/Oniguruma-LICENSE.txt">2-clause BSD license</a></li>
   <li>SFMT ... <a href="../reference/SFMT-LICENSE.txt">3-clause BSD license</a></li>
   <li>OpenSSH ... <a href="../reference/OpenSSH-LICENSE.txt">BSD style license</a></li>
@@ -33,7 +34,6 @@
   <li>OpenSSL ... <a href="../reference/OpenSSL-LICENSE.txt">Dual(both) license, OpenSSL License(Apache License 1.0) and SSLeay License(4-clause BSD license)</a></li>
   <li>zlib ... <a href="../reference/zlib-LICENSE.txt">zlib License</a></li>
   <li>PuTTY ... <a href="../reference/PuTTY-LICENSE.txt">MIT License</a></li>
-  <li>cJSON ... <a href="../reference/cJSON-LICENSE.txt">MIT License</a> <a href="https://github.com/DaveGamble/cJSON">(github)</a></li>
   <li>The reference C implementation of Argon2 ... <a href="../reference/argon2-LICENSE.txt">Creative Commons CC0 1.0 License/Waiver or the Apache License 2.0</a></li>
 </ul>
 

Modified: trunk/doc/en/html/index.html
===================================================================
--- trunk/doc/en/html/index.html	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/doc/en/html/index.html	2021-08-29 15:24:11 UTC (rev 9391)
@@ -137,14 +137,16 @@
 
 <div class="topic">Reference data</div>
 <UL style="list-style-type:none">
- <LI><A HREF="reference/keycode.txt">Key code</A>
- <LI><A HREF="reference/RE.txt">RE</A>
+ <LI><A HREF="reference/keycode.txt">Key code</A></LI>
+ <LI><A HREF="reference/RE.txt">RE</A></LI>
+ <LI><A HREF="reference/cJSON-LICENSE.txt">License of cJSON</A></LI>
+ <LI><A HREF="reference/Oniguruma-LICENSE.txt">License of Oniguruma</A></LI>
+ <LI><A HREF="reference/SFMT-LICENSE.txt">License of SFMT</A></LI>
+ <LI><A HREF="reference/OpenSSH-LICENSE.txt">License of OpenSSH</A></LI>
  <LI><A HREF="reference/OpenSSL-LICENSE.txt">License of OpenSSL</A></LI>
- <LI><A HREF="reference/OpenSSH-LICENSE.txt">License of OpenSSH</A></LI>
  <LI><A HREF="reference/zlib-LICENSE.txt">License of zlib</A></LI>
  <LI><A HREF="reference/PuTTY-LICENSE.txt">License of PuTTY</A></LI>
- <LI><A HREF="reference/Oniguruma-LICENSE.txt">License of Oniguruma</A></LI>
- <LI><A HREF="reference/SFMT-LICENSE.txt">License of SFMT</A></LI>
+ <LI><A HREF="reference/argon2-LICENSE.txt">License of The reference C implementation of Argon2</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">License of CygTerm+</A></LI>
  <LI><A HREF="reference/develop.txt">For developer</A>
  <UL>
@@ -153,7 +155,7 @@
 	 <LI><A HREF="reference/build_library_with_cmake.html">library</A></LI>
 	 <LI><A HREF="reference/build_with_cmake.html">Tera Term</A></LI>
    </UL>
- </UL>
+ </UL></LI>
  <LI><A HREF="reference/sourcecode.html">Source Code Overview</A></LI>
 </UL>
 

Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/doc/en/teraterm.hhc	2021-08-29 15:24:11 UTC (rev 9391)
@@ -563,16 +563,31 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="License of OpenSSL">
-			<param name="Local" value="html\reference\OpenSSL-LICENSE.txt">
+			<param name="Name" value="License of cJSON">
+			<param name="Local" value="html\reference\cJSON-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="License of Oniguruma">
+			<param name="Local" value="html\reference\Oniguruma-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="License of SFMT">
+			<param name="Local" value="html\reference\SFMT-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="License of OpenSSH">
 			<param name="Local" value="html\reference\OpenSSH-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="License of OpenSSL">
+			<param name="Local" value="html\reference\OpenSSL-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="License of zlib">
 			<param name="Local" value="html\reference\zlib-LICENSE.txt">
 			<param name="ImageNumber" value="11">
@@ -583,26 +598,16 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="License of Oniguruma">
-			<param name="Local" value="html\reference\Oniguruma-LICENSE.txt">
+			<param name="Name" value="License of The reference C implementation of Argon2">
+			<param name="Local" value="html\reference\argon2-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="License of SFMT">
-			<param name="Local" value="html\reference\SFMT-LICENSE.txt">
-			<param name="ImageNumber" value="11">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="License of CygTerm+">
 			<param name="Local" value="html\reference\CygTerm+-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="License of cJSON">
-			<param name="Local" value="html\reference\cJSON-LICENSE.txt">
-			<param name="ImageNumber" value="11">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="For developer">
 			<param name="Local" value="html\reference\develop.txt">
 			<param name="ImageNumber" value="11">

Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/doc/en/teraterm.hhp	2021-08-29 15:24:11 UTC (rev 9391)
@@ -179,6 +179,8 @@
 HlpRefSFMT=html\reference\SFMT-LICENSE.txt
 HlpRefCygterm=html\reference\CygTerm+-LICENSE.txt
 HlpRefZlib=html\reference\zlib-LICENSE.txt
+HlpRefArgon2=html\reference\argon2-LICENSE.txt
+HlpRefCjson=html\reference\cJSON-LICENSE.txt
 HlpMacro=html\macro\index.html
 HlpMacroExec=html\macro\howtorun.html
 HlpMacroCommandline=html\macro\commandline.html

Modified: trunk/doc/ja/html/about/copyright.html
===================================================================
--- trunk/doc/ja/html/about/copyright.html	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/doc/ja/html/about/copyright.html	2021-08-29 15:24:11 UTC (rev 9391)
@@ -27,6 +27,7 @@
 </ul>
 <h3>\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82郉\x83C\x83u\x83\x89\x83\x8A(\x83\\x81[\x83X\x83R\x81[\x83h)</h3>
 <ul>
+  <li>cJSON ... <a href="../reference/cJSON-LICENSE.txt">MIT\x83\x89\x83C\x83Z\x83\x93\x83X</a> <a href="https://github.com/DaveGamble/cJSON">(github)</a></li>
   <li>Oniguruma ... <a href="../reference/Oniguruma-LICENSE.txt">\x93\xF1\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li>SFMT ... <a href="../reference/SFMT-LICENSE.txt">\x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li>OpenSSH ... <a href="../reference/OpenSSH-LICENSE.txt">BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
@@ -33,7 +34,6 @@
   <li>OpenSSL ... <a href="../reference/OpenSSL-LICENSE.txt">OpenSSL License(Apache License 1.0) \x82\xC6 SSLeay License(\x8El\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X) \x82̃f\x83\x85\x83A\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X(\x97\xBC\x95\xFB\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82\xE9)</a></li>
   <li>zlib ... <a href="../reference/zlib-LICENSE.txt">zlib\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li>PuTTY ... <a href="../reference/PuTTY-LICENSE.txt">MIT\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
-  <li>cJSON ... <a href="../reference/cJSON-LICENSE.txt">MIT\x83\x89\x83C\x83Z\x83\x93\x83X</a> <a href="https://github.com/DaveGamble/cJSON">(github)</a></li>
   <li>The reference C implementation of Argon2 ... <a href="../reference/argon2-LICENSE.txt">Creative Commons CC0 1.0 License/Waiver \x82܂\xBD\x82\xCD Apache License 2.0</a></li>
 </ul>
 

Modified: trunk/doc/ja/html/index.html
===================================================================
--- trunk/doc/ja/html/index.html	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/doc/ja/html/index.html	2021-08-29 15:24:11 UTC (rev 9391)
@@ -140,14 +140,16 @@
  <LI><A HREF="reference/keycode.txt">Keycode</A></LI>
  <LI><A HREF="reference/menu_id.html">menu id</A></LI>
  <LI><A HREF="reference/RE.txt">RE</A></LI>
+ <LI><A HREF="reference/cJSON-LICENSE.txt">cJSON \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/Oniguruma-LICENSE.txt">\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/SFMT-LICENSE.txt">SFMT \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/OpenSSH-LICENSE.txt">OpenSSH \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/OpenSSL-LICENSE.txt">OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
- <LI><A HREF="reference/OpenSSH-LICENSE.txt">OpenSSH \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/zlib-LICENSE.txt">zlib \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/PuTTY-LICENSE.txt">PuTTY \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
- <LI><A HREF="reference/Oniguruma-LICENSE.txt">\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
- <LI><A HREF="reference/SFMT-LICENSE.txt">SFMT \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/argon2-LICENSE.txt">The reference C implementation of Argon2 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">CygTerm+ \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
- <LI><A HREF="reference/develop.txt">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A></LI>
+ <LI><A HREF="reference/develop.txt">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A>
  <UL>
    <LI>CMake\x83r\x83\x8B\x83h\x83V\x83X\x83e\x83\x80\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x83r\x83\x8B\x83h(experimental)</LI>
    <UL>
@@ -154,7 +156,7 @@
 	 <LI><A HREF="reference/build_library_with_cmake.html">\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82̃r\x83\x8B\x83h</A></LI>
 	 <LI><A HREF="reference/build_with_cmake.html">Tera Term\x82̃r\x83\x8B\x83h</A></LI>
    </UL>
- </UL>
+ </UL></LI>
  <LI><A HREF="reference/sourcecode.html">\x83\\x81[\x83X\x83R\x81[\x83h\x89\xF0\x90\xE0</A></LI>
 </UL>
 

Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/doc/ja/teraterm.hhc	2021-08-29 15:24:11 UTC (rev 9391)
@@ -572,16 +572,31 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X">
-			<param name="Local" value="html\reference\OpenSSL-LICENSE.txt">
+			<param name="Name" value="cJSON \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\cJSON-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\Oniguruma-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="SFMT \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\SFMT-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="OpenSSH \x83\x89\x83C\x83Z\x83\x93\x83X">
 			<param name="Local" value="html\reference\OpenSSH-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\OpenSSL-LICENSE.txt">
+			<param name="ImageNumber" value="11">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="zlib \x83\x89\x83C\x83Z\x83\x93\x83X">
 			<param name="Local" value="html\reference\zlib-LICENSE.txt">
 			<param name="ImageNumber" value="11">
@@ -592,26 +607,16 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X">
-			<param name="Local" value="html\reference\Oniguruma-LICENSE.txt">
+			<param name="Name" value="The reference C implementation of Argon2 \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\argon2-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="SFMT \x83\x89\x83C\x83Z\x83\x93\x83X">
-			<param name="Local" value="html\reference\SFMT-LICENSE.txt">
-			<param name="ImageNumber" value="11">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="CygTerm+ \x83\x89\x83C\x83Z\x83\x93\x83X">
 			<param name="Local" value="html\reference\CygTerm+-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="cJSON \x83\x89\x83C\x83Z\x83\x93\x83X">
-			<param name="Local" value="html\reference\cJSON-LICENSE.txt">
-			<param name="ImageNumber" value="11">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF">
 			<param name="Local" value="html\reference\develop.txt">
 			<param name="ImageNumber" value="11">

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/doc/ja/teraterm.hhp	2021-08-29 15:24:11 UTC (rev 9391)
@@ -187,6 +187,8 @@
 HlpRefSFMT=html\reference\SFMT-LICENSE.txt
 HlpRefCygterm=html\reference\CygTerm+-LICENSE.txt
 HlpRefZlib=html\reference\zlib-LICENSE.txt
+HlpRefArgon2=html\reference\argon2-LICENSE.txt
+HlpRefCjson=html\reference\cJSON-LICENSE.txt
 HlpMacro=html\macro\index.html
 HlpMacroExec=html\macro\howtorun.html
 HlpMacroCommandline=html\macro\commandline.html

Modified: trunk/teraterm/common/helpid.h
===================================================================
--- trunk/teraterm/common/helpid.h	2021-08-29 15:02:04 UTC (rev 9390)
+++ trunk/teraterm/common/helpid.h	2021-08-29 15:24:11 UTC (rev 9391)
@@ -212,6 +212,8 @@
 #define HlpRefSFMT      80009
 #define HlpRefCygterm   80010
 #define HlpRefZlib      80011
+#define HlpRefArgon2    80012
+#define HlpRefCjson     80013
 
 #define HlpMacro                        90000
 #define HlpMacroExec                    90001


ttssh2-commit メーリングリストの案内
Back to archive index