SOLR-1836: merge lucene/solr committer pages

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@927918 13f79535-47bb-0310-9956-ffa450edef68

solr/site/features.html

@@ -107,7 +107,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="index.html" title="Welcome to Solr">Welcome</a>
 </div>
 <div class="menuitem">
-<a href="who.html" title="Solr Committers">Who We Are</a>
+<a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>

solr/site/index.html

@@ -107,7 +107,7 @@ document.write("Last Published: " + document.lastModified);
 <div class="menupagetitle">Welcome</div>
 </div>
 <div class="menuitem">
-<a href="who.html" title="Solr Committers">Who We Are</a>
+<a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>

solr/site/issue_tracking.html

@@ -107,7 +107,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="index.html" title="Welcome to Solr">Welcome</a>
 </div>
 <div class="menuitem">
-<a href="who.html" title="Solr Committers">Who We Are</a>
+<a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>

solr/site/linkmap.html

@@ -107,7 +107,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="index.html" title="Welcome to Solr">Welcome</a>
 </div>
 <div class="menuitem">
-<a href="who.html" title="Solr Committers">Who We Are</a>
+<a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
@@ -200,7 +200,7 @@ document.write("Last Published: " + document.lastModified);
     
 <ul>
 <li>
-<a href="who.html">Who We Are</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>index</em>&nbsp;: Solr Committers</li>
+<a href="http://lucene.apache.org/java/docs/whoweare.html">Who We Are</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>index</em>&nbsp;: Lucene/Solr Committers</li>
 </ul>
   
 </ul>

solr/site/linkmap.pdf

@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1067 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1072 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm;_/e9Q&A@rkFA*1<J,i0O3GCY*9\O2!9lm6p*?sO27M_#;P4n@&,fbF6=W+(++b5;qDctpLH^7F`c,'Go!/#ARJ^(rG!e\)k$D@3g+DKCDJKSKCOKO6)8(UXsj5:&1Z2&E^.?"'\hq3XIhr`4.[C"t8<G57nl8\PNU_a6'"pfFo*ZU.`^`_n"dZpmP'=@RUjGpbkDAdP[%^I&>Q*?HGXZ*f;c:TD=)(ua8P'3KJ?.PFH9*'4k;%Il>J0`ulT4:P*3/_0c/<iFcT"Vg<H"gY8Cghh-r7dWL0?dj>_Is@'#!3@m.:C_'+:)B=OZl(0F+&A8C-@k\fP^9(o?LZ,,M"DBN*BZg`TTeP-B_gp-]6U`Gn@8`Lu/G>KeW^%`;E?-p4?CAcPKC1E>R-Up7@T^K=K7NQ#b.(n[';)3]!*Y_ERC\lU_Kt7f5uYqqaK^cII4m[2*>]mr<^'8/tfIms4h;AbFd<#HjmQ7_;2XO<iH`>,^dadcl?L(pUC"UG`du;1CHp'a'CM+(Mi;3lI!(??rEU<i+mQG\.(4'3u,9mu.`2CP(7^:+(\>O)F$lS0*g,]%!5mp(<pUa^L3konmQD]c'TnK_rcUr*b[](e;7@R-(qBYRCHOc+P-I?J&f!fZ3"kq'mh\>2Lia7d_)mO(O&2Ll%2f$CYfe#t`RGMm&jQFd]p/Z7%HOI#QJl*BM%!G4Z.%WQ5f]N%\SG9lV5o@V9e=)1oPBpr$_rM`Vm693LNL-Q&7Q,9]6[B&8&#)h%eF"SM'@@o_&S5tjqCh064rnmk3>5,)j9L;Stpp$EF82cBgj6FJD(KeCpN9\iZ)PGp^hlEM1j$)ZY^RH.T\kLoa/<51ipL7ja?'sn4Wfbkekc]IeAk-E9#+oKRUVJ8GF\9r(ALa"%VqY=C^Cc/r":igZ^&)`THOA6kNk,dr,&<&kB"4BM'J8%i;?obcdS2F"]2W)?ZWJbaaW704h-@mih,U&gXLNBUVInG!qd^EAL@uBU]6PqgXhTBR&VAl,;o4tb`:V:dMAu[I!mB[9^gU_.O9j6o+R>X\%O(&-kl[Js*F)b=~>
+Gatm;_/e9Q&A@rkFA*/fJ,i0S3GCY*9\O2!9lm6p*?sO27M_#;P4n@&,f]ta=;dt*+b5;qDqTQNE0a6oB46;sJ3gc:^ueu^J\g.F"jm0DO>La35S14\8Ct]PUMHjJEH$N)fR,]jPf<TiDu,0Phr`L6[HtrsWmIKeeT(('81tB,%1qrh*B4s+J3hW"V(5\+-><#4a<'r%\7O#]3ll3?=/)<tC;%`C[T4klcZl_!OL,0kl*ATV>mdgrN]c*2!g7fOI?$$Fi%0K)YttW*H1pr8je[O)Y_E&Ono&0$]eG5@$)969)!jBW;o#K.5S1`X+anr=kPFgOeTrdCYheB-kFFb#,M"DBN*BZg`TTeP-B_gp-]6U`3=rJuLu/G>KeW^%`8")Uq?6%C4XZida'DMGgO!6n$t>iq.qP4=a4#(Alc^VeKO*A!f97$sN4>?.f.ZG`']O5(\_G)E[9cM.79T">hBj5!_d;;KNk\Xu]f'GRCT33=SrsX1$$Lk8.Q^UV\sO$uHM-W%RgIpcJSI:t"rLo(`c>^6L`)mmQ):riV<%GsAcse$A-YKjN".RXK'ElE<Cl:C2tC;#O2kle2(+2c`$]&8Qm6-JXj*_EUBuWnhtW@!%'g3"a=DdTT(`J5_&p50g[XH\9sKU^4MHr]P(IED?7@^O^\E:8,7Hn4>f9^jCl:kU'!Eq%MFuE1p'/X5`%Z6eb22@/#r^Jq'uj17/%ukXa(S]:*/qk^kR]NQ]lNndAM/m&X2N1RO$CJ%>TO2k&MnJCjOs#c!%5jgPE/^D>CA4XH$8)m*m'T`WORbiJJ\kQ2X0N@au@cO]105ENJ0"8pe'@a1fL@obj)GMPR45G!L`"R$g[N`V,Y2tp4f6(\.u@Q]%IrA3mWn4A^apDgrf5cDF.U<Hu"4f+sL@lI'.V#)W+Ai3P!cGE(GCJ-P,S`XaP.2(kIJIUkOO'e"@DkEcO#tCYj6eHjAE8?&U!pXf!1S$4*Cm&crto39P&JVj)BUh*9WUR%f%a+cNM3hTC0/9fG2@kLXIJT6P(PbZ%k!g1q_5[WUE/S$^h52&DN++2n<RY5\YnG&u^~>
 endstream
 endobj
 6 0 obj
