You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bu...@apache.org on 2013/07/19 00:46:39 UTC

svn commit: r870045 [6/24] - in /websites/staging/accumulo/trunk/content: ./ 1.4/examples/ 1.4/user_manual/ 1.5/examples/ css/ downloads/ example/ governance/ user_manual_1.3-incubating/ user_manual_1.3-incubating/examples/

Modified: websites/staging/accumulo/trunk/content/1.4/examples/visibility.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/examples/visibility.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/examples/visibility.html Thu Jul 18 22:46:37 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>Apache Accumulo Visibility, Authorizations, and Permissions Example</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -48,30 +48,31 @@
   <h1 id="project">Project</h1>
 <ul>
 <li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
 <li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
 <li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
 </ul>
 <h1 id="documentation">Documentation</h1>
 <ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
 </ul>
 <h1 id="asf-links">ASF links</h1>
 <ul>
@@ -83,41 +84,41 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
     <h1 class="title">Apache Accumulo Visibility, Authorizations, and Permissions Example</h1>
     <h2 id="creating-a-new-user">Creating a new user</h2>
-<div class="codehilite"><pre><span class="n">root</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">createuser</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="k">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;username&#39;</span><span class="p">:</span> <span class="o">********</span>
-<span class="n">Please</span> <span class="n">confirm</span> <span class="k">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;username&#39;</span><span class="p">:</span> <span class="o">********</span>
-<span class="n">root</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">vistest</span>
-<span class="mo">06</span> <span class="mi">10</span><span class="p">:</span><span class="mi">48</span><span class="p">:</span><span class="mi">47</span><span class="p">,</span><span class="mi">931</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">client</span><span class="o">.</span><span class="n">AccumuloSecurityException:</span> <span class="n">Error</span> <span class="n">PERMISSION_DENIED</span> <span class="o">-</span> <span class="n">User</span> <span class="n">does</span> <span class="ow">not</span> <span class="n">have</span> <span class="n">permission</span> <span class="n">to</span> <span class="n">perform</span> <span class="n">this</s
 pan> <span class="n">action</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
-<span class="n">System</span> <span class="n">permissions:</span>
+<div class="codehilite"><pre><span class="n">root</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">createuser</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;username&#39;</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">Please</span> <span class="n">confirm</span> <span class="n">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;username&#39;</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">vistest</span>
+06 10<span class="p">:</span>48<span class="p">:</span>47<span class="p">,</span>931 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">client</span><span class="p">.</span><span class="n">AccumuloSecurityException</span><span class="p">:</span> <span class="n">Error</span> <span class="n">PERMISSION_DENIED</span> <span class="o">-</span> <span class="n">User</span> <span class="n">does</span> <span class="n">not</span> <span class="n">have</span> <span class="n">permission</span> <span class="n">to</span> <span class="n">perform</span> <span class="n">this</span> <span class="n">action</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
+<span class="n">System</span> <span class="n">permissions</span><span class="p">:</span>
 
-<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="o">!</span><span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="o">.</span><span class="n">READ</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span>
+<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span>!<span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="p">.</span><span class="n">READ</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>A user does not by default have permission to create a table.</p>
 <h2 id="granting-permissions-to-a-user">Granting permissions to a user</h2>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root:</span> <span class="o">********</span>
