You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2011/06/21 19:16:24 UTC
svn commit: r1138100 - in /zookeeper/trunk: ./ bin/ docs/
src/docs/src/documentation/content/xdocs/
Author: phunt
Date: Tue Jun 21 17:16:23 2011
New Revision: 1138100
URL: http://svn.apache.org/viewvc?rev=1138100&view=rev
Log:
ZOOKEEPER-1068. Documentation and default config suggest incorrect location for Zookeeper state (Roman Shaposhnik via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/bin/zkEnv.sh
zookeeper/trunk/docs/bookkeeperStarted.html
zookeeper/trunk/docs/bookkeeperStarted.pdf
zookeeper/trunk/docs/zookeeperAdmin.html
zookeeper/trunk/docs/zookeeperAdmin.pdf
zookeeper/trunk/docs/zookeeperInternals.html
zookeeper/trunk/docs/zookeeperInternals.pdf
zookeeper/trunk/docs/zookeeperStarted.html
zookeeper/trunk/docs/zookeeperStarted.pdf
zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperStarted.xml
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Jun 21 17:16:23 2011
@@ -233,6 +233,9 @@ BUGFIXES:
ZOOKEEPER-1087. ForceSync VM arguement not working when set to "no" (Nate Putnam via breed)
+ ZOOKEEPER-1068. Documentation and default config suggest incorrect
+ location for Zookeeper state (Roman Shaposhnik via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-724. Improve junit test integration - log harness information
(phunt via mahadev)
Modified: zookeeper/trunk/bin/zkEnv.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkEnv.sh?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkEnv.sh (original)
+++ zookeeper/trunk/bin/zkEnv.sh Tue Jun 21 17:16:23 2011
@@ -24,12 +24,7 @@
# a sibling of this script's directory
if [ "x$ZOOCFGDIR" = "x" ]
then
- if [ -d "/etc/zookeeper" ]
- then
- ZOOCFGDIR="/etc/zookeeper"
- else
- ZOOCFGDIR="$ZOOBINDIR/../conf"
- fi
+ ZOOCFGDIR="$ZOOBINDIR/../conf"
fi
if [ "x$ZOOCFG" = "x" ]
Modified: zookeeper/trunk/docs/bookkeeperStarted.html
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/bookkeeperStarted.html?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/docs/bookkeeperStarted.html (original)
+++ zookeeper/trunk/docs/bookkeeperStarted.html Tue Jun 21 17:16:23 2011
@@ -273,7 +273,7 @@ document.write("Last Published: " + docu
<p>
<span class="codefrag computeroutput">
java -cp .:./zookeeper-<version>-bookkeeper.jar:./zookeeper-<version>.jar\
- :../log4j/apache-log4j-1.2.15/log4j-1.2.15.jar -Dlog4j.configuration=log4j.properties\
+ :lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.15.jar -Dlog4j.configuration=log4j.properties\
org.apache.bookkeeper.proto.BookieServer 3181 127.0.0.1:2181 /path_to_log_device/\
/path_to_ledger_device/
</span>
Modified: zookeeper/trunk/docs/bookkeeperStarted.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/bookkeeperStarted.pdf?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/docs/bookkeeperStarted.pdf (original)
+++ zookeeper/trunk/docs/bookkeeperStarted.pdf Tue Jun 21 17:16:23 2011
@@ -102,10 +102,10 @@ endobj
>>
endobj
22 0 obj
-<< /Length 2260 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2282 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gasar>Ar7S'Roe[&GjfbL`)>d3nOWnlPaj]TPM2qD&isPU2;3>kYb=6m+:]&2]g[P@cYM(aE.=*NO`@K0&K//oni"92[e6j/u[gI+*CU:m"N/DW#%M\deW&8-/U^U(9%0j2nWkqC9':2Rm].s]0\U"8(tZUI4`CTYFP'le9d2%^CN)<\6]q[>6FVLSb4XoT@]")+Jk7nB$j99q'6G;a6sKk".'Xe1.QBJDXkd,>3Qk`Pk@)+qCtV?W)moNbA5?W'5:\AWmNo-W1#!8d$_Q##[&KK/h4IK>E8,9M,l:phHYBeCR_44`=oOBhX#(P6;I<+W+4ME]Mt[gCROJ!0k#^GH^U4WbV@9DdED;00*LdFYt.;lGSKJt844msPXO82+<FPVS4W%Zg_Us"(bAZ$7lFD[Z;&jr\dQeKHu/WaX+7^4rl:OFLpV4^<(Q._hb15>8QcrYj51Jl$@2/)(44NQAuA&$#TltX:X6;.c8ZZI5dgk\8W<k9Hug9G3hgpqcDMUo_*Uap+Y\"0(ceGQ0h).(j$r";,Ru$]i8"%b2-cDNB9IK`Tk24J[^&&*U\G&>ni\91*"c:-i\Q(M^aQ>!W5\]pR$c(KopifEH,VF]QJX-B^a&mf&d@W5JZ"E0i0uXNp`M"\jI2r046FsDq0SFG(^/d3-ls$d:Al7\?V1h(WeM3ncR.bhLS@,K0e#Ja4Y%`^*b\:R0lK(E0g2?cnJHM0Xb]c<l)5+V%/%n+.%R:R9V:U)QZIP8\1#)]o6a>*`()'i%1Hf[h*,,`npXKNOB`O$g>[QNj&6t>>d/B"7D-l;r,&JgoeKWSQUEAA_86achMFU"La8IDM%;<T9r/d9\UP)]r+JO3cp(5U[W7bs:bD7Meu6&L+`Qj+X6ne2S.s`N>[:,VpFOO^KO!0X\fZZ[NiHWR\Lc5V:V2A"%SXq\X,$d:*tkc\:^+ge"^i3lc3fAa$5*\\i*Bd7/<&#."$/%0;:X>j;5.s$6D)2
.%Yjj+`Tq^qG54:f;TS]'D#.HD/Irf*kol,e-IS]o=!\NS$mGu2L&n&u7)H8a$=3=^d[p'&<JF?ojH_'^NoUZQGj)sJ+Mm.Y)TLAtJIIsm1`lD5,?bPi!U?t`Ku),#d[Tm\/]`T/3Z8`HG.9W8GuGZ6g:Maf+3GA\'jJ`t/JdcSW\*Y=9!DK*i<IG@h!si-,3NnNGqCK-5$H4i`A%ZgF+E=WmpDp$iIc#nc_2q=jN*;lq_KWbnJ%;&Xnej5'&kh>:>g3tAJjSTN"V_iC"L(.AbW=^MjhC#4C/$\L9APSnWD4kSaI2ho4N@O%uu?pYBtn``92f<k=(%-6W`he@j(9KjB-pVS$@bMejG$:]M`,UJ9Zagq\Ip'^g*:k&7BO:]N;$K/"S@%cW@!Z34:>t,P37!/80^>c5fV6fint>\,pN?m5IMfR`e4X--pSoY@lt5Ts(c6!GKTc`Ubuf\tR`W\\tM;bFh`B\f'N?LYtC/L2;7qk?*suj(XEY(JqP379LOJ.Im]G'=b9'U(@S!qpcBN.m%Vd[,0c?d#b@s[j/1PpGN\h0IHdDK3XP^s$50g@4o;rY(MQ0EJ[<.I3S'6e<eLRXXo&h#LaD2Q\F)gpQp;2>'>h#C?B2KM&2&BQ(6/W+IDQ..g-(S9tkIUQ\'\MpE8dQKFOSb7P6*uPP=Hu&kFj2>^,VNmBEZ$lHu!a'kIu.+,!t*DVr;@<182U\PJ[MQUZ?';86Z>0i.VAP&_hG^[l9bj`k>,s%M:D.pmYpQ&WndR;DP2L*JmCPEmNI'`f<>Di7fW7fn6OEj-Ub8#I,T,8rOR5r32B/OOOu[lDB8ikd?/\.p^_*oO$WWVIO/Al0t,\Ek0R4=tS2)BfJ.K>LZ<42!2V6X3A7hheqDP*01?H5dJ9p9DgHI4E6tHH'WQ72hbX/nTo,G-*MWessYI73;cK%`4EE2cM`J_b=Pg$Y/R#dDjjcLO8p(/XkI>8t4A+^6l7X5(V:B2u(
N][(%]tZ[:=p\b`fk@.oJ/0iBJ<,Ej6E'3n]MVp.Kj0e$:278k?UYP4d6k20Ni][RB2F.e!?4QKG-0Gn7CB_3]Wfd>l1K%Vef`oI'*GH2geof;[(1sD`L^;6R^7&")QmsoDN]"?5>h9f`k!YEM44U9DG*"B3%9X`a7`fP5jmB\?;Zn1bM1m:h9C9'%-@NX)>Re<;kr^l8,?"`(D<n@,k!if>GF^r*gpC?I)H4oVs[pmf+L6UH]]GE0<S]XM,?0aZ1007rI>4W6:)>]E6s#kZO$N~>
+Gasar>Ar7S'Roe[&GjfbL`)>d3nOWnlPaj]TPM2qD&isPU2;3>kYb=6m+:]&2]g[P@cYM&aE.=*3?OOPp#>OjjA;JYc?cg9SaD"i0)SRZjhb3bH\?^=ZS%euhGEd6ZXeVjIriMs-Ejk(iO2<g_...@Zl>%Jf/f7fK'D8FO5P]97A^?2H#cq%92P
VfZ_0NT;;8Xh+:k#c_V>]IM&'`(BW],,;q]LdGI?\'_\M:6Bjb>!GrZ-l:3*^$_tM;=-WEIs/[u7$6cl(l$Ob#@),,?2?4%)h`r#c(Bk.V5!qI#P=P7%E!+%aJAP^X+8JY-itc/,O,c[7RN6!q2/d6I:clk@r(si#YLlIuTNIR]<Em\I8r-YW@01!QGPlfOa>k5,?V?9eQe$,#ED1s=*+4'4rMpVG5%)Q\%^bkjUGP=)c_11];qUfPk*m,jLhYk>_!MKK0^_FJ,s5tlNkSt8pT<5/R_N)i?3'SOY/]Jk;:(rKh'l%\cYrss[Y9:9\NrdGF%XUH,/Sq_Q$h4$#^e3a2PA-',%?)qOPh'a.Bj4G4@8+WMdm0'Y0<@H?uh12=/[#fSh>uG=/NgD[O[@goV?@UBEVB!NhMj"XY2;O!c<J])ct^]b=CDHcZ/'MBC3O3YI_=HBZ[e2o/9[]9<U?sM:FPO_5%us1Tj4fMZ6crMXc7i'2eagV_.nZJ@\H)b0kf5OZs\M^k5>qKfD?SYGO?afl>2cHAA7_6amQ]:<53HgHr]mR/#\JE^_V\"(/Zp\bod1%P%=q,oRfuM6q2!Da&ZZWX&Z39NOZ3G?G_$s*gC&o-Kb3S6lTQl\4!fpQQ]3lW0@0oDsf^:TQKVjti"Ijh'pdJ\1q/hmTiV:-\Adck+%g"opJi1/-[6)"ngS+rWbM4(R,i0\<T'BMA(4AJ'J8KO1p$h4bBaRaQAi:R^++7XP58^L[6s:\gimEYPG/o5)V3\7L939M;-2?RP]8:!'H(7eURd,MnLYRACEB!OrNM/S]jO*sc,S6hJa(3fOtmd?l\%SKZ0e'?P5cj77iG)#hU/=b8@@!DaG+bqCs>RL6A51BM(3Va[b+9dg(`TWh/Qc7b+E:pLbWGG8uTUuYUShhK*>Hn8?S^.[MTIE&AuRl#Lm\sO'>NOR'[NTV:80BP7`FV12R_I;re'4qG972UB,juI>?4&#Op[V0
^A/).-Iou11Cp'IrUhV]U`d:1+7B@!fCgA(3b_!70dj0kppN'`+Y:%6XiOu<E9a/!D=J5(`^]\\PrS,Y=Wj/(mab^n/nqiFTZ_VfkV!=,E:A\1o3&R5]2Apj?Feo(/iCqU@-N#Jk!gRe:>2^2*Q:d7br.,q]RM'"l=/c_ZZfQ3][`mJ2Ka(3@&D%&Eph7h(LAX>i7J?Gpe#2Ug<SCe'*#9No/fK[K*]B]M<`@>&`=[;WnF59q_Xnr7o&,MIC5Mq>mEu8(u^[b^<:j8oe&Tk,#GlQ.TY0f&o^mh$IG5MlA"=`+~>
endstream
endobj
23 0 obj
@@ -351,51 +351,51 @@ endobj
xref
0 46
0000000000 65535 f
-0000009974 00000 n
-0000010053 00000 n
-0000010145 00000 n
+0000009996 00000 n
+0000010075 00000 n
+0000010167 00000 n
0000000015 00000 n
0000000071 00000 n
0000000813 00000 n
0000000933 00000 n
0000001000 00000 n
-0000010279 00000 n
+0000010301 00000 n
0000001135 00000 n
-0000010342 00000 n
+0000010364 00000 n
0000001272 00000 n
-0000010408 00000 n
+0000010430 00000 n
0000001409 00000 n
-0000010474 00000 n
+0000010496 00000 n
0000001546 00000 n
-0000010539 00000 n
+0000010561 00000 n
0000001682 00000 n
-0000010605 00000 n
+0000010627 00000 n
0000001819 00000 n
-0000010669 00000 n
+0000010691 00000 n
0000001955 00000 n
-0000004308 00000 n
-0000004431 00000 n
-0000004472 00000 n
-0000004650 00000 n
-0000004835 00000 n
-0000005035 00000 n
-0000006910 00000 n
-0000007018 00000 n
-0000007623 00000 n
-0000010735 00000 n
-0000007731 00000 n
-0000008157 00000 n
-0000008342 00000 n
-0000008506 00000 n
-0000008712 00000 n
-0000008934 00000 n
-0000009168 00000 n
-0000009312 00000 n
-0000009420 00000 n
-0000009530 00000 n
-0000009643 00000 n
-0000009759 00000 n
-0000009865 00000 n
+0000004330 00000 n
+0000004453 00000 n
+0000004494 00000 n
+0000004672 00000 n
+0000004857 00000 n
+0000005057 00000 n
+0000006932 00000 n
+0000007040 00000 n
+0000007645 00000 n
+0000010757 00000 n
+0000007753 00000 n
+0000008179 00000 n
+0000008364 00000 n
+0000008528 00000 n
+0000008734 00000 n
+0000008956 00000 n
+0000009190 00000 n
+0000009334 00000 n
+0000009442 00000 n
+0000009552 00000 n
+0000009665 00000 n
+0000009781 00000 n
+0000009887 00000 n
trailer
<<
/Size 46
@@ -403,5 +403,5 @@ trailer
/Info 4 0 R
>>
startxref
-10786
+10808
%%EOF
Modified: zookeeper/trunk/docs/zookeeperAdmin.html
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperAdmin.html?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/docs/zookeeperAdmin.html (original)
+++ zookeeper/trunk/docs/zookeeperAdmin.html Tue Jun 21 17:16:23 2011
@@ -487,7 +487,7 @@ document.write("Last Published: " + docu
<pre class="code">
tickTime=2000
-dataDir=/var/zookeeper/
+dataDir=/var/lib/zookeeper/
clientPort=2181
initLimit=5
syncLimit=2
@@ -528,7 +528,7 @@ server.3=zoo3:2888:3888</pre>
<p>
-<span class="codefrag computeroutput">$ java -cp zookeeper.jar:lib/log4j-1.2.15.jar:conf \
+<span class="codefrag computeroutput">$ java -cp zookeeper.jar:lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.15.jar:conf \
org.apache.zookeeper.server.quorum.QuorumPeerMain zoo.cfg
</span>
</p>
@@ -565,7 +565,7 @@ server.3=zoo3:2888:3888</pre>
<p>
-<span class="codefrag computeroutput">$ java -cp zookeeper.jar:src/java/lib/log4j-1.2.15.jar:conf:src/java/lib/jline-0.9.94.jar \
+<span class="codefrag computeroutput">$ java -cp zookeeper.jar:lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.15.jar:conf:src/java/lib/jline-0.9.94.jar \
org.apache.zookeeper.ZooKeeperMain -server 127.0.0.1:2181</span>
</p>
@@ -888,7 +888,7 @@ server.3=zoo3:2888:3888</pre>
in the unlikely event a recent log has become corrupted). This
can be run as a cron job on the ZooKeeper server machines to
clean up the logs daily.</p>
-<pre class="code"> java -cp zookeeper.jar:log4j.jar:conf org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count></pre>
+<pre class="code"> java -cp zookeeper.jar:lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.15.jar:conf org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count></pre>
<a name="N10244"></a><a name="Debug+Log+Cleanup+%28log4j%29"></a>
<h4>Debug Log Cleanup (log4j)</h4>
<p>See the section on <a href="#sc_logging">logging</a> in this document. It is
Modified: zookeeper/trunk/docs/zookeeperAdmin.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperAdmin.pdf?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperInternals.html
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperInternals.html?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/docs/zookeeperInternals.html (original)
+++ zookeeper/trunk/docs/zookeeperInternals.html Tue Jun 21 17:16:23 2011
@@ -241,7 +241,7 @@ document.write("Last Published: " + docu
<a href="#sc_rightLevel">Logging at the Right Level</a>
</li>
<li>
-<a href="#sc_log4jIdioms">Use of Standard log4j Idioms</a>
+<a href="#sc_slf4jIdioms">Use of Standard slf4j Idioms</a>
</li>
</ul>
</li>
@@ -677,28 +677,33 @@ hierarchy of groups.
<h2 class="h3">Logging</h2>
<div class="section">
<p>
-ZooKeeper uses
-<a href="http://logging.apache.org/log4j">log4j</a>
-version 1.2 as its logging infrastructure. For information on configuring log4j for
+Zookeeper uses
+<a href="http://www.slf4j.org/index.html">slf4j</a> as an abstraction layer for logging.
+<a href="http://logging.apache.org/log4j">log4j</a> in version 1.2 is chosen as the final logging implementation for now.
+For better embedding support, it is planned in the future to leave the decision of choosing the final logging implementation to the end user.
+Therefore, always use the slf4j api to write log statements in the code, but configure log4j for how to log at runtime.
+Note that slf4j has no FATAL level, former messages at FATAL level have been moved to ERROR level.
+For information on configuring log4j for
ZooKeeper, see the <a href="zookeeperAdmin.html#sc_logging">Logging</a> section
of the <a href="zookeeperAdmin.html">ZooKeeper Administrator's Guide.</a>
+
</p>
-<a name="N1015C"></a><a name="sc_developerGuidelines"></a>
+<a name="N10160"></a><a name="sc_developerGuidelines"></a>
<h3 class="h4">Developer Guidelines</h3>
-<p>Please follow these guidelines when submitting code. Patch reviewers will look for the following:</p>
-<a name="N10164"></a><a name="sc_rightLevel"></a>
+<p>Please follow the
+<a href="http://www.slf4j.org/manual.html">slf4j manual</a> when creating log statements within code.
+Also read the
+<a href="http://www.slf4j.org/faq.html#logging_performance">FAQ on performance</a>
+, when creating log statements. Patch reviewers will look for the following:</p>
+<a name="N10170"></a><a name="sc_rightLevel"></a>
<h4>Logging at the Right Level</h4>
<p>
-There are <a href="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/Level.html#FATAL">6 levels of logging in log4j</a>.
+There are several levels of logging in slf4j.
It's important to pick the right one. In order of higher to lower severity:</p>
<ol>
<li>
-<p> FATAL level designates very severe error events that will presumably lead the application to abort</p>
-</li>
-
-<li>
<p>ERROR level designates error events that might still allow the application to continue running.</p>
</li>
@@ -711,7 +716,7 @@ It's important to pick the right one. In
</li>
<li>
-<p>EBUG Level designates fine-grained informational events that are most useful to debug an application.</p>
+<p>DEBUG Level designates fine-grained informational events that are most useful to debug an application.</p>
</li>
<li>
@@ -722,34 +727,29 @@ It's important to pick the right one. In
<p>
ZooKeeper is typically run in production such that log messages of INFO level
severity and higher (more severe) are output to the log.</p>
-<a name="N1018F"></a><a name="sc_log4jIdioms"></a>
-<h4>Use of Standard log4j Idioms</h4>
+<a name="N10193"></a><a name="sc_slf4jIdioms"></a>
+<h4>Use of Standard slf4j Idioms</h4>
<p>
<em>Static Message Logging</em>
</p>
<pre class="code">
LOG.debug("process completed successfully!");
</pre>
-<p>However when creating a message from a number of components (string
-concatenation), the log call should be wrapped with a "isXEnabled()" call. this
-eliminates the string concatenation overhead when debug level logging is not enabled.
+<p>
+However when creating parameterized messages are required, use formatting anchors.
</p>
<pre class="code">
-if (LOG.isDebugEnabled()) {
- LOG.debug("got " + count + " messages in " + time + " minutes");
-}
+LOG.debug("got {} messages in {} minutes",new Object[]{count,time});
</pre>
<p>
<em>Naming</em>
</p>
<p>
-Loggers should be named after the class in which they are used. (See the
-<a href="http://logging.apache.org/log4j/1.2/faq.html#2.4">log4j faq</a>
-for reasons why this is a good idea.)
+Loggers should be named after the class in which they are used.
</p>
<pre class="code">
public class Foo {
- private static final Logger LOG = Logger.getLogger(Foo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Foo.class);
....
public Foo() {
LOG.info("constructing Foo");
Modified: zookeeper/trunk/docs/zookeeperInternals.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperInternals.pdf?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperStarted.html
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperStarted.html?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/docs/zookeeperStarted.html (original)
+++ zookeeper/trunk/docs/zookeeperStarted.html Tue Jun 21 17:16:23 2011
@@ -276,7 +276,7 @@ document.write("Last Published: " + docu
create it in <strong>conf/zoo.cfg</strong>:</p>
<pre class="code">
tickTime=2000
-dataDir=/var/zookeeper
+dataDir=/var/lib/zookeeper
clientPort=2181
</pre>
<p>This file can be called anything, but for the sake of this
@@ -535,7 +535,7 @@ numChildren = 0
few differences. Here is an example:</p>
<pre class="code">
tickTime=2000
-dataDir=/var/zookeeper
+dataDir=/var/lib/zookeeper
clientPort=2181
initLimit=5
syncLimit=2
Modified: zookeeper/trunk/docs/zookeeperStarted.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperStarted.pdf?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml (original)
+++ zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Tue Jun 21 17:16:23 2011
@@ -164,7 +164,7 @@
<programlisting>
tickTime=2000
-dataDir=/var/zookeeper/
+dataDir=/var/lib/zookeeper/
clientPort=2181
initLimit=5
syncLimit=2
Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperStarted.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperStarted.xml?rev=1138100&r1=1138099&r2=1138100&view=diff
==============================================================================
--- zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperStarted.xml (original)
+++ zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperStarted.xml Tue Jun 21 17:16:23 2011
@@ -89,7 +89,7 @@
<programlisting>
tickTime=2000
-dataDir=/var/zookeeper
+dataDir=/var/lib/zookeeper
clientPort=2181
</programlisting>
@@ -346,7 +346,7 @@ numChildren = 0
<programlisting>
tickTime=2000
-dataDir=/var/zookeeper
+dataDir=/var/lib/zookeeper
clientPort=2181
initLimit=5
syncLimit=2