You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/06/06 23:55:47 UTC
svn commit: r1347158 - in /hbase/trunk: pom.xml src/docbkx/book.xml
src/docbkx/configuration.xml src/docbkx/ops_mgt.xml
Author: stack
Date: Wed Jun 6 21:55:46 2012
New Revision: 1347158
URL: http://svn.apache.org/viewvc?rev=1347158&view=rev
Log:
HBASE-6179 Fix stylesheet broke since multimodule and address feedback gotten in new comment system
Modified:
hbase/trunk/pom.xml
hbase/trunk/src/docbkx/book.xml
hbase/trunk/src/docbkx/configuration.xml
hbase/trunk/src/docbkx/ops_mgt.xml
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1347158&r1=1347157&r2=1347158&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Wed Jun 6 21:55:46 2012
@@ -645,7 +645,6 @@
<sectionAutolabelMaxDepth>100</sectionAutolabelMaxDepth>
<sectionAutolabel>true</sectionAutolabel>
<sectionLabelIncludesComponentLabel>true</sectionLabelIncludesComponentLabel>
- <htmlStylesheet>${basedir}/src/site/resources/css/freebsd_docbook.css</htmlStylesheet>
<htmlCustomization>${basedir}/src/docbkx/customization.xsl</htmlCustomization>
<tocMaxDepth>2</tocMaxDepth>
<insertXrefPageNumber>yes</insertXrefPageNumber>
@@ -662,6 +661,7 @@
<navigShowtitles>true</navigShowtitles>
<chunkedOutput>true</chunkedOutput>
<imgSrcPath>../images/</imgSrcPath>
+ <htmlStylesheet>../css/freebsd_docbook.css</htmlStylesheet>
</configuration>
</execution>
<execution>
@@ -672,6 +672,7 @@
<phase>pre-site</phase>
<configuration>
<imgSrcPath>images/</imgSrcPath>
+ <htmlStylesheet>css/freebsd_docbook.css</htmlStylesheet>
</configuration>
</execution>
</executions>
Modified: hbase/trunk/src/docbkx/book.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/docbkx/book.xml?rev=1347158&r1=1347157&r2=1347158&view=diff
==============================================================================
--- hbase/trunk/src/docbkx/book.xml (original)
+++ hbase/trunk/src/docbkx/book.xml Wed Jun 6 21:55:46 2012
@@ -889,7 +889,7 @@ System.out.println("md5 digest as string
</section>
<section xml:id="schema.smackdown"><title>Schema Design Smackdown</title>
<para>This section will describe common schema design questions that appear on the dist-list. These are
- general guidelines and not laws - each application must consider it's own needs.
+ general guidelines and not laws - each application must consider its own needs.
</para>
<section xml:id="schema.smackdown.rowsversions"><title>Rows vs. Versions</title>
<para>A common question is whether one should prefer rows or HBase's built-in-versioning. The context is typically where there are
@@ -1267,7 +1267,7 @@ if (!b) {
<section xml:id="arch.overview.nosql">
<title>NoSQL?</title>
<para>HBase is a type of "NoSQL" database. "NoSQL" is a general term meaning that the database isn't an RDBMS which
- supports SQL as it's primary access language, but there are many types of NoSQL databases: BerkeleyDB is an
+ supports SQL as its primary access language, but there are many types of NoSQL databases: BerkeleyDB is an
example of a local NoSQL database, whereas HBase is very much a distributed database. Technically speaking,
HBase is really more a "Data Store" than "Data Base" because it lacks many of the features you find in an RDBMS,
such as typed columns, secondary indexes, triggers, and advanced query languages, etc.
@@ -1283,7 +1283,7 @@ if (!b) {
<listitem>Automatic sharding: HBase tables are distributed on the cluster via regions, and regions are
automatically split and re-distributed as your data grows.</listitem>
<listitem>Automatic RegionServer failover</listitem>
- <listitem>Hadoop/HDFS Integration: HBase supports HDFS out of the box as it's distributed file system.</listitem>
+ <listitem>Hadoop/HDFS Integration: HBase supports HDFS out of the box as its distributed file system.</listitem>
<listitem>MapReduce: HBase supports massively parallelized processing via MapReduce for using HBase as both
source and sink.</listitem>
<listitem>Java Client API: HBase supports an easy to use Java API for programmatic access.</listitem>
@@ -1685,7 +1685,7 @@ rs.close();
</para>
<section xml:id="master.startup"><title>Startup Behavior</title>
<para>If run in a multi-Master environment, all Masters compete to run the cluster. If the active
- Master loses it's lease in ZooKeeper (or the Master shuts down), then then the remaining Masters jostle to
+ Master loses its lease in ZooKeeper (or the Master shuts down), then then the remaining Masters jostle to
take over the Master role.
</para>
</section>
Modified: hbase/trunk/src/docbkx/configuration.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/docbkx/configuration.xml?rev=1347158&r1=1347157&r2=1347158&view=diff
==============================================================================
--- hbase/trunk/src/docbkx/configuration.xml (original)
+++ hbase/trunk/src/docbkx/configuration.xml Wed Jun 6 21:55:46 2012
@@ -79,7 +79,7 @@ to ensure well-formedness of your docume
<section xml:id="dns">
<title>DNS</title>
- <para>HBase uses the local hostname to self-report it's IP address.
+ <para>HBase uses the local hostname to self-report its IP address.
Both forward and reverse DNS resolving must work in versions of
HBase previous to 0.92.0
<footnote><para>The <link xlink:href="https://github.com/sujee/hadoop-dns-checker">hadoop-dns-checker</link> tool can be used to verify
@@ -794,7 +794,7 @@ stopping hbase...............</programli
in <filename>conf/hbase-env.sh</filename> to false
<programlisting>
...
- # Tell HBase whether it should manage it's own instance of Zookeeper or not.
+ # Tell HBase whether it should manage its own instance of Zookeeper or not.
export HBASE_MANAGES_ZK=false</programlisting> Next set ensemble locations
and client port, if non-standard, in
<filename>hbase-site.xml</filename>, or add a suitably
Modified: hbase/trunk/src/docbkx/ops_mgt.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/docbkx/ops_mgt.xml?rev=1347158&r1=1347157&r2=1347158&view=diff
==============================================================================
--- hbase/trunk/src/docbkx/ops_mgt.xml (original)
+++ hbase/trunk/src/docbkx/ops_mgt.xml Wed Jun 6 21:55:46 2012
@@ -238,7 +238,7 @@ row10 c1 c2
in conjunction with output from <xref linkend="importtsv"/>.
</para>
<para>There are two ways to invoke this utility, with explicit classname and via the driver:
-<programlisting>$ bin/hbase org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFile <hdfs://storefileoutput> <tablename>
+<programlisting>$ bin/hbase org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles <hdfs://storefileoutput> <tablename>
</programlisting>
.. and via the Driver..
<programlisting>HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-VERSION.jar completebulkload <hdfs://storefileoutput> <tablename>