-<span class="n">root</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">grant</span> <span class="o">-</span><span class="n">s</span> <span class="n">System</span><span class="o">.</span><span class="n">CREATE_TABLE</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
-<span class="n">root</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span> 
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">vistest</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
-<span class="n">System</span> <span class="n">permissions:</span> <span class="n">System</span><span class="o">.</span><span class="n">CREATE_TABLE</span>
-
-<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="o">!</span><span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="o">.</span><span class="n">READ</span>
-<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="n">vistest</span><span class="p">):</span> <span class="n">Table</span><span class="o">.</span><span class="n">READ</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">WRITE</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">BULK_IMPORT</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">ALTER_TABLE</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">GRANT</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">DROP_TABLE</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">grant</span> <span class="o">-</span><span class="n">s</span> <span class="n">System</span><span class="p">.</span><span class="n">CREATE_TABLE</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span> 
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">vistest</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
+<span class="n">System</span> <span class="n">permissions</span><span class="p">:</span> <span class="n">System</span><span class="p">.</span><span class="n">CREATE_TABLE</span>
+
+<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span>!<span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="p">.</span><span class="n">READ</span>
+<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="n">vistest</span><span class="p">):</span> <span class="n">Table</span><span class="p">.</span><span class="n">READ</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">WRITE</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">BULK_IMPORT</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">ALTER_TABLE</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">GRANT</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">DROP_TABLE</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
@@ -126,14 +127,14 @@
 tokens.  Authorization tokens are arbitrary strings taken from a restricted 
 ASCII character set.  Parentheses are required to specify order of operations 
 in visibilities.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f1</span> <span class="n">q1</span> <span class="n">v1</span> <span class="o">-</span><span class="n">l</span> <span class="n">A</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f2</span> <span class="n">q2</span> <span class="n">v2</span> <span class="o">-</span><span class="n">l</span> <span class="n">A</span><span class="o">&amp;</span><span class="n">B</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f3</span> <span class="n">q3</span> <span class="n">v3</span> <span class="o">-</span><span class="n">l</span> <span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
-<span class="mo">06</span> <span class="mi">11</span><span class="p">:</span><span class="mi">19</span><span class="p">:</span><span class="mo">01</span><span class="p">,</span><span class="mi">432</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">BadArgumentException:</span> <span class="n">cannot</span> <span class="n">mix</span> <span class="o">|</span> <span class="ow">and</span> <span class="o">&amp;</span> <span class="n">near</span> <span class="nb">index</span> <span class="mi">12</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f1</span> <span class="n">q1</span> <span class="n">v1</span> <span class="o">-</span><span class="n">l</span> <span class="n">A</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f2</span> <span class="n">q2</span> <span class="n">v2</span> <span class="o">-</span><span class="n">l</span> <span class="n">A</span><span class="o">&amp;</span><span class="n">B</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f3</span> <span class="n">q3</span> <span class="n">v3</span> <span class="o">-</span><span class="n">l</span> <span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
+06 11<span class="p">:</span>19<span class="p">:</span>01<span class="p">,</span>432 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">BadArgumentException</span><span class="p">:</span> <span class="n">cannot</span> <span class="n">mix</span> <span class="o">|</span> <span class="n">and</span> <span class="o">&amp;</span> <span class="n">near</span> <span class="n">index</span> 12
 <span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
