PERFORCE change 150424 for review

Rene Ladan rene at FreeBSD.org
Thu Sep 25 08:41:06 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=150424

Change 150424 by rene at rene_self on 2008/09/25 08:40:38

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/www/en/cgi/cvsweb.cgi#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/mid.cgi#2 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#6 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/cvsweb.xml#1 branch
.. //depot/projects/docproj_nl/www/en/search/opensearch/markmail.xml#1 branch
.. //depot/projects/docproj_nl/www/en/search/opensearch/message-id.xml#1 branch
.. //depot/projects/docproj_nl/www/en/search/opensearch/opensearch.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/rambler.xml#1 branch
.. //depot/projects/docproj_nl/www/en/search/opensearch/web-all.xml#1 branch
.. //depot/projects/docproj_nl/www/en/search/opensearch/web.xml#1 branch
.. //depot/projects/docproj_nl/www/en/search/search.sgml#4 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.187 2008/09/22 08:41:07 ceri Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.188 2008/09/25 07:30:03 manolis Exp $
 -->
 
 <appendix id="eresources">
@@ -78,11 +78,6 @@
 
 	  <tbody>
 	    <row>
-	      <entry>&a.cvsall.name;</entry>
-	      <entry>Changes made to the FreeBSD source tree</entry>
-	    </row>
-
-	    <row>
 	      <entry>&a.advocacy.name;</entry>
 	      <entry>FreeBSD Evangelism</entry>
 	    </row>

==== //depot/projects/docproj_nl/www/en/cgi/cvsweb.cgi#2 (text+ko) ====

@@ -45,7 +45,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.91 2007/03/17 22:28:31 simon Exp $
+# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.92 2008/09/23 16:31:45 wosch Exp $
 # $Id: cvsweb.cgi,v 1.112 2001/07/24 13:03:16 hzeller Exp $
 # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $
 #
@@ -142,7 +142,7 @@
   $CheckoutMagic = '~checkout~';
 
   $cgi_style::hsty_base = 'http://www.FreeBSD.org';
-  $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.91 2007/03/17 22:28:31 simon Exp $;
+  $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.92 2008/09/23 16:31:45 wosch Exp $;
   @_ = split;
   $cgi_style::hsty_date = "@_[3,4]";
 
@@ -151,6 +151,7 @@
 
   package cgi_style;
   require "./cgi-style.pl";
+  $cgi_style::t_style = qq{\n<link rel="search" type="application/opensearchdescription+xml" href="http://www.freebsd.org/search/opensearch/cvsweb.xml" title="FreeBSD cvsweb" />\n};
   package main;
 }
 

==== //depot/projects/docproj_nl/www/en/cgi/mid.cgi#2 (text+ko) ====

@@ -26,7 +26,7 @@
 #
 # Search a mail by Message-ID, References or In-Reply-To field
 #
-# $FreeBSD: www/en/cgi/mid.cgi,v 1.16 2006/03/15 04:07:54 kuriyama Exp $
+# $FreeBSD: www/en/cgi/mid.cgi,v 1.17 2008/09/23 12:42:17 wosch Exp $
 
 require "./cgi-lib.pl";
 require "./cgi-style.pl";
@@ -41,6 +41,8 @@
 $lookCommand = "/usr/bin/look";
 $ENV{PATH} = '/bin:/usr/bin';
 
