You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/07/05 07:20:13 UTC

[06/11] hbase git commit: HBASE-20831 Copy master doc into branch-2.1 and edit to make it suit 2.1.0

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/hbasecon2016-stacked.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/hbasecon2016-stacked.png b/src/main/site/resources/images/hbasecon2016-stacked.png
deleted file mode 100644
index 4ff181e..0000000
Binary files a/src/main/site/resources/images/hbasecon2016-stacked.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/hbasecon2017.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/hbasecon2017.png b/src/main/site/resources/images/hbasecon2017.png
deleted file mode 100644
index 4b25f89..0000000
Binary files a/src/main/site/resources/images/hbasecon2017.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/hbaseconasia2017.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/hbaseconasia2017.png b/src/main/site/resources/images/hbaseconasia2017.png
deleted file mode 100644
index 8548870..0000000
Binary files a/src/main/site/resources/images/hbaseconasia2017.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/hfile.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/hfile.png b/src/main/site/resources/images/hfile.png
deleted file mode 100644
index 5762970..0000000
Binary files a/src/main/site/resources/images/hfile.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/hfilev2.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/hfilev2.png b/src/main/site/resources/images/hfilev2.png
deleted file mode 100644
index 54cc0cf..0000000
Binary files a/src/main/site/resources/images/hfilev2.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/jumping-orca_rotated.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_rotated.png b/src/main/site/resources/images/jumping-orca_rotated.png
deleted file mode 100644
index 4c2c72e..0000000
Binary files a/src/main/site/resources/images/jumping-orca_rotated.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/jumping-orca_rotated.xcf
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_rotated.xcf b/src/main/site/resources/images/jumping-orca_rotated.xcf
deleted file mode 100644
index 01be6ff..0000000
Binary files a/src/main/site/resources/images/jumping-orca_rotated.xcf and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/jumping-orca_rotated_12percent.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_rotated_12percent.png b/src/main/site/resources/images/jumping-orca_rotated_12percent.png
deleted file mode 100644
index 1942f9a..0000000
Binary files a/src/main/site/resources/images/jumping-orca_rotated_12percent.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/jumping-orca_rotated_25percent.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_rotated_25percent.png b/src/main/site/resources/images/jumping-orca_rotated_25percent.png
deleted file mode 100644
index 219c657..0000000
Binary files a/src/main/site/resources/images/jumping-orca_rotated_25percent.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/jumping-orca_transparent_rotated.xcf
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_transparent_rotated.xcf b/src/main/site/resources/images/jumping-orca_transparent_rotated.xcf
deleted file mode 100644
index be9e3d9..0000000
Binary files a/src/main/site/resources/images/jumping-orca_transparent_rotated.xcf and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/region_split_process.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/region_split_process.png b/src/main/site/resources/images/region_split_process.png
deleted file mode 100644
index 2717617..0000000
Binary files a/src/main/site/resources/images/region_split_process.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/region_states.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/region_states.png b/src/main/site/resources/images/region_states.png
deleted file mode 100644
index ba69e97..0000000
Binary files a/src/main/site/resources/images/region_states.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/replication_overview.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/replication_overview.png b/src/main/site/resources/images/replication_overview.png
deleted file mode 100644
index 47d7b4c..0000000
Binary files a/src/main/site/resources/images/replication_overview.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/images/timeline_consistency.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/timeline_consistency.png b/src/main/site/resources/images/timeline_consistency.png
deleted file mode 100644
index 94c47e0..0000000
Binary files a/src/main/site/resources/images/timeline_consistency.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/1.5-HBASE/maven-fluido-skin-1.5-HBASE.jar
----------------------------------------------------------------------
diff --git a/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/1.5-HBASE/maven-fluido-skin-1.5-HBASE.jar b/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/1.5-HBASE/maven-fluido-skin-1.5-HBASE.jar
deleted file mode 100644
index 5b93209..0000000
Binary files a/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/1.5-HBASE/maven-fluido-skin-1.5-HBASE.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/1.5-HBASE/maven-fluido-skin-1.5-HBASE.pom
----------------------------------------------------------------------
diff --git a/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/1.5-HBASE/maven-fluido-skin-1.5-HBASE.pom b/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/1.5-HBASE/maven-fluido-skin-1.5-HBASE.pom
deleted file mode 100644
index d12092b..0000000
--- a/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/1.5-HBASE/maven-fluido-skin-1.5-HBASE.pom
+++ /dev/null
@@ -1,718 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-skins</artifactId>
-    <version>10</version>
-    <relativePath>../maven-skins/pom.xml</relativePath>
-  </parent>
-
-  <artifactId>maven-fluido-skin</artifactId>
-  <version>1.5-HBASE</version>
-
-  <name>Apache Maven Fluido Skin</name>
-  <description>The Apache Maven Fluido Skin is an Apache Maven site skin
-    built on top of Twitter's bootstrap.</description>
-  <inceptionYear>2011</inceptionYear>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-fluido-skin/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-fluido-skin/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/</url>
-  </scm>
-  <issueManagement>
-    <system>jira</system>
-    <url>https://issues.apache.org/jira/browse/MSKINS/component/12326474</url>
-  </issueManagement>
-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
-    </site>
-  </distributionManagement>
-
-  <contributors>
-    <!-- in alphabetical order -->
-    <contributor>
-      <name>Bruno P. Kinoshita</name>
-      <email>brunodepaulak AT yahoo DOT com DOT br</email>
-    </contributor>
-    <contributor>
-      <name>Carlos Villaronga</name>
-      <email>cvillaronga AT gmail DOT com</email>
-    </contributor>
-    <contributor>
-      <name>Christian Grobmeier</name>
-      <email>grobmeier AT apache DOT org</email>
-    </contributor>
-    <contributor>
-      <name>Conny Kreyssel</name>
-      <email>dev AT kreyssel DOT org</email>
-    </contributor>
-    <contributor>
-      <name>Michael Koch</name>
-      <email>tensberg AT gmx DOT net</email>
-    </contributor>
-    <contributor>
-      <name>Emmanuel Hugonnet</name>
-      <email>emmanuel DOT hugonnet AT gmail DOT com</email>
-    </contributor>
-    <contributor>
-      <name>Ivan Habunek</name>
-      <email>ihabunek AT apache DOT org</email>
-    </contributor>
-    <contributor>
-      <name>Eric Barboni</name>
-    </contributor>
-    <contributor>
-      <name>Michael Osipov</name>
-      <email>michaelo AT apache DOT org</email>
-    </contributor>
-  </contributors>
-
-  <properties>
-    <bootstrap.version>2.3.2</bootstrap.version>
-    <jquery.version>1.11.2</jquery.version>
-  </properties>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>NOTICE</include>
-          <include>LICENSE</include>
-        </includes>
-      </resource>
-
-      <!-- exclude css and js since will include the minified version -->
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <excludes>
-          <exclude>css/**</exclude>
-          <exclude>js/**</exclude>
-        </excludes>
-        <filtering>true</filtering> <!-- add skin-info -->
-      </resource>
-
-      <!-- include the print.css -->
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <includes>
-          <include>css/print.css</include>
-        </includes>
-      </resource>
-
-      <!-- include minified only -->
-      <resource>
-        <directory>${project.build.directory}/${project.build.finalName}</directory>
-        <includes>
-          <include>css/apache-maven-fluido-${project.version}.min.css</include>
-          <include>js/apache-maven-fluido-${project.version}.min.js</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes combine.children="append">
-              <exclude>src/main/resources/fonts/glyphicons-halflings-regular.svg</exclude>
-              <exclude>src/main/resources/js/prettify.js</exclude>
-              <exclude>src/main/resources/js/jquery-*.js</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <dependencies><!-- TODO remove when upgrading to version 2.8: see MSHARED-325 / MRESOURCES-192 -->
-          <dependency>
-              <groupId>org.apache.maven.shared</groupId>
-              <artifactId>maven-filtering</artifactId>
-              <version>1.3</version>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <delimiters>
-            <delimiter>@</delimiter>
-          </delimiters>
-          <useDefaultDelimiters>false</useDefaultDelimiters>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.samaxes.maven</groupId>
-        <artifactId>maven-minify-plugin</artifactId>
-        <version>1.3.5</version>
-        <executions>
-          <execution>
-            <id>default-minify</id>
-            <phase>generate-resources</phase>
-            <configuration>
-              <webappSourceDir>${basedir}/src/main/resources</webappSourceDir>
-              <cssSourceDir>css</cssSourceDir>
-              <cssSourceFiles>
-                <cssSourceFile>bootstrap-${bootstrap.version}.css</cssSourceFile>
-                <cssSourceFile>maven-base.css</cssSourceFile>
-                <cssSourceFile>maven-theme.css</cssSourceFile>
-                <cssSourceFile>prettify.css</cssSourceFile>
-              </cssSourceFiles>
-              <cssFinalFile>apache-maven-fluido-${project.version}.css</cssFinalFile>
-              <jsSourceDir>js</jsSourceDir>
-              <jsSourceFiles>
-                <jsSourceFile>jquery-${jquery.version}.js</jsSourceFile>
-                <jsSourceFile>bootstrap-${bootstrap.version}.js</jsSourceFile>
-                <jsSourceFile>prettify.js</jsSourceFile>
-                <jsSourceFile>fluido.js</jsSourceFile>
-              </jsSourceFiles>
-              <jsFinalFile>apache-maven-fluido-${project.version}.js</jsFinalFile>
-            </configuration>
-            <goals>
-              <goal>minify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>run-its</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <configuration>
-              <debug>true</debug>
-              <projectsDirectory>src/it</projectsDirectory>
-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-              <preBuildHookScript>setup</preBuildHookScript>
-              <postBuildHookScript>verify</postBuildHookScript>
-              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-              <settingsFile>src/it/settings.xml</settingsFile>
-              <pomIncludes>
-                <pomInclude>*/pom.xml</pomInclude>
-              </pomIncludes>
-              <goals>
-                <goal>site</goal>
-              </goals>
-            </configuration>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>reporting</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-sidebar</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/sidebar/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/sidebar/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-topbar</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/topbar/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/topbar/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-topbar-inverse</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/topbar-inverse/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/topbar-inverse/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-10</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-10/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-10/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-13</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-13/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-13/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-14</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-14/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-14/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-14_sitesearch</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-14_sitesearch/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-14_sitesearch/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-15</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-15/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-15/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-16</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-16/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-16/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-17</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-17/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-17/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-21</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-21/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-21/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-22</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-22/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-22/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-22_default</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-22_default/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-22_default/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-22_topbar</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-22_topbar/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-22_topbar/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-23</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-23/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-23/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-24</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-24/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-24/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-24_topbar</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-24_topbar/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-24_topbar/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-25</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-25/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-25/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-28</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-28/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-28/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-31</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-31/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-31/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-33</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-33/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-33/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-33_topbar</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-33_topbar/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-33_topbar/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-34</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-34/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-34/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-34_topbar</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-34_topbar/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-34_topbar/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-41</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-41/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-41/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-72</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-72/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-72/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-75</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-75/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-75/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-76</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-76/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-76/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-76_topbar</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-76_topbar/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-76_topbar/</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-mskins-85</id>
-                <phase>site</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}/it/mskins-85/target/site/</directory>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/mskins-85/</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <reporting>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.8</version>
-          </plugin>
-        </plugins>
-      </reporting>
-    </profile>
-  </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/maven-metadata-local.xml b/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/maven-metadata-local.xml
deleted file mode 100644
index 65791e8..0000000
--- a/src/main/site/resources/repo/org/apache/maven/skins/maven-fluido-skin/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.apache.maven.skins</groupId>
-  <artifactId>maven-fluido-skin</artifactId>
-  <versioning>
-    <release>1.5-HBASE</release>
-    <versions>
-      <version>1.5-HBASE</version>
-    </versions>
-    <lastUpdated>20151111033340</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/site.xml
----------------------------------------------------------------------
diff --git a/src/main/site/site.xml b/src/main/site/site.xml
deleted file mode 100644
index f036702..0000000
--- a/src/main/site/site.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.5-HBASE</version>
-  </skin>
-  <custom>
-    <fluidoSkin>
-      <topBarEnabled>true</topBarEnabled>
-      <sideBarEnabled>false</sideBarEnabled>
-      <googleSearch>
-        <!-- The ID of the Google custom search engine to use.
-             This one searches hbase.apache.org, issues.apache.org/browse/HBASE-*,
-             and user and dev mailing list archives. -->
-        <customSearch>000385458301414556862:sq1bb0xugjg</customSearch>
-      </googleSearch>
-      <sourceLineNumbersEnabled>false</sourceLineNumbersEnabled>
-      <skipGenerationDate>true</skipGenerationDate>
-      <breadcrumbDivider>»</breadcrumbDivider>
-    </fluidoSkin>
-  </custom>
-  <bannerLeft>
-    <name />
-    <src />
-    <href />
-    <!--
-    <name/>
-    <height>0</height>
-    <width>0</width>
--->
-  </bannerLeft>
-  <bannerRight>
-    <name>Apache HBase</name>
-    <src>images/hbase_logo_with_orca_large.png</src>
-    <href>http://hbase.apache.org/</href>
-  </bannerRight>
-  <publishDate position="bottom"/>
-  <version position="none"/>
-  <body>
-    <head>
-      <meta name="viewport" content="width=device-width, initial-scale=1.0"></meta>
-      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap-responsive.min.css"/>
-      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css"/>
-      <link rel="stylesheet" href="css/site.css"/>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"></script>
-    </head>
-    <menu name="Apache HBase Project">
-      <item name="Overview" href="index.html"/>
-      <item name="License" href="license.html"/>
-      <item name="Downloads" href="http://www.apache.org/dyn/closer.cgi/hbase/"/>
-      <item name="Release Notes" href="https://issues.apache.org/jira/browse/HBASE?report=com.atlassian.jira.plugin.system.project:changelog-panel#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel" />
-      <item name="Code Of Conduct" href="coc.html"/>
-      <item name="Blog" href="http://blogs.apache.org/hbase/"/>
-      <item name="Mailing Lists" href="mail-lists.html"/>
-      <item name="Team" href="team-list.html"/>
-      <item name="ReviewBoard" href="https://reviews.apache.org/"/>
-      <item name="Thanks" href="sponsors.html"/>
-      <item name="Powered by HBase" href="poweredbyhbase.html"/>
-      <item name="Other resources" href="resources.html"/>
-    </menu>
-    <menu name="Project Information">
-      <item name="Project Summary" href="project-summary.html"/>
-      <item name="Dependency Information" href="dependency-info.html"/>
-      <item name="Team" href="team-list.html"/>
-      <item name="Source Repository" href="source-repository.html"/>
-      <item name="Issue Tracking" href="issue-tracking.html"/>
-      <item name="Dependency Management" href="dependency-management.html"/>
-      <item name="Dependencies" href="dependencies.html"/>
-      <item name="Dependency Convergence" href="dependency-convergence.html"/>
-      <item name="Continuous Integration" href="integration.html"/>
-      <item name="Plugin Management" href="plugin-management.html"/>
-      <item name="Plugins" href="plugins.html"/>
-    </menu>
-    <menu name="Documentation and API">
-      <item name="Reference Guide" href="book.html" target="_blank" />
-      <item name="Reference Guide (PDF)" href="apache_hbase_reference_guide.pdf" target="_blank" />
-      <item name="Getting Started" href="book.html#quickstart" target="_blank" />
-      <item name="User API" href="apidocs/index.html" target="_blank" />
-      <item name="User API (Test)" href="testapidocs/index.html" target="_blank" />
-      <item name="Developer API" href="https://hbase.apache.org/2.0/devapidocs/index.html" target="_blank" />
-      <item name="Developer API (Test)" href="https://hbase.apache.org/2.0/testdevapidocs/index.html" target="_blank" />
-      <item name="中文参考指南(单页)" href="http://abloz.com/hbase/book.html" target="_blank" />
-      <item name="FAQ" href="book.html#faq" target="_blank" />
-      <item name="Videos/Presentations" href="book.html#other.info" target="_blank" />
-      <item name="Wiki" href="http://wiki.apache.org/hadoop/Hbase" target="_blank" />
-      <item name="ACID Semantics" href="acid-semantics.html" target="_blank" />
-      <item name="Bulk Loads" href="book.html#arch.bulk.load" target="_blank" />
-      <item name="Metrics" href="metrics.html" target="_blank" />
-      <item name="HBase on Windows" href="cygwin.html" target="_blank" />
-      <item name="Cluster replication" href="book.html#replication" target="_blank" />
-      <item name="1.2 Documentation">
-        <item name="API" href="1.2/apidocs/index.html" target="_blank" />
-        <item name="X-Ref" href="1.2/xref/index.html" target="_blank" />
-        <item name="Ref Guide (single-page)" href="1.2/book.html" target="_blank" />
-      </item>
-      <item name="1.1 Documentation">
-        <item name="API" href="1.1/apidocs/index.html" target="_blank" />
-        <item name="X-Ref" href="1.1/xref/index.html" target="_blank" />
-        <item name="Ref Guide (single-page)" href="1.1/book.html" target="_blank" />
-      </item>
-    </menu>
-    <menu name="ASF">
-      <item name="Apache Software Foundation" href="http://www.apache.org/foundation/" target="_blank" />
-      <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html" target="_blank" />
-      <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html" target="_blank" />
-    </menu>
-    </body>
-</project>

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/xdoc/acid-semantics.xml
----------------------------------------------------------------------
diff --git a/src/main/site/xdoc/acid-semantics.xml b/src/main/site/xdoc/acid-semantics.xml
deleted file mode 100644
index 2d4eb6a..0000000
--- a/src/main/site/xdoc/acid-semantics.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
-          "http://forrest.apache.org/dtd/document-v20.dtd">
-
-<document xmlns="http://maven.apache.org/XDOC/2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-  <properties>
-    <title> 
-      Apache HBase (TM) ACID Properties
-    </title>
-  </properties>
-
-  <body>
-    <section name="About this Document">
-      <p>Apache HBase (TM) is not an ACID compliant database. However, it does guarantee certain specific
-      properties.</p>
-      <p>This specification enumerates the ACID properties of HBase.</p>
-    </section>
-    <section name="Definitions">
-      <p>For the sake of common vocabulary, we define the following terms:</p>
-      <dl>
-        <dt>Atomicity</dt>
-        <dd>an operation is atomic if it either completes entirely or not at all</dd>
-
-        <dt>Consistency</dt>
-        <dd>
-          all actions cause the table to transition from one valid state directly to another
-          (eg a row will not disappear during an update, etc)
-        </dd>
-
-        <dt>Isolation</dt>
-        <dd>
-          an operation is isolated if it appears to complete independently of any other concurrent transaction
-        </dd>
-
-        <dt>Durability</dt>
-        <dd>any update that reports &quot;successful&quot; to the client will not be lost</dd>
-
-        <dt>Visibility</dt>
-        <dd>an update is considered visible if any subsequent read will see the update as having been committed</dd>
-      </dl>
-      <p>
-        The terms <em>must</em> and <em>may</em> are used as specified by RFC 2119.
-        In short, the word &quot;must&quot; implies that, if some case exists where the statement
-        is not true, it is a bug. The word &quot;may&quot; implies that, even if the guarantee
-        is provided in a current release, users should not rely on it.
-      </p>
-    </section>
-    <section name="APIs to consider">
-      <ul>
-        <li>Read APIs
-        <ul>
-          <li>get</li>
-          <li>scan</li>
-        </ul>
-        </li>
-        <li>Write APIs</li>
-        <ul>
-          <li>put</li>
-          <li>batch put</li>
-          <li>delete</li>
-        </ul>
-        <li>Combination (read-modify-write) APIs</li>
-        <ul>
-          <li>incrementColumnValue</li>
-          <li>checkAndPut</li>
-        </ul>
-      </ul>
-    </section>
-
-    <section name="Guarantees Provided">
-
-      <section name="Atomicity">
-
-        <ol>
-          <li>All mutations are atomic within a row. Any put will either wholly succeed or wholly fail.[3]</li>
-          <ol>
-            <li>An operation that returns a &quot;success&quot; code has completely succeeded.</li>
-            <li>An operation that returns a &quot;failure&quot; code has completely failed.</li>
-            <li>An operation that times out may have succeeded and may have failed. However,
-            it will not have partially succeeded or failed.</li>
-          </ol>
-          <li> This is true even if the mutation crosses multiple column families within a row.</li>
-          <li> APIs that mutate several rows will _not_ be atomic across the multiple rows.
-          For example, a multiput that operates on rows 'a','b', and 'c' may return having
-          mutated some but not all of the rows. In such cases, these APIs will return a list
-          of success codes, each of which may be succeeded, failed, or timed out as described above.</li>
-          <li> The checkAndPut API happens atomically like the typical compareAndSet (CAS) operation
-          found in many hardware architectures.</li>
-          <li> The order of mutations is seen to happen in a well-defined order for each row, with no
-          interleaving. For example, if one writer issues the mutation &quot;a=1,b=1,c=1&quot; and
-          another writer issues the mutation &quot;a=2,b=2,c=2&quot;, the row must either
-          be &quot;a=1,b=1,c=1&quot; or &quot;a=2,b=2,c=2&quot; and must <em>not</em> be something
-          like &quot;a=1,b=2,c=1&quot;.</li>
-          <ol>
-            <li>Please note that this is not true _across rows_ for multirow batch mutations.</li>
-          </ol>
-        </ol>
-      </section>
-      <section name="Consistency and Isolation">
-        <ol>
-          <li>All rows returned via any access API will consist of a complete row that existed at
-          some point in the table's history.</li>
-          <li>This is true across column families - i.e a get of a full row that occurs concurrent
-          with some mutations 1,2,3,4,5 will return a complete row that existed at some point in time
-          between mutation i and i+1 for some i between 1 and 5.</li>
-          <li>The state of a row will only move forward through the history of edits to it.</li>
-        </ol>
-
-        <section name="Consistency of Scans">
-        <p>
-          A scan is <strong>not</strong> a consistent view of a table. Scans do
-          <strong>not</strong> exhibit <em>snapshot isolation</em>.
-        </p>
-        <p>
-          Rather, scans have the following properties:
-        </p>
-
-        <ol>
-          <li>
-            Any row returned by the scan will be a consistent view (i.e. that version
-            of the complete row existed at some point in time) [1]
-          </li>
-          <li>
-            A scan will always reflect a view of the data <em>at least as new as</em>
-            the beginning of the scan. This satisfies the visibility guarantees
-          enumerated below.</li>
-          <ol>
-            <li>For example, if client A writes data X and then communicates via a side
-            channel to client B, any scans started by client B will contain data at least
-            as new as X.</li>
-            <li>A scan _must_ reflect all mutations committed prior to the construction
-            of the scanner, and _may_ reflect some mutations committed subsequent to the
-            construction of the scanner.</li>
-            <li>Scans must include <em>all</em> data written prior to the scan (except in
-            the case where data is subsequently mutated, in which case it _may_ reflect
-            the mutation)</li>
-          </ol>
-        </ol>
-        <p>
-          Those familiar with relational databases will recognize this isolation level as &quot;read committed&quot;.
-        </p>
-        <p>
-          Please note that the guarantees listed above regarding scanner consistency
-          are referring to &quot;transaction commit time&quot;, not the &quot;timestamp&quot;
-          field of each cell. That is to say, a scanner started at time <em>t</em> may see edits
-          with a timestamp value greater than <em>t</em>, if those edits were committed with a
-          &quot;forward dated&quot; timestamp before the scanner was constructed.
-        </p>
-        </section>
-      </section>
-      <section name="Visibility">
-        <ol>
-          <li> When a client receives a &quot;success&quot; response for any mutation, that
-          mutation is immediately visible to both that client and any client with whom it
-          later communicates through side channels. [3]</li>
-          <li> A row must never exhibit so-called &quot;time-travel&quot; properties. That
-          is to say, if a series of mutations moves a row sequentially through a series of
-          states, any sequence of concurrent reads will return a subsequence of those states.</li>
-          <ol>
-            <li>For example, if a row's cells are mutated using the &quot;incrementColumnValue&quot;
-            API, a client must never see the value of any cell decrease.</li>
-            <li>This is true regardless of which read API is used to read back the mutation.</li>
-          </ol>
-          <li> Any version of a cell that has been returned to a read operation is guaranteed to
-          be durably stored.</li>
-        </ol>
-
-      </section>
-      <section name="Durability">
-        <ol>
-          <li> All visible data is also durable data. That is to say, a read will never return
-          data that has not been made durable on disk[2]</li>
-          <li> Any operation that returns a &quot;success&quot; code (eg does not throw an exception)
-          will be made durable.[3]</li>
-          <li> Any operation that returns a &quot;failure&quot; code will not be made durable
-          (subject to the Atomicity guarantees above)</li>
-          <li> All reasonable failure scenarios will not affect any of the guarantees of this document.</li>
-
-        </ol>
-      </section>
-      <section name="Tunability">
-        <p>All of the above guarantees must be possible within Apache HBase. For users who would like to trade
-        off some guarantees for performance, HBase may offer several tuning options. For example:</p>
-        <ul>
-          <li>Visibility may be tuned on a per-read basis to allow stale reads or time travel.</li>
-          <li>Durability may be tuned to only flush data to disk on a periodic basis</li>
-        </ul>
-      </section>
-    </section>
-    <section name="More Information">
-      <p>
-      For more information, see the <a href="book.html#client">client architecture</a> or <a href="book.html#datamodel">data model</a> sections in the Apache HBase Reference Guide. 
-      </p>
-    </section>
-    
-    <section name="Footnotes">
-      <p>[1] A consistent view is not guaranteed intra-row scanning -- i.e. fetching a portion of
-          a row in one RPC then going back to fetch another portion of the row in a subsequent RPC.
-          Intra-row scanning happens when you set a limit on how many values to return per Scan#next
-          (See <a href="http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/client/Scan.html#setBatch(int)">Scan#setBatch(int)</a>).
-      </p>
-
-      <p>[2] In the context of Apache HBase, &quot;durably on disk&quot; implies an hflush() call on the transaction
-      log. This does not actually imply an fsync() to magnetic media, but rather just that the data has been
-      written to the OS cache on all replicas of the log. In the case of a full datacenter power loss, it is
-      possible that the edits are not truly durable.</p>
-      <p>[3] Puts will either wholly succeed or wholly fail, provided that they are actually sent
-      to the RegionServer.  If the writebuffer is used, Puts will not be sent until the writebuffer is filled
-      or it is explicitly flushed.</p>
-      
-    </section>
-
-  </body>
-</document>

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/xdoc/bulk-loads.xml
----------------------------------------------------------------------
diff --git a/src/main/site/xdoc/bulk-loads.xml b/src/main/site/xdoc/bulk-loads.xml
deleted file mode 100644
index 2195003..0000000
--- a/src/main/site/xdoc/bulk-loads.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<document xmlns="http://maven.apache.org/XDOC/2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-  <properties>
-    <title> 
-      Bulk Loads in Apache HBase (TM)
-    </title>
-  </properties>
-  <body>
-       <p>This page has been retired.  The contents have been moved to the 
-      <a href="http://hbase.apache.org/book.html#arch.bulk.load">Bulk Loading</a> section
- in the Reference Guide.
- </p>
-  </body>
-</document>

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/xdoc/coc.xml
----------------------------------------------------------------------
diff --git a/src/main/site/xdoc/coc.xml b/src/main/site/xdoc/coc.xml
deleted file mode 100644
index fc2b549..0000000
--- a/src/main/site/xdoc/coc.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
-          "http://forrest.apache.org/dtd/document-v20.dtd">
-
-<document xmlns="http://maven.apache.org/XDOC/2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-  <properties>
-    <title>
-      Code of Conduct Policy
-    </title>
-  </properties>
-  <body>
-  <section name="Code of Conduct Policy">
-<p>
-We expect participants in discussions on the HBase project mailing lists, IRC
-channels, and JIRA issues to abide by the Apache Software Foundation's
-<a href="http://apache.org/foundation/policies/conduct.html">Code of Conduct</a>.
-</p>
-<p>
-If you feel there has been a violation of this code, please point out your
-concerns publicly in a friendly and matter of fact manner. Nonverbal
-communication is prone to misinterpretation and misunderstanding. Everyone has
-bad days and sometimes says things they regret later. Someone else's
-communication style may clash with yours, but the difference can be amicably
-resolved. After pointing out your concerns please be generous upon receiving an
-apology.
-</p>
-<p>
-Should there be repeated instances of code of conduct violations, or if there is
-an obvious and severe violation, the HBase PMC may become involved. When this
-happens the PMC will openly discuss the matter, most likely on the dev@hbase
-mailing list, and will consider taking the following actions, in order, if there
-is a continuing problem with an individual:
-<ol>
-<li>A friendly off-list warning;</li>
-<li>A friendly public warning, if the communication at issue was on list, otherwise another off-list warning;</li>
-<li>A three month suspension from the public mailing lists and possible operator action in the IRC channels.</li>
-<li>A permanent ban from the public mailing lists, IRC channels, and project JIRA.</li>
-</ol>
-</p>
-<p>
-For flagrant violations requiring a firm response the PMC may opt to skip early
-steps. No action will be taken before public discussion leading to consensus or
-a successful majority vote.
-</p>
-  </section>
-  <section name="Diversity Statement">
-<p>
-As a project and a community, we encourage you to participate in the HBase project
-in whatever capacity suits you, whether it involves development, documentation,
-answering questions on mailing lists, triaging issue and patch review, managing
-releases, or any other way that you want to help. We appreciate your
-contributions and the time you dedicate to the HBase project. We strive to
-recognize the work of participants publicly. Please let us know if we can
-improve in this area.
-</p>
-<p>
-We value diversity and strive to support participation by people with all
-different backgrounds. Rich projects grow from groups with different points of
-view and different backgrounds. We welcome your suggestions about how we can
-welcome participation by people at all skill levels and with all aspects of the
-project.
-</p>
-<p>
-If you can think of something we are doing that we shouldn't, or something that
-we should do but aren't, please let us know. If you feel comfortable doing so,
-use the public mailing lists. Otherwise, reach out to a PMC member or send an
-email to <a href="mailto:private@hbase.apache.org">the private PMC mailing list</a>.
-</p>
-  </section>
-  </body>
-</document>

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/xdoc/cygwin.xml
----------------------------------------------------------------------
diff --git a/src/main/site/xdoc/cygwin.xml b/src/main/site/xdoc/cygwin.xml
deleted file mode 100644
index 406c0a9..0000000
--- a/src/main/site/xdoc/cygwin.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<document xmlns="http://maven.apache.org/XDOC/2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-  <properties>
-    <title>Installing Apache HBase (TM) on Windows using Cygwin</title>
-  </properties>
-
-<body>
-<section name="Introduction">
-<p><a title="HBase project" href="http://hbase.apache.org" target="_blank">Apache HBase (TM)</a> is a distributed, column-oriented store, modeled after Google's <a title="Google's BigTable" href="http://research.google.com/archive/bigtable.html" target="_blank">BigTable</a>. Apache HBase is built on top of <a title="Hadoop project" href="http://hadoop.apache.org">Hadoop</a> for its <a title="Hadoop MapReduce project" href="http://hadoop.apache.org/mapreduce" target="_blank">MapReduce </a>and <a title="Hadoop DFS project" href="http://hadoop.apache.org/hdfs">distributed file system</a> implementation. All these projects are open-source and part of the <a title="The Apache Software Foundation" href="http://www.apache.org/" target="_blank">Apache Software Foundation</a>.</p>
-
-<p style="text-align: justify; ">As being distributed, large scale platforms, the Hadoop and HBase projects mainly focus on <em><strong>*nix</strong></em><strong> environments</strong> for production installations. However, being developed in <strong>Java</strong>, both projects are fully <strong>portable</strong> across platforms and, hence, also to the <strong>Windows operating system</strong>. For ease of development the projects rely on <a title="Cygwin site" href="http://www.cygwin.com/" target="_blank">Cygwin</a> to have a *nix-like environment on Windows to run the shell scripts.</p>
-</section>
-<section name="Purpose">
-<p style="text-align: justify; ">This document explains the <strong>intricacies of running Apache HBase on Windows using Cygwin</strong> as an all-in-one single-node installation for testing and development. The HBase <a title="HBase Overview" href="http://hbase.apache.org/apidocs/overview-summary.html#overview_description" target="_blank">Overview</a> and <a title="HBase QuickStart" href="http://hbase.apache.org/book/quickstart.html" target="_blank">QuickStart</a> guides on the other hand go a long way in explaning how to setup <a title="HBase project" href="http://hadoop.apache.org/hbase" target="_blank">HBase</a> in more complex deployment scenario's.</p>
-</section>
-
-<section name="Installation">
-<p style="text-align: justify; ">For running Apache HBase on Windows, 3 technologies are required: <strong>Java, Cygwin and SSH</strong>. The following paragraphs detail the installation of each of the aforementioned technologies.</p>
-<section name="Java">
-<p style="text-align: justify; ">HBase depends on the <a title="Java Platform, Standard Edition, 6 Release" href="http://java.sun.com/javase/6/" target="_blank">Java Platform, Standard Edition, 6 Release</a>. So the target system has to be provided with at least the Java Runtime Environment (JRE); however if the system will also be used for development, the Jave Development Kit (JDK) is preferred. You can download the latest versions for both from <a title="Java SE Downloads" href="http://java.sun.com/javase/downloads/index.jsp" target="_blank">Sun's download page</a>. Installation is a simple GUI wizard that guides you through the process.</p>
-</section>
-<section name="Cygwin">
-<p style="text-align: justify; ">Cygwin is probably the oddest technology in this solution stack. It provides a dynamic link library that emulates most of a *nix environment on Windows. On top of that a whole bunch of the most common *nix tools are supplied. Combined, the DLL with the tools form a very *nix-alike environment on Windows.</p>
-
-<p style="text-align: justify; ">For installation, Cygwin provides the <a title="Cygwin Setup Utility" href="http://cygwin.com/setup.exe" target="_blank"><strong><code>setup.exe</code> utility</strong></a> that tracks the versions of all installed components on the target system and provides the mechanism for <strong>installing</strong> or <strong>updating </strong>everything from the mirror sites of Cygwin.</p>
-
-<p style="text-align: justify; ">To support installation, the <code>setup.exe</code> utility uses 2 directories on the target system. The <strong>Root</strong> directory for Cygwin (defaults to <code>C:\cygwin)</code> which will become <code>/</code> within the eventual Cygwin installation; and the <strong>Local Package </strong>directory (e.g. <code>C:\cygsetup</code> that is the cache where <code>setup.exe</code> stores the packages before they are installed. The cache must not be the same folder as the Cygwin root.</p>
-
-<p style="text-align: justify; ">Perform following steps to install Cygwin, which are elaboratly detailed in the <a title="Setting Up Cygwin" href="http://cygwin.com/cygwin-ug-net/setup-net.html" target="_self">2nd chapter</a> of the <a title="Cygwin User's Guide" href="http://cygwin.com/cygwin-ug-net/cygwin-ug-net.html" target="_blank">Cygwin User's Guide</a>:</p>
-
-<ol style="text-align: justify; ">
-	<li>Make sure you have <code>Administrator</code> privileges on the target system.</li>
-	<li>Choose and create you <strong>Root</strong> and <strong>Local Package</strong> directories. A good suggestion is to use <code>C:\cygwin\root</code> and <code>C:\cygwin\setup</code> folders.</li>
-	<li>Download the <code>setup.exe</code> utility and save it to the <strong>Local Package</strong> directory.</li>
-	<li>Run the <code>setup.exe</code> utility,
-<ol>
-	<li>Choose  the <code>Install from Internet</code> option,</li>
-	<li>Choose your <strong>Root</strong> and <strong>Local Package</strong> folders</li>
-	<li>and select an appropriate mirror.</li>
-	<li>Don't select any additional packages yet, as we only want to install Cygwin for now.</li>
-	<li>Wait for download and install</li>
-	<li>Finish the installation</li>
-</ol>
-</li>
-	<li>Optionally, you can now also add a shortcut to your Start menu pointing to the <code>setup.exe</code> utility in the <strong>Local Package </strong>folder.</li>
-	<li>Add <code>CYGWIN_HOME</code> system-wide environment variable that points to your <strong>Root </strong>directory.</li>
-	<li>Add <code>%CYGWIN_HOME%\bin</code> to the end of your <code>PATH</code> environment variable.</li>
-	<li>Reboot the sytem after making changes to the environment variables otherwise the OS will not be able to find the Cygwin utilities.</li>
-	<li>Test your installation by running your freshly created shortcuts or the <code>Cygwin.bat</code> command in the <strong>Root</strong> folder. You should end up in a terminal window that is running a <a title="Bash Reference Manual" href="http://www.gnu.org/software/bash/manual/bashref.html" target="_blank">Bash shell</a>. Test the shell by issuing following commands:
-<ol>
-	<li><code>cd /</code> should take you to thr <strong>Root</strong> directory in Cygwin;</li>
-	<li>the <code>LS</code> commands that should list all files and folders in the current directory.</li>
-	<li>Use the <code>exit</code> command to end the terminal.</li>
-</ol>
-</li>
-	<li>When needed, to <strong>uninstall</strong> Cygwin you can simply delete the <strong>Root</strong> and <strong>Local Package</strong> directory, and the <strong>shortcuts</strong> that were created during installation.</li>
-</ol>
-</section>
-<section name="SSH">
-<p style="text-align: justify; ">HBase (and Hadoop) rely on <a title="Secure Shell" href="http://nl.wikipedia.org/wiki/Secure_Shell" target="_blank"><strong>SSH</strong></a> for interprocess/-node <strong>communication</strong> and launching<strong> remote commands</strong>. SSH will be provisioned on the target system via Cygwin, which supports running Cygwin programs as <strong>Windows services</strong>!</p>
-
-<ol style="text-align: justify; ">
-	<li>Rerun the <code><strong>setup.exe</strong></code><strong> utility</strong>.</li>
-	<li>Leave all parameters as is, skipping through the wizard using the <code>Next</code> button until the <code>Select Packages</code> panel is shown.</li>
-	<li>Maximize the window and click the <code>View</code> button to toggle to the list view, which is ordered alfabetically on <code>Package</code>, making it easier to find the packages we'll need.</li>
-	<li>Select the following packages by clicking the status word (normally <code>Skip</code>) so it's marked for installation. Use the <code>Next </code>button to download and install the packages.
-<ol>
-	<li>OpenSSH</li>
-	<li>tcp_wrappers</li>
-	<li>diffutils</li>
-	<li>zlib</li>
-</ol>
-</li>
-	<li>Wait for the install to complete and finish the installation.</li>
-</ol>
-</section>
-<section name="HBase">
-<p style="text-align: justify; ">Download the <strong>latest release </strong>of Apache HBase from the <a title="HBase Releases" href="http://www.apache.org/dyn/closer.cgi/hbase/" target="_blank">website</a>. As the Apache HBase distributable is just a zipped archive, installation is as simple as unpacking the archive so it ends up in its final <strong>installation</strong> directory. Notice that HBase has to be installed in Cygwin and a good directory suggestion is to use <code>/usr/local/</code> (or [<code><strong>Root</strong> directory]\usr\local</code> in Windows slang). You should end up with a <code>/usr/local/hbase-<em>&lt;version&gt;</em></code> installation in Cygwin.</p>
-
-This finishes installation. We go on with the configuration.
-</section>
-</section>
-<section name="Configuration">
-<p style="text-align: justify; ">There are 3 parts left to configure: <strong>Java, SSH and HBase</strong> itself. Following paragraphs explain eacht topic in detail.</p>
-<section name="Java">
-<p style="text-align: justify; ">One important thing to remember in shell scripting in general (i.e. *nix and Windows) is that managing, manipulating and assembling path names that contains spaces can be very hard, due to the need to escape and quote those characters and strings. So we try to stay away from spaces in path names. *nix environments can help us out here very easily by using <strong>symbolic links</strong>.</p>
-
-<ol style="text-align: justify; ">
-	<li style="text-align: justify; ">Create a link in <code>/usr/local</code> to the Java home directory by using the following command and substituting the name of your chosen Java environment:
-<pre>LN -s /cygdrive/c/Program\ Files/Java/<em>&lt;jre name&gt; </em>/usr/local/<em>&lt;jre name&gt;</em></pre>
-</li>
-	<li>Test your java installation by changing directories to your Java folder <code>CD /usr/local/<em>&lt;jre name&gt;</em></code> and issueing the command <code>./bin/java -version</code>. This should output your version of the chosen JRE.</li>
-</ol>
-</section>
-<section>
-<title>SSH</title>
-<p style="text-align: justify; ">Configuring <strong>SSH </strong>is quite elaborate, but primarily a question of launching it by default as a<strong> Windows service</strong>.</p>
-
-<ol style="text-align: justify; ">
-	<li style="text-align: justify; ">On Windows Vista and above make sure you run the Cygwin shell with <strong>elevated privileges</strong>, by right-clicking on the shortcut an using <code>Run as Administrator</code>.</li>
-	<li style="text-align: justify; ">First of all, we have to make sure the <strong>rights on some crucial files</strong> are correct. Use the commands underneath. You can verify all rights by using the <code>LS -L</code> command on the different files. Also, notice the auto-completion feature in the shell using <code>&lt;TAB&gt;</code> is extremely handy in these situations.
-<ol>
-	<li><code>chmod +r /etc/passwd</code> to make the passwords file readable for all</li>
-	<li><code>chmod u+w /etc/passwd</code> to make the passwords file writable for the owner</li>
-	<li><code>chmod +r /etc/group</code> to make the groups file readable for all</li>
-</ol>
-<ol>
-	<li><code>chmod u+w /etc/group</code> to make the groups file writable for the owner</li>
-</ol>
-<ol>
-	<li><code>chmod 755 /var</code> to make the var folder writable to owner and readable and executable to all</li>
-</ol>
-</li>
-	<li>Edit the <strong>/etc/hosts.allow</strong> file using your favorite editor (why not VI in the shell!) and make sure the following two lines are in there before the <code>PARANOID</code> line:
-<ol>
-	<li><code>ALL : localhost 127.0.0.1/32 : allow</code></li>
-	<li><code>ALL : [::1]/128 : allow</code></li>
-</ol>
-</li>
-	<li>Next we have to <strong>configure SSH</strong> by using the script <code>ssh-host-config</code>
-<ol>
-	<li>If this script asks to overwrite an existing <code>/etc/ssh_config</code>, answer <code>yes</code>.</li>
-	<li>If this script asks to overwrite an existing <code>/etc/sshd_config</code>, answer <code>yes</code>.</li>
-	<li>If this script asks to use privilege separation, answer <code>yes</code>.</li>
-	<li>If this script asks to install <code>sshd</code> as a service, answer <code>yes</code>. Make sure you started your shell as Adminstrator!</li>
-	<li>If this script asks for the CYGWIN value, just <code>&lt;enter&gt;</code> as the default is <code>ntsec</code>.</li>
-	<li>If this script asks to create the <code>sshd</code> account, answer <code>yes</code>.</li>
-	<li>If this script asks to use a different user name as service account, answer <code>no</code> as the default will suffice.</li>
-	<li>If this script asks to create the <code>cyg_server</code> account, answer <code>yes</code>. Enter a password for the account.</li>
-</ol>
-</li>
-	<li><strong>Start the SSH service</strong> using <code>net start sshd</code> or <code>cygrunsrv  --start  sshd</code>. Notice that <code>cygrunsrv</code> is the utility that make the process run as a Windows service. Confirm that you see a message stating that <code>the CYGWIN sshd service  was started succesfully.</code></li>
-	<li>Harmonize Windows and Cygwin<strong> user account</strong> by using the commands:
-<ol>
-	<li><code>mkpasswd -cl &gt; /etc/passwd</code></li>
-	<li><code>mkgroup --local &gt; /etc/group</code></li>
-</ol>
-</li>
-	<li><strong>Test </strong>the installation of SSH:
-<ol>
-	<li>Open a new Cygwin terminal</li>
-	<li>Use the command <code>whoami</code> to verify your userID</li>
-	<li>Issue an <code>ssh localhost</code> to connect to the system itself
-<ol>
-	<li>Answer <code>yes</code> when presented with the server's fingerprint</li>
-	<li>Issue your password when prompted</li>
-	<li>test a few commands in the remote session</li>
-	<li>The <code>exit</code> command should take you back to your first shell in Cygwin</li>
-</ol>
-</li>
-	<li><code>Exit</code> should terminate the Cygwin shell.</li>
-</ol>
-</li>
-</ol>
-</section>
-<section name="HBase">
-If all previous configurations are working properly, we just need some tinkering at the <strong>HBase config</strong> files to properly resolve on Windows/Cygwin. All files and paths referenced here start from the HBase <code>[<strong>installation</strong> directory]</code> as working directory.
-<ol>
-	<li>HBase uses the <code>./conf/<strong>hbase-env.sh</strong></code> to configure its dependencies on the runtime environment. Copy and uncomment following lines just underneath their original, change them to fit your environemnt. They should read something like:
-<ol>
-	<li><code>export JAVA_HOME=/usr/local/<em>&lt;jre name&gt;</em></code></li>
-	<li><code>export HBASE_IDENT_STRING=$HOSTNAME</code> as this most likely does not inlcude spaces.</li>
-</ol>
-</li>
-	<li>HBase uses the ./conf/<code><strong>hbase-default.xml</strong></code> file for configuration. Some properties do not resolve to existing directories because the JVM runs on Windows. This is the major issue to keep in mind when working with Cygwin: within the shell all paths are *nix-alike, hence relative to the root <code>/</code>. However, every parameter that is to be consumed within the windows processes themself, need to be Windows settings, hence <code>C:\</code>-alike. Change following propeties in the configuration file, adjusting paths where necessary to conform with your own installation:
-<ol>
-	<li><code>hbase.rootdir</code> must read e.g. <code>file:///C:/cygwin/root/tmp/hbase/data</code></li>
-	<li><code>hbase.tmp.dir</code> must read <code>C:/cygwin/root/tmp/hbase/tmp</code></li>
-	<li><code>hbase.zookeeper.quorum</code> must read <code>127.0.0.1</code> because for some reason <code>localhost</code> doesn't seem to resolve properly on Cygwin.</li>
-</ol>
-</li>
-	<li>Make sure the configured <code>hbase.rootdir</code> and <code>hbase.tmp.dir</code> <strong>directories exist</strong> and have the proper<strong> rights</strong> set up e.g. by issuing a <code>chmod 777</code> on them.</li>
-</ol>
-</section>
-</section>
-<section>
-<title>Testing</title>
-<p>
-This should conclude the installation and configuration of Apache HBase on Windows using Cygwin. So it's time <strong>to test it</strong>.
-<ol>
-	<li>Start a Cygwin<strong> terminal</strong>, if you haven't already.</li>
-	<li>Change directory to HBase <strong>installation</strong> using <code>CD /usr/local/hbase-<em>&lt;version&gt;</em></code>, preferably using auto-completion.</li>
-	<li><strong>Start HBase</strong> using the command <code>./bin/start-hbase.sh</code>
-<ol>
-	<li>When prompted to accept the SSH fingerprint, answer <code>yes</code>.</li>
-	<li>When prompted, provide your password. Maybe multiple times.</li>
-	<li>When the command completes, the HBase server should have started.</li>
-	<li>However, to be absolutely certain, check the logs in the <code>./logs</code> directory for any exceptions.</li>
-</ol>
-</li>
-	<li>Next we <strong>start the HBase shell</strong> using the command <code>./bin/hbase shell</code></li>
-	<li>We run some simple <strong>test commands</strong>
-<ol>
-	<li>Create a simple table using command <code>create 'test', 'data'</code></li>
-	<li>Verify the table exists using the command <code>list</code></li>
-	<li>Insert data into the table using e.g.
-<pre>put 'test', 'row1', 'data:1', 'value1'
-put 'test', 'row2', 'data:2', 'value2'
-put 'test', 'row3', 'data:3', 'value3'</pre>
-</li>
-	<li>List all rows in the table using the command <code>scan 'test'</code> that should list all the rows previously inserted. Notice how 3 new columns where added without changing the schema!</li>
-	<li>Finally we get rid of the table by issuing <code>disable 'test'</code> followed by <code>drop 'test'</code> and verified by <code>list</code> which should give an empty listing.</li>
-</ol>
-</li>
-	<li><strong>Leave the shell</strong> by <code>exit</code></li>
-	<li>To <strong>stop the HBase server</strong> issue the <code>./bin/stop-hbase.sh</code> command. And wait for it to complete!!! Killing the process might corrupt your data on disk.</li>
-	<li>In case of <strong>problems</strong>,
-<ol>
-	<li>verify the HBase logs in the <code>./logs</code> directory.</li>
-	<li>Try to fix the problem</li>
-	<li>Get help on the forums or IRC (<code>#hbase@freenode.net</code>). People are very active and keen to help out!</li>
-	<li>Stopr, restart and retest the server.</li>
-</ol>
-</li>
-</ol>
-</p>
-</section>
-
-<section name="Conclusion">
-<p>
-Now your <strong>HBase </strong>server is running, <strong>start coding</strong> and build that next killer app on this particular, but scalable datastore!
-</p>
-</section>
-</body>
-</document>

http://git-wip-us.apache.org/repos/asf/hbase/blob/61d70604/src/main/site/xdoc/export_control.xml
----------------------------------------------------------------------
diff --git a/src/main/site/xdoc/export_control.xml b/src/main/site/xdoc/export_control.xml
deleted file mode 100644
index 0fd5c4f..0000000
--- a/src/main/site/xdoc/export_control.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
-          "http://forrest.apache.org/dtd/document-v20.dtd">
-
-<document xmlns="http://maven.apache.org/XDOC/2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-  <properties>
-    <title>
-      Export Control
-    </title>
-  </properties>
-  <body>
-  <section name="Export Control">
-<p>
-This distribution uses or includes cryptographic software. The country in
-which you currently reside may have restrictions on the import, possession,
-use, and/or re-export to another country, of encryption software. BEFORE
-using any encryption software, please check your country's laws, regulations
-and policies concerning the import, possession, or use, and re-export of
-encryption software, to see if this is permitted. See the
-<a href="http://www.wassenaar.org/">Wassenaar Arrangement</a> for more
-information.</p>
-<p>
-The U.S. Government Department of Commerce, Bureau of Industry and Security 
-(BIS), has classified this software as Export Commodity Control Number (ECCN) 
-5D002.C.1, which includes information security software using or performing 
-cryptographic functions with asymmetric algorithms. The form and manner of this
-Apache Software Foundation distribution makes it eligible for export under the 
-License Exception ENC Technology Software Unrestricted (TSU) exception (see the
-BIS Export Administration Regulations, Section 740.13) for both object code and
-source code.</p>
-<p>
-Apache HBase uses the built-in java cryptography libraries. See Oracle's
-information regarding
-<a href="http://www.oracle.com/us/products/export/export-regulations-345813.html">Java cryptographic export regulations</a>
-for more details.</p>
-  </section>
-  </body>
-</document>