accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r870045 [7/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/
Date Thu, 18 Jul 2013 22:46:39 GMT
Modified: websites/staging/accumulo/trunk/content/1.4/user_manual/Analytics.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/user_manual/Analytics.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/user_manual/Analytics.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: Analytics</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: Analytics</h1>
-    <p><strong> Next:</strong> <a href="Security.html">Security</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="High_Speed_Ingest.html">High-Speed Ingest</a>   <strong> <a href="Contents.html">Contents</a></strong> <br />
-</p>
+    <p><strong> Next:</strong> <a href="Security.html">Security</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="High_Speed_Ingest.html">High-Speed Ingest</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <p><a id=CHILD_LINKS></a><strong>Subsections</strong></p>
 <ul>
 <li><a href="Analytics.html#MapReduce">MapReduce</a></li>
@@ -108,9 +108,9 @@
 </ul>
 <h3 id="wzxhzdk14wzxhzdk15-mapper-and-reducer-classes"><a id=Mapper_and_Reducer_classes></a> Mapper and Reducer classes</h3>
 <p>To read from an Accumulo table create a Mapper with the following class parameterization and be sure to configure the AccumuloInputFormat. </p>
-<div class="codehilite"><pre><span class="n">class</span> <span class="n">MyMapper</span> <span class="n">extends</span> <span class="n">Mapper</span><span class="sr">&lt;Key,Value,WritableComparable,Writable&gt;</span> <span class="p">{</span>
-    <span class="n">public</span> <span class="n">void</span> <span class="nb">map</span><span class="p">(</span><span class="n">Key</span> <span class="n">k</span><span class="p">,</span> <span class="n">Value</span> <span class="n">v</span><span class="p">,</span> <span class="n">Context</span> <span class="n">c</span><span class="p">)</span> <span class="p">{</span>
-        <span class="sr">//</span> <span class="n">transform</span> <span class="n">key</span> <span class="ow">and</span> <span class="n">value</span> <span class="n">data</span> <span class="n">here</span>
+<div class="codehilite"><pre><span class="n">class</span> <span class="n">MyMapper</span> <span class="n">extends</span> <span class="n">Mapper</span><span class="o">&lt;</span><span class="n">Key</span><span class="p">,</span><span class="n">Value</span><span class="p">,</span><span class="n">WritableComparable</span><span class="p">,</span><span class="n">Writable</span><span class="o">&gt;</span> <span class="p">{</span>
+    <span class="n">public</span> <span class="n">void</span> <span class="n">map</span><span class="p">(</span><span class="n">Key</span> <span class="n">k</span><span class="p">,</span> <span class="n">Value</span> <span class="n">v</span><span class="p">,</span> <span class="n">Context</span> <span class="n">c</span><span class="p">)</span> <span class="p">{</span>
+        <span class="o">//</span> <span class="n">transform</span> <span class="n">key</span> <span class="n">and</span> <span class="n">value</span> <span class="n">data</span> <span class="n">here</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -119,13 +119,13 @@
 <p>To write to an Accumulo table, create a Reducer with the following class parameterization and be sure to configure the AccumuloOutputFormat. The key emitted from the Reducer identifies the table to which the mutation is sent. This allows a single Reducer to write to more than one table if desired. A default table can be configured using the AccumuloOutputFormat, in which case the output table name does not have to be passed to the Context object within the Reducer. </p>
 <div class="codehilite"><pre><span class="n">class</span> <span class="n">MyReducer</span> <span class="n">extends</span> <span class="n">Reducer</span><span class="o">&lt;</span><span class="n">WritableComparable</span><span class="p">,</span> <span class="n">Writable</span><span class="p">,</span> <span class="n">Text</span><span class="p">,</span> <span class="n">Mutation</span><span class="o">&gt;</span> <span class="p">{</span>
 
-    <span class="n">public</span> <span class="n">void</span> <span class="n">reduce</span><span class="p">(</span><span class="n">WritableComparable</span> <span class="n">key</span><span class="p">,</span> <span class="n">Iterable</span><span class="sr">&lt;Text&gt;</span> <span class="nb">values</span><span class="p">,</span> <span class="n">Context</span> <span class="n">c</span><span class="p">)</span> <span class="p">{</span>
+    <span class="n">public</span> <span class="n">void</span> <span class="n">reduce</span><span class="p">(</span><span class="n">WritableComparable</span> <span class="n">key</span><span class="p">,</span> <span class="n">Iterable</span><span class="o">&lt;</span><span class="n">Text</span><span class="o">&gt;</span> <span class="n">values</span><span class="p">,</span> <span class="n">Context</span> <span class="n">c</span><span class="p">)</span> <span class="p">{</span>
 
         <span class="n">Mutation</span> <span class="n">m</span><span class="p">;</span>
 
-        <span class="sr">//</span> <span class="n">create</span> <span class="n">the</span> <span class="n">mutation</span> <span class="n">based</span> <span class="n">on</span> <span class="n">input</span> <span class="n">key</span> <span class="ow">and</span> <span class="n">value</span>
+        <span class="o">//</span> <span class="n">create</span> <span class="n">the</span> <span class="n">mutation</span> <span class="n">based</span> <span class="n">on</span> <span class="n">input</span> <span class="n">key</span> <span class="n">and</span> <span class="n">value</span>
 
-        <span class="n">c</span><span class="o">.</span><span class="nb">write</span><span class="p">(</span><span class="k">new</span> <span class="n">Text</span><span class="p">(</span><span class="s">&quot;output-table&quot;</span><span class="p">),</span> <span class="n">m</span><span class="p">);</span>
+        <span class="n">c</span><span class="p">.</span><span class="n">write</span><span class="p">(</span><span class="n">new</span> <span class="n">Text</span><span class="p">(</span>&quot;<span class="n">output</span><span class="o">-</span><span class="n">table</span>&quot;<span class="p">),</span> <span class="n">m</span><span class="p">);</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -133,56 +133,56 @@
 
 <p>The Text object passed as the output should contain the name of the table to which this mutation should be applied. The Text can be null in which case the mutation will be applied to the default table name specified in the AccumuloOutputFormat options. </p>
 <h3 id="wzxhzdk16wzxhzdk17-accumuloinputformat-options"><a id=AccumuloInputFormat_options></a> AccumuloInputFormat options</h3>
-<div class="codehilite"><pre><span class="n">Job</span> <span class="n">job</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Job</span><span class="p">(</span><span class="n">getConf</span><span class="p">());</span>
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="n">setInputInfo</span><span class="p">(</span><span class="n">job</span><span class="p">,</span>
-        <span class="s">&quot;user&quot;</span><span class="p">,</span>
-        <span class="s">&quot;passwd&quot;</span><span class="o">.</span><span class="n">getBytes</span><span class="p">(),</span>
-        <span class="s">&quot;table&quot;</span><span class="p">,</span>
-        <span class="k">new</span> <span class="n">Authorizations</span><span class="p">());</span>
+<div class="codehilite"><pre><span class="n">Job</span> <span class="n">job</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Job</span><span class="p">(</span><span class="n">getConf</span><span class="p">());</span>
+<span class="n">AccumuloInputFormat</span><span class="p">.</span><span class="n">setInputInfo</span><span class="p">(</span><span class="n">job</span><span class="p">,</span>
+        &quot;<span class="n">user</span>&quot;<span class="p">,</span>
+        &quot;<span class="n">passwd</span>&quot;<span class="p">.</span><span class="n">getBytes</span><span class="p">(),</span>
+        &quot;<span class="n">table</span>&quot;<span class="p">,</span>
+        <span class="n">new</span> <span class="n">Authorizations</span><span class="p">());</span>
 
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="n">setZooKeeperInstance</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="s">&quot;myinstance&quot;</span><span class="p">,</span>
-        <span class="s">&quot;zooserver-one,zooserver-two&quot;</span><span class="p">);</span>
+<span class="n">AccumuloInputFormat</span><span class="p">.</span><span class="n">setZooKeeperInstance</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> &quot;<span class="n">myinstance</span>&quot;<span class="p">,</span>
+        &quot;<span class="n">zooserver</span><span class="o">-</span><span class="n">one</span><span class="p">,</span><span class="n">zooserver</span><span class="o">-</span><span class="n">two</span>&quot;<span class="p">);</span>
 </pre></div>
 
 
 <p><strong>Optional settings:</strong></p>
 <p>To restrict Accumulo to a set of row ranges: </p>
-<div class="codehilite"><pre><span class="n">ArrayList</span><span class="sr">&lt;Range&gt;</span> <span class="n">ranges</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="sr">&lt;Range&gt;</span><span class="p">();</span>
-<span class="sr">//</span> <span class="n">populate</span> <span class="n">array</span> <span class="n">list</span> <span class="n">of</span> <span class="n">row</span> <span class="n">ranges</span> <span class="o">...</span>
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="n">setRanges</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="n">ranges</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;</span> <span class="n">ranges</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Range</span><span class="o">&gt;</span><span class="p">();</span>
+<span class="o">//</span> <span class="n">populate</span> <span class="n">array</span> <span class="n">list</span> <span class="n">of</span> <span class="n">row</span> <span class="n">ranges</span> <span class="p">...</span>
+<span class="n">AccumuloInputFormat</span><span class="p">.</span><span class="n">setRanges</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="n">ranges</span><span class="p">);</span>
 </pre></div>
 
 
 <p>To restrict accumulo to a list of columns: </p>
-<div class="codehilite"><pre><span class="n">ArrayList</span><span class="sr">&lt;Pair&lt;Text,Text&gt;</span><span class="o">&gt;</span> <span class="n">columns</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="sr">&lt;Pair&lt;Text,Text&gt;</span><span class="o">&gt;</span><span class="p">();</span>
-<span class="sr">//</span> <span class="n">populate</span> <span class="n">list</span> <span class="n">of</span> <span class="n">columns</span>
-<span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="n">fetchColumns</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="n">columns</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Pair</span><span class="o">&lt;</span><span class="n">Text</span><span class="p">,</span><span class="n">Text</span><span class="o">&gt;&gt;</span> <span class="n">columns</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">Pair</span><span class="o">&lt;</span><span class="n">Text</span><span class="p">,</span><span class="n">Text</span><span class="o">&gt;&gt;</span><span class="p">();</span>
+<span class="o">//</span> <span class="n">populate</span> <span class="n">list</span> <span class="n">of</span> <span class="n">columns</span>
+<span class="n">AccumuloInputFormat</span><span class="p">.</span><span class="n">fetchColumns</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="n">columns</span><span class="p">);</span>
 </pre></div>
 
 
 <p>To use a regular expression to match row IDs: </p>
-<div class="codehilite"><pre><span class="n">AccumuloInputFormat</span><span class="o">.</span><span class="n">setRegex</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="n">RegexType</span><span class="o">.</span><span class="n">ROW</span><span class="p">,</span> <span class="s">&quot;^.*&quot;</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">AccumuloInputFormat</span><span class="p">.</span><span class="n">setRegex</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="n">RegexType</span><span class="p">.</span><span class="n">ROW</span><span class="p">,</span> &quot;^<span class="o">.*</span>&quot;<span class="p">);</span>
 </pre></div>
 
 
 <h3 id="wzxhzdk18wzxhzdk19-accumulooutputformat-options"><a id=AccumuloOutputFormat_options></a> AccumuloOutputFormat options</h3>
-<div class="codehilite"><pre><span class="n">boolean</span> <span class="n">createTables</span> <span class="o">=</span> <span class="n">true</span><span class="p">;</span>
-<span class="n">String</span> <span class="n">defaultTable</span> <span class="o">=</span> <span class="s">&quot;mytable&quot;</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">boolean</span> <span class="n">createTables</span> <span class="p">=</span> <span class="n">true</span><span class="p">;</span>
+<span class="n">String</span> <span class="n">defaultTable</span> <span class="p">=</span> &quot;<span class="n">mytable</span>&quot;<span class="p">;</span>
 
-<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="n">setOutputInfo</span><span class="p">(</span><span class="n">job</span><span class="p">,</span>
-        <span class="s">&quot;user&quot;</span><span class="p">,</span>
-        <span class="s">&quot;passwd&quot;</span><span class="o">.</span><span class="n">getBytes</span><span class="p">(),</span>
+<span class="n">AccumuloOutputFormat</span><span class="p">.</span><span class="n">setOutputInfo</span><span class="p">(</span><span class="n">job</span><span class="p">,</span>
+        &quot;<span class="n">user</span>&quot;<span class="p">,</span>
+        &quot;<span class="n">passwd</span>&quot;<span class="p">.</span><span class="n">getBytes</span><span class="p">(),</span>
         <span class="n">createTables</span><span class="p">,</span>
         <span class="n">defaultTable</span><span class="p">);</span>
 
-<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="n">setZooKeeperInstance</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="s">&quot;myinstance&quot;</span><span class="p">,</span>
-        <span class="s">&quot;zooserver-one,zooserver-two&quot;</span><span class="p">);</span>
+<span class="n">AccumuloOutputFormat</span><span class="p">.</span><span class="n">setZooKeeperInstance</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> &quot;<span class="n">myinstance</span>&quot;<span class="p">,</span>
+        &quot;<span class="n">zooserver</span><span class="o">-</span><span class="n">one</span><span class="p">,</span><span class="n">zooserver</span><span class="o">-</span><span class="n">two</span>&quot;<span class="p">);</span>
 </pre></div>
 
 
 <p><strong>Optional Settings:</strong></p>
-<div class="codehilite"><pre><span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="n">setMaxLatency</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="mi">300</span><span class="p">);</span> <span class="sr">//</span> <span class="n">milliseconds</span>
-<span class="n">AccumuloOutputFormat</span><span class="o">.</span><span class="n">setMaxMutationBufferSize</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> <span class="mi">5000000</span><span class="p">);</span> <span class="sr">//</span> <span class="n">bytes</span>
+<div class="codehilite"><pre><span class="n">AccumuloOutputFormat</span><span class="p">.</span><span class="n">setMaxLatency</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> 300<span class="p">);</span> <span class="o">//</span> <span class="n">milliseconds</span>
+<span class="n">AccumuloOutputFormat</span><span class="p">.</span><span class="n">setMaxMutationBufferSize</span><span class="p">(</span><span class="n">job</span><span class="p">,</span> 5000000<span class="p">);</span> <span class="o">//</span> <span class="n">bytes</span>
 </pre></div>
 
 
