Author: buildbot
Date: Thu Oct 11 19:42:06 2012
New Revision: 834829
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Oct 11 19:42:06 2012
@@ -1 +1 @@
-1397254
+1397259
Modified:
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
==============================================================================
---
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
(original)
+++
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
Thu Oct 11 19:42:06 2012
@@ -102,8 +102,8 @@
</ol>
<h1 id="shutdown-services">Shutdown services</h1>
<p>Shutdown the httpd and vcld services</p>
-<div class="codehilite"><pre> <span class="n">service</span> <span
class="n">httpd</span> <span class="n">stop</span> <span class="ow">or</span>
<span class="sr">/etc/i</span><span class="n">nit</span><span
class="o">.</span><span class="n">d</span><span class="o">/</span><span
class="n">httpd</span> <span class="n">stop</span>
- <span class="n">service</span> <span class="n">vcld</span> <span
class="n">stop</span> <span class="ow">or</span> <span
class="sr">/etc/i</span><span class="n">nit</span><span class="o">.</span><span
class="n">d</span><span class="o">/</span><span class="n">vcld</span> <span
class="n">stop</span>
+<div class="codehilite"><pre> <span class="n">service</span> <span
class="n">httpd</span> <span class="n">stop</span> <span class="ow">or</span>
<span class="sr">/etc/i</span><span class="n">nit</span><span
class="o">.</span><span class="n">d</span><span class="o">/</span><span
class="n">httpd</span> <span class="n">stop</span>
+ <span class="n">service</span> <span class="n">vcld</span> <span
class="n">stop</span> <span class="ow">or</span> <span
class="sr">/etc/i</span><span class="n">nit</span><span class="o">.</span><span
class="n">d</span><span class="o">/</span><span class="n">vcld</span> <span
class="n">stop</span>
</pre></div>
@@ -123,10 +123,7 @@
<h1 id="update-web-code">Update web code</h1>
-<div class="codehilite"><pre><span class="n">This</span> <span
class="n">step</span> <span class="n">we</span> <span class="n">will</span>
<span class="n">move</span> <span class="n">the</span> <span
class="mf">2.2.1</span> <span class="n">web</span> <span
class="n">directory</span> <span class="n">out</span> <span class="n">of</span>
<span class="n">the</span> <span class="n">way</span><span class="p">,</span>
<span class="n">so</span> <span class="n">we</span> <span class="n">can</span>
<span class="n">copy</span> <span class="n">in</span> <span
class="n">the</span> <span class="k">new</span> <span class="n">web</span>
<span class="n">code</span> <span class="n">base</span><span class="o">.</span>
<span class="n">After</span> <span class="n">copying</span> <span
class="n">in</span> <span class="n">the</span> <span class="k">new</span> <span
class="n">code</span><span class="p">,</span> <span class="n">we</span> <span
class="n">will</span> <span class="n">migrate</span> <sp
an class="n">your</span> <span class="n">configuration</span> <span
class="n">changes</span><span class="o">.</span> <span class="n">These</span>
<span class="n">instructions</span> <span class="n">assume</span> <span
class="n">that</span> <span class="n">you</span> <span
class="n">installed</span> <span class="n">the</span> <span
class="n">vcl</span> <span class="n">web</span> <span class="n">code</span>
<span class="n">at</span> <span class="sr">/var/</span><span
class="n">www</span><span class="sr">/html/</span><span
class="n">vcl</span><span class="o">.</span> <span class="n">If</span> <span
class="n">you</span> <span class="n">installed</span> <span class="n">it</span>
<span class="n">elsewhere</span><span class="p">,</span> <span
class="n">replace</span> <span class="sr">/var/</span><span
class="n">www</span><span class="sr">/html/</span><span class="n">vcl</span>
<span class="n">with</span> <span class="n">your</span> <span
class="n">vcl</span> <span class="n">web</sp
an> <span class="n">root</span><span class="o">.</span>
-</pre></div>
-
-
+<p>This step we will move the 2.2.1 web directory out of the way, so we can
copy in the new web code base. After copying in the new code, we will migrate
your configuration changes. These instructions assume that you installed the
vcl web code at /var/www/html/vcl. If you installed it elsewhere, replace
/var/www/html/vcl with your vcl web root.</p>
<ol>
<li>
<p>move your old code out of the way</p>