-            <span class="o">^</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f3</span> <span class="n">q3</span> <span class="n">v3</span> <span class="o">-</span><span class="n">l</span> <span class="p">(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+            ^
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f3</span> <span class="n">q3</span> <span class="n">v3</span> <span class="o">-</span><span class="n">l</span> <span class="p">(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
@@ -142,73 +143,73 @@ in visibilities.</p>
 authorizations and each Accumulo scan has authorizations.  Scan authorizations 
 are only allowed to be a subset of the user's authorizations.  By default, a 
 user's authorizations set is empty.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
-<span class="mo">06</span> <span class="mi">11</span><span class="p">:</span><span class="mi">43</span><span class="p">:</span><span class="mi">14</span><span class="p">,</span><span class="mi">951</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR:</span> <span class="n">java</span><span class="o">.</span><span class="n">lang</span><span class="o">.</span><span class="n">RuntimeException:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">client</span><span class="o">.</span><span class="n">AccumuloSecurityException:</span> <span class="n">Error</span> <span class="n">BAD_AUTHORIZATIONS</span> <span class="o">-</span> <span class="n">The</span> <span class="n">user</span> <span class="n">does</span>
  <span class="ow">not</span> <span class="n">have</span> <span class="n">the</span> <span class="n">specified</span> <span class="n">authorizations</span> <span class="n">assigned</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
+06 11<span class="p">:</span>43<span class="p">:</span>14<span class="p">,</span>951 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR</span><span class="p">:</span> <span class="n">java</span><span class="p">.</span><span class="n">lang</span><span class="p">.</span><span class="n">RuntimeException</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">client</span><span class="p">.</span><span class="n">AccumuloSecurityException</span><span class="p">:</span> <span class="n">Error</span> <span class="n">BAD_AUTHORIZATIONS</span> <span class="o">-</span> <span class="n">The</span> <span class="n">user</span> <span class="n">does</span> <span class="n">not</span> <span class="n">have</s
 pan> <span class="n">the</span> <span class="n">specified</span> <span class="n">authorizations</span> <span class="n">assigned</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <h2 id="setting-authorizations-for-a-user">Setting authorizations for a user</h2>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
-<span class="mo">06</span> <span class="mi">11</span><span class="p">:</span><span class="mi">53</span><span class="p">:</span><span class="mi">42</span><span class="p">,</span><span class="mo">056</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">client</span><span class="o">.</span><span class="n">AccumuloSecurityException:</span> <span class="n">Error</span> <span class="n">PERMISSION_DENIED</span> <span class="o">-</span> <span class="n">User</span> <span class="n">does</span> <span class="ow">not</span> <span class="n">have</span> <span class="n">permission</span> <span class="n">to</span> <span class="n">perform</span> <span class="n">this</s
 pan> <span class="n">action</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
+06 11<span class="p">:</span>53<span class="p">:</span>42<span class="p">,</span>056 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">client</span><span class="p">.</span><span class="n">AccumuloSecurityException</span><span class="p">:</span> <span class="n">Error</span> <span class="n">PERMISSION_DENIED</span> <span class="o">-</span> <span class="n">User</span> <span class="n">does</span> <span class="n">not</span> <span class="n">have</span> <span class="n">permission</span> <span class="n">to</span> <span class="n">perform</span> <span class="n">this</span> <span class="n">action</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>A user cannot set authorizations unless the user has the System.ALTER_USER permission.
 The root user has this permission.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root:</span> <span class="o">********</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
-<span class="n">row</span> <span class="n">f1:q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">row</span> <span class="n">f1:q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
+<span class="n">row</span> <span class="n">f1</span><span class="p">:</span><span class="n">q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">row</span> <span class="n">f1</span><span class="p">:</span><span class="n">q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>The default authorizations for a scan are the user's entire set of authorizations.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root:</span> <span class="o">********</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span><span class="p">,</span><span class="n">B</span><span class="p">,</span><span class="n">broccoli</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">row</span> <span class="n">f1:q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
-<span class="n">row</span> <span class="n">f2:q2</span> <span class="p">[</span><span class="n">A</span><span class="o">&amp;</span><span class="n">B</span><span class="p">]</span>    <span class="n">v2</span>
-<span class="n">row</span> <span class="n">f3:q3</span> <span class="p">[(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span><span class="p">]</span>    <span class="n">v3</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">B</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span><span class="p">,</span><span class="n">B</span><span class="p">,</span><span class="n">broccoli</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">row</span> <span class="n">f1</span><span class="p">:</span><span class="n">q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
+<span class="n">row</span> <span class="n">f2</span><span class="p">:</span><span class="n">q2</span> <span class="p">[</span><span class="n">A</span><span class="o">&amp;</span><span class="n">B</span><span class="p">]</span>    <span class="n">v2</span>
+<span class="n">row</span> <span class="n">f3</span><span class="p">:</span><span class="n">q3</span> <span class="p">[(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span><span class="p">]</span>    <span class="n">v3</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">B</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>If you want, you can limit a user to only be able to insert data which they can read themselves.
 It can be set with the following constraint.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root:</span> <span class="o">******</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">config</span> <span class="o">-</span><span class="n">t</span> <span class="n">vistest</span> <span class="o">-</span><span class="n">s</span> <span class="n">table</span><span class="o">.</span><span class="n">constraint</span><span class="mf">.1</span><span class="o">=</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">security</span><span class="o">.</span><span class="n">VisibilityConstraint</span>    
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f4</span> <span class="n">q4</span> <span class="n">v4</span> <span class="o">-</span><span class="n">l</span> <span class="n">spinach</span>                                                                
-    <span class="n">Constraint</span> <span class="n">Failures:</span>
-        <span class="n">ConstraintViolationSummary</span><span class="p">(</span><span class="n">constrainClass:org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">security</span><span class="o">.</span><span class="n">VisibilityConstraint</span><span class="p">,</span> <span class="n">violationCode:2</span><span class="p">,</span> <span class="n">violationDescription:User</span> <span class="n">does</span> <span class="ow">not</span> <span class="n">have</span> <span class="n">authorization</span> <span class="n">on</span> <span class="n">column</span> <span class="n">visibility</span><span class="p">,</span> <span class="n">numberOfViolatingMutations:1</span><span class="p">)</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f4</span> <span class="n">q4</span> <span class="n">v4</span> <span class="o">-</span><span class="n">l</span> <span class="n">spinach</span><span class="o">|</span><span class="n">broccoli</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">row</span> <span class="n">f1:q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
-<span class="n">row</span> <span class="n">f2:q2</span> <span class="p">[</span><span class="n">A</span><span class="o">&amp;</span><span class="n">B</span><span class="p">]</span>    <span class="n">v2</span>
-<span class="n">row</span> <span class="n">f3:q3</span> <span class="p">[(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span><span class="p">]</span>    <span class="n">v3</span>
-<span class="n">row</span> <span class="n">f4:q4</span> <span class="p">[</span><span class="n">spinach</span><span class="o">|</span><span class="n">broccoli</span><span class="p">]</span>    <span class="n">v4</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root</span><span class="p">:</span> <span class="o">******</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">config</span> <span class="o">-</span><span class="n">t</span> <span class="n">vistest</span> <span class="o">-</span><span class="n">s</span> <span class="n">table</span><span class="p">.</span><span class="n">constraint</span><span class="p">.</span>1<span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">security</span><span class="p">.</span><span class="n">VisibilityConstraint</span>    
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f4</span> <span class="n">q4</span> <span class="n">v4</span> <span class="o">-</span><span class="n">l</span> <span class="n">spinach</span>                                                                
+    <span class="n">Constraint</span> <span class="n">Failures</span><span class="p">:</span>
+        <span class="n">ConstraintViolationSummary</span><span class="p">(</span><span class="n">constrainClass</span><span class="p">:</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">security</span><span class="p">.</span><span class="n">VisibilityConstraint</span><span class="p">,</span> <span class="n">violationCode</span><span class="p">:</span>2<span class="p">,</span> <span class="n">violationDescription</span><span class="p">:</span><span class="n">User</span> <span class="n">does</span> <span class="n">not</span> <span class="n">have</span> <span class="n">authorization</span> <span class="n">on</span> <span class="n">column</span> <span class="n">visibility</span><span class="p">,</span> <span class="n">numberOfViolatingMutations</span><span class="p">:</span>1<span class="p">)</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f4</span> <span class="n">q4</span> <span class="n">v4</span> <span class="o">-</span><span class="n">l</span> <span class="n">spinach</span><span class="o">|</span><span class="n">broccoli</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">row</span> <span class="n">f1</span><span class="p">:</span><span class="n">q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
+<span class="n">row</span> <span class="n">f2</span><span class="p">:</span><span class="n">q2</span> <span class="p">[</span><span class="n">A</span><span class="o">&amp;</span><span class="n">B</span><span class="p">]</span>    <span class="n">v2</span>
+<span class="n">row</span> <span class="n">f3</span><span class="p">:</span><span class="n">q3</span> <span class="p">[(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span><span class="p">]</span>    <span class="n">v3</span>
+<span class="n">row</span> <span class="n">f4</span><span class="p">:</span><span class="n">q4</span> <span class="p">[</span><span class="n">spinach</span><span class="o">|</span><span class="n">broccoli</span><span class="p">]</span>    <span class="n">v4</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
   </div>
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>

Modified: websites/staging/accumulo/trunk/content/1.4/user_manual/Accumulo_Design.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/user_manual/Accumulo_Design.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/user_manual/Accumulo_Design.html Thu Jul 18 22:46:37 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>Apache Accumulo User Manual: Accumulo Design</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -48,30 +48,31 @@
   <h1 id="project">Project</h1>
 <ul>
 <li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
 <li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
 <li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
 </ul>
 <h1 id="documentation">Documentation</h1>
 <ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
 </ul>
 <h1 id="asf-links">ASF links</h1>
 <ul>
@@ -83,13 +84,12 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
     <h1 class="title">Apache Accumulo User Manual: Accumulo Design</h1>
-    <p><strong> Next:</strong> <a href="Accumulo_Shell.html">Accumulo Shell</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Introduction.html">Introduction</a>   <strong> <a href="Contents.html">Contents</a></strong> <br />
-</p>
+    <p><strong> Next:</strong> <a href="Accumulo_Shell.html">Accumulo Shell</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Introduction.html">Introduction</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <p><a id=CHILD_LINKS></a><strong>Subsections</strong></p>
 <ul>
 <li><a href="Accumulo_Design.html#Data_Model">Data Model</a></li>
@@ -141,7 +141,7 @@ http://master-address:50095/monitor. </p
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>

Modified: websites/staging/accumulo/trunk/content/1.4/user_manual/Accumulo_Shell.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/user_manual/Accumulo_Shell.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/user_manual/Accumulo_Shell.html Thu Jul 18 22:46:37 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>Apache Accumulo User Manual: Accumulo Shell</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -48,30 +48,31 @@
   <h1 id="project">Project</h1>
 <ul>
 <li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
 <li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
 <li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
 </ul>
 <h1 id="documentation">Documentation</h1>
 <ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
 </ul>
 <h1 id="asf-links">ASF links</h1>
 <ul>
@@ -83,13 +84,12 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
     <h1 class="title">Apache Accumulo User Manual: Accumulo Shell</h1>
-    <p><strong> Next:</strong> <a href="Writing_Accumulo_Clients.html">Writing Accumulo Clients</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Accumulo_Design.html">Accumulo Design</a>   <strong> <a href="Contents.html">Contents</a></strong> <br />
-</p>
+    <p><strong> Next:</strong> <a href="Writing_Accumulo_Clients.html">Writing Accumulo Clients</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Accumulo_Design.html">Accumulo Design</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <p><a id=CHILD_LINKS></a><strong>Subsections</strong></p>
 <ul>
 <li><a href="Accumulo_Shell.html#Basic_Administration">Basic Administration</a></li>
@@ -100,16 +100,16 @@
 <h2 id="wzxhzdk9wzxhzdk10-accumulo-shell"><a id=Accumulo_Shell></a> Accumulo Shell</h2>
 <p>Accumulo provides a simple shell that can be used to examine the contents and configuration settings of tables, insert/update/delete values, and change configuration settings. </p>
 <p>The shell can be started by the following command: </p>
-<div class="codehilite"><pre><span class="nv">$ACCUMULO_HOME</span><span class="sr">/bin/</span><span class="n">accumulo</span> <span class="n">shell</span> <span class="o">-</span><span class="n">u</span> <span class="p">[</span><span class="n">username</span><span class="p">]</span>
+<div class="codehilite"><pre>$<span class="n">ACCUMULO_HOME</span><span class="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">accumulo</span> <span class="n">shell</span> <span class="o">-</span><span class="n">u</span> <span class="p">[</span><span class="n">username</span><span class="p">]</span>
 </pre></div>
 
 
 <p>The shell will prompt for the corresponding password to the username specified and then display the following prompt: </p>
 <div class="codehilite"><pre><span class="n">Shell</span> <span class="o">-</span> <span class="n">Apache</span> <span class="n">Accumulo</span> <span class="n">Interactive</span> <span class="n">Shell</span>
 <span class="o">-</span>
-<span class="o">-</span> <span class="n">version</span> <span class="mf">1.3</span>
-<span class="o">-</span> <span class="n">instance</span> <span class="n">name:</span> <span class="n">myinstance</span>
-<span class="o">-</span> <span class="n">instance</span> <span class="n">id:</span> <span class="mo">00000000</span><span class="o">-</span><span class="mo">0000</span><span class="o">-</span><span class="mo">0000</span><span class="o">-</span><span class="mo">0000</span><span class="o">-</span><span class="mo">000000000000</span>
+<span class="o">-</span> <span class="n">version</span> 1<span class="p">.</span>3
+<span class="o">-</span> <span class="n">instance</span> <span class="n">name</span><span class="p">:</span> <span class="n">myinstance</span>
+<span class="o">-</span> <span class="n">instance</span> <span class="n">id</span><span class="p">:</span> 00000000<span class="o">-</span>0000<span class="o">-</span>0000<span class="o">-</span>0000<span class="o">-</span>000000000000
 <span class="o">-</span>
 <span class="o">-</span> <span class="n">type</span> <span class="s">&#39;help&#39;</span> <span class="k">for</span> <span class="n">a</span> <span class="n">list</span> <span class="n">of</span> <span class="n">available</span> <span class="n">commands</span>
 <span class="o">-</span>
@@ -118,81 +118,81 @@
 
 <h2 id="wzxhzdk11wzxhzdk12-basic-administration"><a id=Basic_Administration></a> Basic Administration</h2>
 <p>The Accumulo shell can be used to create and delete tables, as well as to configure table and instance specific options. </p>
-<div class="codehilite"><pre><span class="n">root</span><span class="nv">@myinstance</span><span class="o">&gt;</span> <span class="n">tables</span>
-<span class="o">!</span><span class="n">METADATA</span>
+<div class="codehilite"><pre><span class="n">root</span><span class="p">@</span><span class="n">myinstance</span><span class="o">&gt;</span> <span class="n">tables</span>
+<span class="sx">!METADATA</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">mytable</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">mytable</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">tables</span>
-<span class="o">!</span><span class="n">METADATA</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">tables</span>
+<span class="sx">!METADATA</span>
 <span class="n">mytable</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">testtable</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">testtable</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">testtable</span><span class="o">&gt;</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">testtable</span><span class="o">&gt;</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">junk</span><span class="o">&gt;</span> <span class="n">deletetable</span> <span class="n">testtable</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">junk</span><span class="o">&gt;</span> <span class="n">deletetable</span> <span class="n">testtable</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span><span class="o">&gt;</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>The Shell can also be used to insert updates and scan tables. This is useful for inspecting tables. </p>
-<div class="codehilite"><pre><span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">scan</span>
+<div class="codehilite"><pre><span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">scan</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row1</span> <span class="n">colf</span> <span class="n">colq</span> <span class="n">value1</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row1</span> <span class="n">colf</span> <span class="n">colq</span> <span class="n">value1</span>
 <span class="n">insert</span> <span class="n">successful</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">row1</span> <span class="n">colf:colq</span> <span class="o">[]</span> <span class="n">value1</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">row1</span> <span class="n">colf</span><span class="p">:</span><span class="n">colq</span> <span class="p">[]</span> <span class="n">value1</span>
 </pre></div>
 
 
 <p>The value in brackets "[]" would be the visibility labels. Since none were used, this is empty for this row. You can use the "-t" option to scan to see the timestamp for the cell, too. </p>
 <h2 id="wzxhzdk13wzxhzdk14-table-maintenance"><a id=Table_Maintenance></a> Table Maintenance</h2>
 <p>The <strong>compact</strong> command instructs Accumulo to schedule a compaction of the table during which files are consolidated and deleted entries are removed. </p>
-<div class="codehilite"><pre><span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">compact</span> <span class="o">-</span><span class="n">t</span> <span class="n">mytable</span>
-<span class="mo">07</span> <span class="mi">16</span><span class="p">:</span><span class="mi">13</span><span class="p">:</span><span class="mi">53</span><span class="p">,</span><span class="mi">201</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">INFO</span> <span class="p">:</span> <span class="n">Compaction</span> <span class="n">of</span> <span class="n">table</span> <span class="n">mytable</span>
-<span class="n">scheduled</span> <span class="k">for</span> <span class="mi">20100707161353</span><span class="n">EDT</span>
+<div class="codehilite"><pre><span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">compact</span> <span class="o">-</span><span class="n">t</span> <span class="n">mytable</span>
+07 16<span class="p">:</span>13<span class="p">:</span>53<span class="p">,</span>201 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">INFO</span> <span class="p">:</span> <span class="n">Compaction</span> <span class="n">of</span> <span class="n">table</span> <span class="n">mytable</span>
+<span class="n">scheduled</span> <span class="k">for</span> 20100707161353<span class="n">EDT</span>
 </pre></div>
 
 
 <p>The <strong>flush</strong> command instructs Accumulo to write all entries currently in memory for a given table to disk. </p>
-<div class="codehilite"><pre><span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">flush</span> <span class="o">-</span><span class="n">t</span> <span class="n">mytable</span>
-<span class="mo">07</span> <span class="mi">16</span><span class="p">:</span><span class="mi">14</span><span class="p">:</span><span class="mi">19</span><span class="p">,</span><span class="mi">351</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">INFO</span> <span class="p">:</span> <span class="n">Flush</span> <span class="n">of</span> <span class="n">table</span> <span class="n">mytable</span>
-<span class="n">initiated</span><span class="o">...</span>
+<div class="codehilite"><pre><span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">flush</span> <span class="o">-</span><span class="n">t</span> <span class="n">mytable</span>
+07 16<span class="p">:</span>14<span class="p">:</span>19<span class="p">,</span>351 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">INFO</span> <span class="p">:</span> <span class="n">Flush</span> <span class="n">of</span> <span class="n">table</span> <span class="n">mytable</span>
+<span class="n">initiated</span><span class="p">...</span>
 </pre></div>
 
 
 <h2 id="wzxhzdk15wzxhzdk16-user-administration"><a id=User_Administration></a> User Administration</h2>
 <p>The Shell can be used to add, remove, and grant privileges to users. </p>
-<div class="codehilite"><pre><span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">createuser</span> <span class="n">bob</span>
-<span class="n">Enter</span> <span class="k">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;bob&#39;</span><span class="p">:</span> <span class="o">*********</span>
-<span class="n">Please</span> <span class="n">confirm</span> <span class="k">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;bob&#39;</span><span class="p">:</span> <span class="o">*********</span>
+<div class="codehilite"><pre><span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">createuser</span> <span class="n">bob</span>
+<span class="n">Enter</span> <span class="n">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;bob&#39;</span><span class="p">:</span> <span class="o">*********</span>
+<span class="n">Please</span> <span class="n">confirm</span> <span class="n">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;bob&#39;</span><span class="p">:</span> <span class="o">*********</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">authenticate</span> <span class="n">bob</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">authenticate</span> <span class="n">bob</span>
 <span class="n">Enter</span> <span class="n">current</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;bob&#39;</span><span class="p">:</span> <span class="o">*********</span>
 <span class="n">Valid</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">grant</span> <span class="n">System</span><span class="o">.</span><span class="n">CREATE_TABLE</span> <span class="o">-</span><span class="n">s</span> <span class="o">-</span><span class="n">u</span> <span class="n">bob</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">grant</span> <span class="n">System</span><span class="p">.</span><span class="n">CREATE_TABLE</span> <span class="o">-</span><span class="n">s</span> <span class="o">-</span><span class="n">u</span> <span class="n">bob</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">bob</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">bob</span>
 <span class="n">Enter</span> <span class="n">current</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;bob&#39;</span><span class="p">:</span> <span class="o">*********</span>
 
-<span class="n">bob</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
-<span class="n">System</span> <span class="n">permissions:</span> <span class="n">System</span><span class="o">.</span><span class="n">CREATE_TABLE</span>
-<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="o">!</span><span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="o">.</span><span class="n">READ</span>
+<span class="n">bob</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
+<span class="n">System</span> <span class="n">permissions</span><span class="p">:</span> <span class="n">System</span><span class="p">.</span><span class="n">CREATE_TABLE</span>
+<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span>!<span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="p">.</span><span class="n">READ</span>
 <span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="n">mytable</span><span class="p">):</span> <span class="n">NONE</span>
 
-<span class="n">bob</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">bobstable</span>
-<span class="n">bob</span><span class="nv">@myinstance</span> <span class="n">bobstable</span><span class="o">&gt;</span>
+<span class="n">bob</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">bobstable</span>
+<span class="n">bob</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">bobstable</span><span class="o">&gt;</span>
 
-<span class="n">bob</span><span class="nv">@myinstance</span> <span class="n">bobstable</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">bob</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">bobstable</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
 <span class="n">Enter</span> <span class="n">current</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;root&#39;</span><span class="p">:</span> <span class="o">*********</span>
 
-<span class="n">root</span><span class="nv">@myinstance</span> <span class="n">bobstable</span><span class="o">&gt;</span> <span class="n">revoke</span> <span class="n">System</span><span class="o">.</span><span class="n">CREATE_TABLE</span> <span class="o">-</span><span class="n">s</span> <span class="o">-</span><span class="n">u</span> <span class="n">bob</span>
+<span class="n">root</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">bobstable</span><span class="o">&gt;</span> <span class="n">revoke</span> <span class="n">System</span><span class="p">.</span><span class="n">CREATE_TABLE</span> <span class="o">-</span><span class="n">s</span> <span class="o">-</span><span class="n">u</span> <span class="n">bob</span>
 </pre></div>
 
 
@@ -202,7 +202,7 @@
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>

Modified: websites/staging/accumulo/trunk/content/1.4/user_manual/Administration.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/user_manual/Administration.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/user_manual/Administration.html Thu Jul 18 22:46:37 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>Apache Accumulo User Manual: Administration</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -48,30 +48,31 @@
   <h1 id="project">Project</h1>
 <ul>
 <li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
 <li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
 <li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
 </ul>
 <h1 id="documentation">Documentation</h1>
 <ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
 </ul>
 <h1 id="asf-links">ASF links</h1>
 <ul>
@@ -83,13 +84,12 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
     <h1 class="title">Apache Accumulo User Manual: Administration</h1>
-    <p><strong> Next:</strong> <a href="Shell_Commands.html">Shell Commands</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Security.html">Security</a>   <strong> <a href="Contents.html">Contents</a></strong> <br />
-</p>
+    <p><strong> Next:</strong> <a href="Shell_Commands.html">Shell Commands</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Security.html">Security</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <p><a id=CHILD_LINKS></a><strong>Subsections</strong></p>
 <ul>
 <li><a href="Administration.html#Hardware">Hardware</a></li>
@@ -113,7 +113,7 @@
 <p>Accumulo communicates via remote procedure calls over TCP/IP for both passing data and control messages. In addition, Accumulo uses HDFS clients to communicate with HDFS. To achieve good ingest and query performance, sufficient network bandwidth must be available between any two machines. </p>
 <h2 id="wzxhzdk10wzxhzdk11-installation"><a id=Installation></a> Installation</h2>
 <p>Choose a directory for the Accumulo installation. This directory will be referenced by the environment variable $ACCUMULO_HOME. Run the following: </p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">tar</span> <span class="n">xzf</span> <span class="nv">$ACCUMULO_HOME</span><span class="o">/</span><span class="n">accumulo</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span>
+<div class="codehilite"><pre>$ <span class="n">tar</span> <span class="n">xzf</span> $<span class="n">ACCUMULO_HOME</span><span class="o">/</span><span class="n">accumulo</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span>
 </pre></div>
 
 
@@ -193,7 +193,7 @@ $ACCUMULO/logs/. </p>
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>