@@ -203,7 +203,7 @@ accumulo/docs/examples/README.mapred </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/Contents.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/user_manual/Contents.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/user_manual/Contents.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: Contents</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: Contents</h1>
-    <p><strong> Next:</strong> <a href="Introduction.html">Introduction</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <br />
-</p>
+    <p><strong> Next:</strong> <a href="Introduction.html">Introduction</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a>   </p>
 <h3 id="wzxhzdk0wzxhzdk1-contents"><a id=Contents></a> Contents</h3>
 <ul>
 <li><a href="Introduction.html">Introduction</a></li>
@@ -274,7 +274,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/High_Speed_Ingest.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/user_manual/High_Speed_Ingest.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/user_manual/High_Speed_Ingest.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: High Speed Ingest</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: High Speed Ingest</h1>
-    <p><strong> Next:</strong> <a href="Analytics.html">Analytics</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Table_Design.html">Table Design</a>   <strong> <a href="Contents.html">Contents</a></strong> <br />
-</p>
+    <p><strong> Next:</strong> <a href="Analytics.html">Analytics</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Table_Design.html">Table 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="High_Speed_Ingest.html#Pre-Splitting_New_Tables">Pre-Splitting New Tables</a></li>
@@ -104,7 +104,7 @@
 <h2 id="wzxhzdk7wzxhzdk8-pre-splitting-new-tables"><a id=Pre-Splitting_New_Tables></a> Pre-Splitting New Tables</h2>
 <p>New tables consist of a single tablet by default. As mutations are applied, the table grows and splits into multiple tablets which are balanced by the Master across TabletServers. This implies that the aggregate ingest rate will be limited to fewer servers than are available within the cluster until the table has reached the point where there are tablets on every TabletServer. </p>
 <p>Pre-splitting a table ensures that there are as many tablets as desired available before ingest begins to take advantage of all the parallelism possible with the cluster hardware. Tables can be split anytime by using the shell: </p>
