svn commit: r835131 - in /websites/staging/vcl/trunk/content: ./ docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html

[buildbot]

Author: buildbot
Date: Mon Oct 15 16:18:28 2012
New Revision: 835131

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 Mon Oct 15 16:18:28 2012
@@ -1 +1 @@
-1398340
+1398362

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
 Mon Oct 15 16:18:28 2012
@@ -140,9 +140,11 @@
 </li>
 <li>
 <p><strong>Copy your 2.2.1 config files</strong></p>
-<p>:::BashLexer
-cd ~/vcl_2.2.1_web/.ht-inc
-cp conf.php secrets.php pubkey.pem keys.pem /var/www/html/vcl/.ht-inc</p>
+<div class="codehilite"><pre><span class="n">cd</span> <span 
class="o">~</span><span class="sr">/vcl_2.2.1_web/</span><span 
class="o">.</span><span class="n">ht</span><span class="o">-</span><span 
class="n">inc</span>
+<span class="n">cp</span> <span class="n">conf</span><span 
class="o">.</span><span class="n">php</span> <span 
class="n">secrets</span><span class="o">.</span><span class="n">php</span> 
<span class="n">pubkey</span><span class="o">.</span><span class="n">pem</span> 
<span class="nb">keys</span><span class="o">.</span><span class="n">pem</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">ht</span><span class="o">-</span><span 
class="n">inc</span>
+</pre></div>
+
+
 </li>
 <li>
 <p><strong>Make the maintenance directory writable by the web server 
user</strong>. Normally this is the apache user,  if using a different user 
change below cmd accordingly.</p>
@@ -184,7 +186,7 @@ cp conf.php secrets.php pubkey.pem keys.
     <span class="nv">$addUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
     <span class="nv">$updateUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
 
-    <span class="p">:</span><span class="n">NEW</span>
+    <span class="n">NEW</span>
     <span class="nv">$addUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return NULL;&#39;</span><span class="p">);</span>
     <span class="nv">$updateUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return NULL;&#39;</span><span class="p">);</span>
 </pre></div>