@@ -72,17 +72,17 @@ endobj
 xref
 0 12
 0000000000 65535 f 
-0000001891 00000 n 
+0000001896 00000 n 
-0000001949 00000 n 
+0000001954 00000 n 
-0000001999 00000 n 
+0000002004 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001230 00000 n 
+0000001235 00000 n 
-0000001336 00000 n 
+0000001341 00000 n 
-0000001448 00000 n 
+0000001453 00000 n 
-0000001557 00000 n 
+0000001562 00000 n 
-0000001667 00000 n 
+0000001672 00000 n 
-0000001775 00000 n 
+0000001780 00000 n 
 trailer
 <<
 /Size 12
@@ -90,5 +90,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-2119
+2124
 %%EOF

solr/site/mailing_lists.html

@@ -107,7 +107,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="index.html" title="Welcome to Solr">Welcome</a>
 </div>
 <div class="menuitem">
-<a href="who.html" title="Solr Committers">Who We Are</a>
+<a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>

solr/site/tutorial.html

@@ -5,7 +5,7 @@
 <meta content="Apache Forrest" name="Generator">
 <meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
-<title>Solr tutorial (version 1.4.0.2010.01.22.11.57.11)</title>
+<title>Solr tutorial (version 3.0.0.2010.03.26.09.09.44)</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 <link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
 <link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -107,7 +107,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="index.html" title="Welcome to Solr">Welcome</a>
 </div>
 <div class="menuitem">
-<a href="who.html" title="Solr Committers">Who We Are</a>
+<a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
@@ -157,7 +157,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div id="credit">
 <hr>
-      This document is for Apache Solr version 1.4.0.2010.01.22.11.57.11.  If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
+      This document is for Apache Solr version 3.0.0.2010.03.26.09.09.44.  If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
         </div>
 <div id="roundbottom">
 <img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
@@ -181,7 +181,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <h1>Solr tutorial</h1>
 <div id="motd-area">
-      This document is for Apache Solr version 1.4.0.2010.01.22.11.57.11.  If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
+      This document is for Apache Solr version 3.0.0.2010.03.26.09.09.44.  If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
         </div>
 <div id="minitoc-area">
 <ul class="minitoc">

solr/site/version_control.html

@@ -107,7 +107,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="index.html" title="Welcome to Solr">Welcome</a>
 </div>
 <div class="menuitem">
-<a href="who.html" title="Solr Committers">Who We Are</a>
+<a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>

solr/src/site/src/documentation/content/xdocs/site.xml

@@ -38,7 +38,7 @@ See http://forrest.apache.org/docs/linking.html for more info
    -->
   <about label="About">
     <index label="Welcome" href="index.html" description="Welcome to Solr"/>
-    <index label="Who We Are" href="who.html" description="Solr Committers"/>
+    <index label="Who We Are" href="ext:lucene_who" description="Lucene/Solr Committers"/>
   </about>
 
   <docs label="Documentation">
@@ -81,6 +81,7 @@ See http://forrest.apache.org/docs/linking.html for more info
     <xml.apache.org href="http://xml.apache.org/"/>
 
     <lucene      href="http://lucene.apache.org/java/" />
+    <lucene_who  href="http://lucene.apache.org/java/docs/whoweare.html" />
     <nutch     href="http://lucene.apache.org/nutch/" />
     <wiki      href="http://wiki.apache.org/solr/" />
     <faq       href="http://wiki.apache.org/solr/FAQ" />

solr/src/site/src/documentation/content/xdocs/who.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
-          "http://forrest.apache.org/dtd/document-v20.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<document> 
-
-<header>
-  <title>Who We Are</title> 
-</header> 
-
-<body>
-<section>
-<title>Solr Committers (in alphabetical order)</title>
-<ul>
-  <li>Bill Au</li>
-  <li>Doug Cutting</li>
-  <li>Otis Gospodneti&#263;</li>
-  <li>Erik Hatcher</li>
-  <li>Chris Hostetter</li>
-  <li>Grant Ingersoll</li>
-  <li>Mike Klaas</li>
-  <li>Shalin Shekhar Mangar</li>
-  <li>Ryan McKinley</li>
-  <li>Mark Miller</li>
-  <li>Noble Paul</li>
-  <li>Yonik Seeley</li>
-  <li>Koji Sekiguchi</li>
-</ul>
-</section>
-
-<section>
-<title>Inactive Committers (in alphabetical order)</title>
-<ul>
-  <li>Bertrand Delacretaz</li>
-</ul>
-</section>
-
-</body>
-</document>