-<div class="codehilite"><pre><span class="n">user</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">addsplits</span> <span class="o">-</span><span class="n">sf</span> <span class="o">/</span><span class="n">local_splitfile</span> <span class="o">-</span><span class="n">t</span> <span class="n">mytable</span>
+<div class="codehilite"><pre><span class="n">user</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">addsplits</span> <span class="o">-</span><span class="n">sf</span> <span class="o">/</span><span class="n">local_splitfile</span> <span class="o">-</span><span class="n">t</span> <span class="n">mytable</span>
 </pre></div>
 
 
@@ -115,11 +115,11 @@
 <h2 id="wzxhzdk11wzxhzdk12-bulk-ingest"><a id=Bulk_Ingest></a> Bulk Ingest</h2>
 <p>Accumulo supports the ability to import files produced by an external process such as MapReduce into an existing table. In some cases it may be faster to load data this way rather than via ingesting through clients using BatchWriters. This allows a large number of machines to format data the way Accumulo expects. The new files can then simply be introduced to Accumulo via a shell command. </p>
 <p>To configure MapReduce to format data in preparation for bulk loading, the job should be set to use a range partitioner instead of the default hash partitioner. The range partitioner uses the split points of the Accumulo table that will receive the data. The split points can be obtained from the shell and used by the MapReduce RangePartitioner. Note that this is only useful if the existing table is already split into multiple tablets. </p>
