Merge -r 667026:667027 from trunk onto 0.18 branch. Fixes HADOOP-3544.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@667031 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -574,6 +574,9 @@ Release 0.18.0 - Unreleased
     HADOOP-3542. Diables the creation of _logs directory for the archives
     directory. (Mahadev Konar via ddas)
 
+    HADOOP-3544. Fixes a documentation issue for hadoop archives.
+    (Mahadev Konar via ddas)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

docs/hadoop_archives.html

@@ -225,7 +225,7 @@ document.write("Last Published: " + document.lastModified);
         to run this. The following is an example:</p>
 <p>
         
-<span class="codefrag">hadoop -archiveName foo.har /user/hadoop/dir1 /user/hadoop/dir2 /user/zoo/</span>
+<span class="codefrag">hadoop archive -archiveName foo.har /user/hadoop/dir1 /user/hadoop/dir2 /user/zoo/</span>
         
 </p>
 <p>

docs/hadoop_archives.pdf

@@ -58,10 +58,10 @@ endobj
 >>
 endobj
 14 0 obj
-<< /Length 1688 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1683 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatU4D3(GM&H88._7/j8)?T%YX6Q^uWn5ut4ghaZ<E6N.*,ksB^sn+`VSBhl5Wf6tZb7hq@L#$ebfo\&3,^a6e[rnCIG;"b]7jb^(TukUO)(j<Yo!8.m<YJ6.BVL2>l35YU7g8UqDH0M>[^+_i]U$cXl5=4Q9Pu\mBuVB[J=h4rFYT/YgQ\N@F8<LHohg*b<N\EN&kkoZ*oQt(2l8>"3X-HK;s"6[Jd&uc",>^,Hj\%j$IYM-nA:crVHTch*m-?UVo#Dh,*U>r;&$!aMX-!U`:SRU2sc_%Hu61Oee];pkA.oidd**TaZ"E7lPUGR9Yp<L/^:5eJFZ;]</seX972pn0PGVE*`RC9%)W32o)oCX1SKWc%qfN\Y;1]rQi,KaYRn@9#6Q7(;XX]7iniC%o&Un0l*(6nF<&?,HR)'kF)Tnm+Uu[GNr4QKNucsTqJN,8b?]HTQG(fhi*6U+MHdMGu_[?M+?Nm"\iq\.S&nHng<ZXW/41bgYi\]`M2YM)!B?K:pnfj]\%BIe=VI\>2I_\Srj=(\5?YY0Unmh5\iIPcmW1;'\Q%)Y-hTJ!]RL";-6&&]I12*C?Q)u*/HJRA`SW+jfn?M083iD;HD[oQFsa/l]go$brL.U:%\Z?c[nA91W1R=T7o;+UEaVARF&ABAQ@f`a\-?#aoq9)SoIn#:/-c)C+8EUMQTJ=4%_RlS.]$:Q=oLY)-2RaT+k<\P?2n]R(Cq,&OQY_S8#:S2t5*9bEGVX<tI#'nK'+U%.&N=>Md4tfb%Ai(tlBP$E7WjGF3!:Gh,hkM0Uu+#LG"18K2dAjg)2"5_Hi^7\ChOA@nk"6D=JL>i-iW_P$.A,\``uoDYIge)>_oRb4C'3.?4*(_n3nf"2Q@`s1uh+n:[/TVQ85:8fNYCF_8-VR5c);:%[:m0sYtoCMZ,7g>CR`JA`(UT#g0<H-lugfUtSYZ:_o8lV4Z%>PTgl;-;&e&20YFEL/H]f;8;\i3[WQ9qF8l'B>7D>VkoI-,2FfXm]@*&qQMY'HhUaHKlWUg,9>)K%3p;s1cc?4^C;>F$+]qMIVFA[pG]BG?[i,:,M3f"_Y6abrMU.X_?DRM`-uT'5FX=iD&l6Q!hV/akR'8jOm;l*d1:?(]3](GJY3bZi-N.0fUVs-amokC?uVUJitF02Sg]fPj`=+i/+FdFD0HNs$6?"2&$XC0)cl@";km5*sX%'RVY=:oi'Vi^%@"OWEJU2UlROMGnAc!,S+mG%-K7^pBXshSUM7i:Lf]jGgk>_A,$`bI57AJgbUAB+$YOY^XR-<_<_I(ncf?.3,$3dPP`dN&3+Bn;8nh@:f[hfO+]7Vmk!a);L`hC+i,>h&i1'\oYJenK]>*=_<mW*W4Z\Z=YtIZC@ss>s4)(A`Wm79`THS)iY'iG;+$0(/H:M;Go=IPc'C,_\@1KQH"cU'phTp*"D0AJuj,CARrWI(f"-f1CPY"Z9Y*_#Z\S7dJcIa*'gGd6*Ef`Z=9M7i%.)*?MLc?\Xr2_p%0m^EG8WI+bDQsKsLSOm,X'T7YE0,1t&X+cme$n<(M4J1D%"-fX!V1L^'&-MgM%)&-8D/V[n;fa!gK\n5l,1`n,>M=KsNlGPe/LU\0c2qs9QK...05L]UY\OQ/`L22H=g\>sTNf+2uT*!UEHGMZ1o4Jr59#-[]Wfe6+/3EQsB_k1Jg'=%EN?R+qq~>
+GatU4D/ZI5'`O\2_7-i&6GU72RdSZeXh1.2X6hfHe$Ml6"&<8@0XIHep?Q>m`5c7E?)N(lET"JocT0;Jc!kf7=fu[)en2C1XN-$13TB(&CIanK^1Y&aBPgB-pC#Te[$E-(c7aXkE$H[QL_N&2PgUKLQt6"+iSRsFIor0^(Z0-HIg[ctV&pJd(!jAL0XUc<$d5L?L(S45pgs!0F"jh'e2sTiLKrSpHJ_Cc%6j?O,WRL<_2bg!NMq=KKR@i!7!VVg)OPCjGZ9.*bmSQAi!h,jbc&oLZ&OM%d[ZGqU$V8<GAsh-#N/F5\^mN+42XaLjLHEKcY<&AZR<5)nHJ6oG)#c)=uA:CJ5[b.E/GUmgVZHdJWsb7/Y83j:4E4!Y>Xp">c^im@u3YFg$t2[9>a+q-YgkojV</j-cu_lACJ)dM)TVFG_gS/<i88Vo5#i&<k'FOB[ro#DSb4hJF,[LKu/+:_*!QEU!A6:\.P8V:\K'tFVWD:-B.>2aGaS*F_o:n;#t2Z<LFZXNe;Xp#aFEQh<PZ@0S15iXBEbZl3bnlN]]-rQQ&@O;RgMEkH;T0D/U]NcQ#04CLK)B#'^Wn)J#93iF"[9I-b'G33<nZ)pXUj=$TLeDr.&5BAc`rT^kMG'/N!No)IC1ZT^Fs(:4Bb$d_pCre8!a2TSRbDWD\%28n!4m8aTl?U/]r#/?q?A&Bb"otg2meXp7R.0#-4'f1,8[uG*Z*>("7&;cf%l[/g'm'Agr[.+L]7:WuWb.[j;i;JtNE)_!GQ4bF'D4u\`1W$bkAu'\2<7-PJ2;nco/.=rdGk'n(ZF,5fJK9]#I\[PB.PD-d!eKP2.JXV]6gk[[gB?a;Mf)83qi3P-8$d45p&Zot6;jq0-1m3,hJ#mI,=t-ld<:^M%lDj<C4],jh9hsiqn.53A8mRTlOt9VB[R\IhMI9L8;dS3jh[tYKWTQ;/(&OC2Esq^\R>7<RO\2ida^?mp#8fBmEXA(>7.?>7V!G#[I[M`nd3)8JFds@K0[ZiDY$PIOXIuAklDetBu%Gf:7^j:HA7,6D-:?'ngb'pQf73AL.4JD1K)Y2gm[_!7fm7oO\4NYZ`+.5^INa!G'WVr2A([`Dp*LPnkr9k=M([_C"F0lr/Jo6\F\;ABrs\8mD%dUjuHiHg?@`p)&/;c/iK46?u%H$;KVk:hueO)EY!(nYhR\C)&V9LJ^5XL/-VUR$.KTsY'JAtghb#YW"X@/K'$$F.L7rWG<<'3=5_cXTC1Xg;fMT@ddkE:G32PiQY"q0D*aCK!o:^&6*+F5E0QN;1ksAr1)5hC/(?DFK8_W=1Z4-E7U]jsoPidi$r=(%2m[IEIW"!b!Hrs7>4Bi1C;lBqP[p1ZhK7^`f9A.n+dLlh[HdTcCbm=8?QK9i>MEgJE4:IR"2/q9WMboJdAK*,-lSD=o<pKY(p1;jZJo8"B96YH3[m-!k/<ouWQ_TKB\ENAOs*ful?E1_"`aU9q?"@)(s%R<IfWi(,eWVV.rmf-7I02f8E(DoN^<kq8.oM.-eZl`=0)[)0Q<gtUS),<h8k]Ge7Kh>H*M")PRn9NIhihb`?54G]2"sua,X$X#N3?W=7!9Z0X,"nGjk@+^8(@PjcA*"=Adj"oDo,uP`Xon;B!We(N*uX5l%#>Rf,J]rQ-W+c#_[mD=C`TR([IGc%/R,%"FF-:ZUqNG16!'~>
 endstream
 endobj
 15 0 obj
@@ -179,31 +179,31 @@ endobj
 xref
 0 26
 0000000000 65535 f 
-0000004529 00000 n 
-0000004594 00000 n 
-0000004686 00000 n 
+0000004524 00000 n 
+0000004589 00000 n 
+0000004681 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000000640 00000 n 
 0000000760 00000 n 
 0000000799 00000 n 
-0000004820 00000 n 
+0000004815 00000 n 
 0000000934 00000 n 
-0000004883 00000 n 
+0000004878 00000 n 
 0000001070 00000 n 
-0000004949 00000 n 
+0000004944 00000 n 
 0000001207 00000 n 
-0000002988 00000 n 
-0000005015 00000 n 
-0000003096 00000 n 
-0000003333 00000 n 
-0000003584 00000 n 
-0000003867 00000 n 
-0000003980 00000 n 
-0000004090 00000 n 
-0000004198 00000 n 
-0000004304 00000 n 
-0000004420 00000 n 
+0000002983 00000 n 
+0000005010 00000 n 
+0000003091 00000 n 
+0000003328 00000 n 
+0000003579 00000 n 
+0000003862 00000 n 
+0000003975 00000 n 
+0000004085 00000 n 
+0000004193 00000 n 
+0000004299 00000 n 
+0000004415 00000 n 
 trailer
 <<
 /Size 26
@@ -211,5 +211,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-5066
+5061
 %%EOF

src/docs/src/documentation/content/xdocs/hadoop_archives.xml

@@ -43,7 +43,7 @@
         Note that this is a Map Reduce job that creates the archives. You would need a map reduce cluster
         to run this. The following is an example:</p>
         <p>
-        <code>hadoop -archiveName foo.har /user/hadoop/dir1 /user/hadoop/dir2 /user/zoo/</code>
+        <code>hadoop archive -archiveName foo.har /user/hadoop/dir1 /user/hadoop/dir2 /user/zoo/</code>
         </p><p>
         In the above example /user/hadoop/dir1 and /user/hadoop/dir2 will be archived in the following
         filesystem directory -- /user/zoo/foo.har. The sources are not changed or removed when an archive