+$main::t_style .= qq{\n<link rel="search" type="application/opensearchdescription+xml" href="http://www.freebsd.org/search/opensearch/message-id.xml" title="FreeBSD Mail Message-ID" />\n};
+
 sub escape($) { $_ = $_[0]; s/&/&amp;/g; s/</&lt;/g; s/>/&gt;/g; $_; }
 
 sub get_id {

==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#6 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.378 2008/09/11 19:03:48 wilko Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.379 2008/09/25 07:48:56 gahr Exp $">
 <!ENTITY title "Hardware Donors Page">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2500,7 +2500,7 @@
     <td> Charles Smeijer </td>
     <td> AMD Opteron 250 CPU </td>
     <td> des </td>
-    <td> Shipped </td>
+    <td> Received </td>
   </tr>
 
 </table>

==== //depot/projects/docproj_nl/www/en/search/opensearch/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/search/opensearch/Makefile,v 1.2 2008/09/22 20:00:09 wosch Exp $
+# $FreeBSD: www/en/search/opensearch/Makefile,v 1.5 2008/09/23 16:31:45 wosch Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -16,5 +16,13 @@
 DATA+=	man.xml
 DATA+=	ports.xml 
 DATA+=	query-pr.xml
+DATA+=	web.xml
+DATA+=	web-all.xml
+DATA+=	message-id.xml
+DATA+=	cvsweb.xml
+
+# external sites
+DATA+=	markmail.xml
+DATA+=	rambler.xml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_nl/www/en/search/opensearch/opensearch.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/search/opensearch/opensearch.sgml,v 1.1 2008/09/22 20:00:09 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/search/opensearch/opensearch.sgml,v 1.4 2008/09/23 16:31:45 wosch Exp $">
 <!ENTITY title "FreeBSD OpenSearch Plugins">
 ]>
 
@@ -27,11 +27,21 @@
         in the upper-right corner of Firefox. Click on a item to
         add the <i>FreeBSD Search Services</i> to your Firefox Search Bar.</p>
 
-
+	<h3>By the FreeBSD.org web site</h3>
         <ul>
           <li><a href="man.xml" onclick= "return install(this)">FreeBSD Manual Pages</a></li>
           <li><a href="ports.xml" onclick= "return install(this)">FreeBSD Ports and Packages Collection</a></li>
           <li><a href="query-pr.xml" onclick= "return install(this)">FreeBSD Problem Reports</a></li>
+          <li><a href="web-all.xml" onclick= "return install(this)">FreeBSD Fulltext Search Web + Manual + Ports Pages</a></li>
+          <li><a href="web.xml" onclick= "return install(this)">FreeBSD Fulltext Search Web Pages</a></li>
+          <li><a href="cvsweb.xml" onclick= "return install(this)">FreeBSD CVS Repository</a></li>
+          <li><a href="message-id.xml" onclick= "return install(this)">FreeBSD Mailing List Message-ID Search</a></li>
+	  </ul>
+
+	<h3>External Plugins</h3>
+        <ul>
+          <li><a href="markmail.xml" onclick= "return install(this)">FreeBSD Mailing List Search by MarkMail</a></li>
+          <li><a href="rambler.xml" onclick= "return install(this)">FreeBSD Mailing List Search by Rambler</a></li>
 	  </ul>
 
         <p><i>Supported browsers:</i>: Firefox 2.x, 3.x and IE 7.x or later</p>

==== //depot/projects/docproj_nl/www/en/search/search.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/search/search.sgml,v 1.114 2008/09/22 20:00:09 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/search/search.sgml,v 1.115 2008/09/23 12:14:13 wosch Exp $">
 <!ENTITY title "Search">
 ]>
 
@@ -18,15 +18,17 @@
       <li><a href="http://www.FreeBSD.org/cgi/man.cgi">Manual Pages</a></li>
       <li><a href="http://www.FreeBSD.org/cgi/ports.cgi">
 	Ports Changes</a></li>
+    </ul>
+
+    <p><!-- external search engines --></p>
+    <ul>
       <li><a href="http://fxr.watson.org/">
 	The Source Code</a></li>
       <li><a href="http://minnie.tuhs.org/BSD-info/bsdnews_search.html">BSD
 	Usenet News Searcher</a></li>
       <li><a href="http://www.google.com/bsd">Google Search BSD</a></li>
-      <li><a href="http://www.greasydaemon.com/">GreasyDaemon</a>, an
-	all-in-one BSD UNIX search engine</li>
-      <li><a href="http://freebsd.rambler.ru/">FreeBSD mail archives
-	search</a></li>
+      <li><a href="http://freebsd.rambler.ru/">Rambler: FreeBSD mail archives search</a></li>
+      <li><a href="http://freebsd.markmail.com/">MarkMail: FreeBSD mail archives search</a></li>
     </ul>
 
     <p><a href="opensearch/">List of FreeBSD OpenSearch Plugins</a></p>


More information about the p4-projects mailing list