-<div class="codehilite"><pre><span class="n">user</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">getsplits</span>
+<div class="codehilite"><pre><span class="n">user</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">getsplits</span>
 <span class="n">aa</span>
 <span class="n">ab</span>
 <span class="n">ac</span>
-<span class="o">...</span>
+<span class="p">...</span>
 <span class="n">zx</span>
 <span class="n">zy</span>
 <span class="n">zz</span>
@@ -127,7 +127,7 @@
 
 
 <p>Run the MapReduce job, using the AccumuloFileOutputFormat to create the files to be introduced to Accumulo. Once this is complete, the files can be added to Accumulo via the shell: </p>
-<div class="codehilite"><pre><span class="n">user</span><span class="nv">@myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">importdirectory</span> <span class="sr">/files_dir /</span><span class="n">failures</span>
+<div class="codehilite"><pre><span class="n">user</span><span class="p">@</span><span class="n">myinstance</span> <span class="n">mytable</span><span class="o">&gt;</span> <span class="n">importdirectory</span> <span class="o">/</span><span class="n">files_dir</span> <span class="o">/</span><span class="n">failures</span>
 </pre></div>
 
 
@@ -147,7 +147,7 @@ accumulo/docs/examples/README.mapred </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/Introduction.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/user_manual/Introduction.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/user_manual/Introduction.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: Introduction</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: Introduction</h1>
-    <p><strong> Next:</strong> <a href="Accumulo_Design.html">Accumulo Design</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Contents.html">Contents</a>   <strong> <a href="Contents.html">Contents</a></strong> <br />
-</p>
+    <p><strong> Next:</strong> <a href="Accumulo_Design.html">Accumulo Design</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Contents.html">Contents</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <h2 id="wzxhzdk0wzxhzdk1-introduction"><a id=Introduction></a> Introduction</h2>
 <p>Apache Accumulo is a highly scalable structured store based on Google's BigTable. Accumulo is written in Java and operates over the Hadoop Distributed File System (HDFS), which is part of the popular Apache Hadoop project. Accumulo supports efficient storage and retrieval of structured data, including queries for ranges, and provides support for using Accumulo tables as input and output for MapReduce jobs. </p>
 <p>Accumulo features automatic load-balancing and partitioning, data compression and fine-grained security labels. </p>
@@ -98,7 +98,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/Security.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.4/user_manual/Security.html (original)
+++ websites/staging/accumulo/trunk/content/1.4/user_manual/Security.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: Security</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: Security</h1>
-    <p><strong> Next:</strong> <a href="Administration.html">Administration</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Analytics.html">Analytics</a>   <strong> <a href="Contents.html">Contents</a></strong> <br />
-</p>
+    <p><strong> Next:</strong> <a href="Administration.html">Administration</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.4</a> <strong> Previous:</strong> <a href="Analytics.html">Analytics</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <p><a id=CHILD_LINKS></a><strong>Subsections</strong></p>
 <ul>
 <li><a href="Security.html#Security_Label_Expressions">Security Label Expressions</a></li>
@@ -104,16 +104,16 @@
 <p>Accumulo extends the BigTable data model to implement a security mechanism known as cell-level security. Every key-value pair has its own security label, stored under the column visibility element of the key, which is used to determine whether a given user meets the security requirements to read the value. This enables data of various security levels to be stored within the same row, and users of varying degrees of access to query the same table, while preserving data confidentiality. </p>
 <h2 id="wzxhzdk9wzxhzdk10-security-label-expressions"><a id=Security_Label_Expressions></a> Security Label Expressions</h2>
 <p>When mutations are applied, users can specify a security label for each value. This is done as the Mutation is created by passing a ColumnVisibility object to the put() method: </p>
-<div class="codehilite"><pre><span class="n">Text</span> <span class="n">rowID</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Text</span><span class="p">(</span><span class="s">&quot;row1&quot;</span><span class="p">);</span>
-<span class="n">Text</span> <span class="n">colFam</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Text</span><span class="p">(</span><span class="s">&quot;myColFam&quot;</span><span class="p">);</span>
-<span class="n">Text</span> <span class="n">colQual</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Text</span><span class="p">(</span><span class="s">&quot;myColQual&quot;</span><span class="p">);</span>
-<span class="n">ColumnVisibility</span> <span class="n">colVis</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ColumnVisibility</span><span class="p">(</span><span class="s">&quot;public&quot;</span><span class="p">);</span>
-<span class="n">long</span> <span class="n">timestamp</span> <span class="o">=</span> <span class="n">System</span><span class="o">.</span><span class="n">currentTimeMillis</span><span class="p">();</span>
+<div class="codehilite"><pre><span class="n">Text</span> <span class="n">rowID</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Text</span><span class="p">(</span>&quot;<span class="n">row1</span>&quot;<span class="p">);</span>
+<span class="n">Text</span> <span class="n">colFam</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Text</span><span class="p">(</span>&quot;<span class="n">myColFam</span>&quot;<span class="p">);</span>
+<span class="n">Text</span> <span class="n">colQual</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Text</span><span class="p">(</span>&quot;<span class="n">myColQual</span>&quot;<span class="p">);</span>
+<span class="n">ColumnVisibility</span> <span class="n">colVis</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ColumnVisibility</span><span class="p">(</span>&quot;<span class="n">public</span>&quot;<span class="p">);</span>
+<span class="n">long</span> <span class="n">timestamp</span> <span class="p">=</span> <span class="n">System</span><span class="p">.</span><span class="n">currentTimeMillis</span><span class="p">();</span>
 
-<span class="n">Value</span> <span class="n">value</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Value</span><span class="p">(</span><span class="s">&quot;myValue&quot;</span><span class="p">);</span>
+<span class="n">Value</span> <span class="n">value</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Value</span><span class="p">(</span>&quot;<span class="n">myValue</span>&quot;<span class="p">);</span>
 
-<span class="n">Mutation</span> <span class="n">mutation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Mutation</span><span class="p">(</span><span class="n">rowID</span><span class="p">);</span>
-<span class="n">mutation</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="n">colFam</span><span class="p">,</span> <span class="n">colQual</span><span class="p">,</span> <span class="n">colVis</span><span class="p">,</span> <span class="n">timestamp</span><span class="p">,</span> <span class="n">value</span><span class="p">);</span>
+<span class="n">Mutation</span> <span class="n">mutation</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Mutation</span><span class="p">(</span><span class="n">rowID</span><span class="p">);</span>
+<span class="n">mutation</span><span class="p">.</span><span class="n">put</span><span class="p">(</span><span class="n">colFam</span><span class="p">,</span> <span class="n">colQual</span><span class="p">,</span> <span class="n">colVis</span><span class="p">,</span> <span class="n">timestamp</span><span class="p">,</span> <span class="n">value</span><span class="p">);</span>
 </pre></div>
 
 
@@ -122,22 +122,22 @@
 <p>For example, suppose within our organization we want to label our data values with security labels defined in terms of user roles. We might have tokens such as: </p>
 <div class="codehilite"><pre><span class="n">admin</span>
 <span class="n">audit</span>
-<span class="nb">system</span>
+<span class="n">system</span>
 </pre></div>
 
 
 <p>These can be specified alone or combined using logical operators: </p>
-<div class="codehilite"><pre><span class="sr">//</span> <span class="n">Users</span> <span class="n">must</span> <span class="n">have</span> <span class="n">admin</span> <span class="n">privileges:</span>
+<div class="codehilite"><pre><span class="c1">// Users must have admin privileges:</span>
 <span class="n">admin</span>
 
-<span class="sr">//</span> <span class="n">Users</span> <span class="n">must</span> <span class="n">have</span> <span class="n">admin</span> <span class="ow">and</span> <span class="n">audit</span> <span class="n">privileges</span>
+<span class="c1">// Users must have admin and audit privileges</span>
 <span class="n">admin</span><span class="o">&amp;</span><span class="n">audit</span>
 
-<span class="sr">//</span> <span class="n">Users</span> <span class="n">with</span> <span class="n">either</span> <span class="n">admin</span> <span class="ow">or</span> <span class="n">audit</span> <span class="n">privileges</span>
+<span class="c1">// Users with either admin or audit privileges</span>
 <span class="n">admin</span><span class="o">|</span><span class="n">audit</span>
 
-<span class="sr">//</span> <span class="n">Users</span> <span class="n">must</span> <span class="n">have</span> <span class="n">audit</span> <span class="ow">and</span> <span class="n">one</span> <span class="ow">or</span> <span class="n">both</span> <span class="n">of</span> <span class="n">admin</span> <span class="ow">or</span> <span class="nb">system</span>
-<span class="p">(</span><span class="n">admin</span><span class="o">|</span><span class="nb">system</span><span class="p">)</span><span class="o">&amp;</span><span class="n">audit</span>
+<span class="c1">// Users must have audit and one or both of admin or system</span>
+<span class="p">(</span><span class="n">admin</span><span class="o">|</span><span class="n">system</span><span class="p">)</span><span class="o">&amp;</span><span class="n">audit</span>
 </pre></div>
 
 
@@ -145,10 +145,10 @@
 <h2 id="wzxhzdk13wzxhzdk14-authorization"><a id=Authorization></a> Authorization</h2>
 <p>When clients attempt to read data from Accumulo, any security labels present are examined against the set of authorizations passed by the client code when the Scanner or BatchScanner are created. If the authorizations are determined to be insufficient to satisfy the security label, the value is suppressed from the set of results sent back to the client. </p>
 <p>Authorizations are specified as a comma-separated list of tokens the user possesses: </p>
-<div class="codehilite"><pre><span class="sr">//</span> <span class="n">user</span> <span class="n">possess</span> <span class="n">both</span> <span class="n">admin</span> <span class="ow">and</span> <span class="nb">system</span> <span class="n">level</span> <span class="n">access</span>
+<div class="codehilite"><pre><span class="c1">// user possess both admin and system level access</span>
 <span class="n">Authorization</span> <span class="n">auths</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Authorization</span><span class="p">(</span><span class="s">&quot;admin&quot;</span><span class="p">,</span><span class="s">&quot;system&quot;</span><span class="p">);</span>
 
-<span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">connector</span><span class="o">.</span><span class="n">createScanner</span><span class="p">(</span><span class="s">&quot;table&quot;</span><span class="p">,</span> <span class="n">auths</span><span class="p">);</span>
+<span class="n">Scanner</span> <span class="n">s</span> <span class="o">=</span> <span class="n">connector</span><span class="p">.</span><span class="n">createScanner</span><span class="p">(</span><span class="s">&quot;table&quot;</span><span class="p">,</span> <span class="n">auths</span><span class="p">);</span>
 </pre></div>
 
 
@@ -156,7 +156,7 @@
 <p>Each accumulo user has a set of associated security labels. To manipulate these in the shell use the setuaths and getauths commands. These may also be modified using the java security operations API. </p>
 <p>When a user creates a scanner a set of Authorizations is passed. If the authorizations passed to the scanner are not a subset of the users authorizations, then an exception will be thrown. </p>
 <p>To prevent users from writing data they can not read, add the visibility constraint to a table. Use the -evc option in the createtable shell command to enable this constraint. For existing tables use the following shell command to enable the visibility constraint. Ensure the constraint number does not conflict with any existing constraints. </p>
-<div class="codehilite"><pre><span class="n">config</span> <span class="o">-</span><span class="n">t</span> <span class="n">table</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>
+<div class="codehilite"><pre><span class="n">config</span> <span class="o">-</span><span class="n">t</span> <span class="n">table</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>
 </pre></div>
 
 
@@ -174,7 +174,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>



Mime
View raw message