From b4f24cf8c6bc1bb675cca7d41962bf56a6f879cf Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Tue, 18 Jun 2024 16:30:58 +0800 Subject: [PATCH] HBASE-28617 Add trademark statement in footer on our website (#5993) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also change ™ to ® on the index page as HBase is a registered trademark Signed-off-by: Nick Dimiduk --- pom.xml | 34 ++++++++++++++++++++++++++++----- src/site/resources/css/site.css | 24 ++++++++++------------- src/site/site.xml | 25 ++++++++++++++++++++---- src/site/xdoc/index.xml | 22 ++++++++++----------- 4 files changed, 71 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 7afa8b72c37c..59a1c95b9056 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ ${revision} pom Apache HBase - Apache HBase™ is the Hadoop database. Use it when you need + Apache HBase® is the Hadoop database. Use it when you need random, realtime read/write access to your Big Data. This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters of commodity hardware. @@ -2259,6 +2259,30 @@ false + + set-current-year + + timestamp-property + + pre-site + + current.year + yyyy + year + + + + set-current-date + + timestamp-property + + pre-site + + current.date + yyyy-MM-dd + day + + @@ -3028,7 +3052,7 @@ devapidocs Developer API The full HBase API, including private and unstable APIs - Apache HBase™ ${project.version} API + Apache HBase® ${project.version} API **/generated/* **/protobuf/* @@ -3079,7 +3103,7 @@ testdevapidocs Test Developer API The full HBase API test code, including private and unstable APIs - Apache HBase™ ${project.version} Test API + Apache HBase® ${project.version} Test API **/generated/* **/protobuf/* @@ -3139,7 +3163,7 @@ apidocs User API The HBase Application Programmer's API - Apache HBase™ ${project.version} API + Apache HBase® ${project.version} API org.apache.hadoop.hbase.backup*:org.apache.hadoop.hbase.catalog:org.apache.hadoop.hbase.client.coprocessor:org.apache.hadoop.hbase.client.metrics:org.apache.hadoop.hbase.codec*:org.apache.hadoop.hbase.constraint:org.apache.hadoop.hbase.coprocessor.*:org.apache.hadoop.hbase.executor:org.apache.hadoop.hbase.fs:*.generated.*:org.apache.hadoop.hbase.io.hfile.*:org.apache.hadoop.hbase.mapreduce.hadoopbackport:org.apache.hadoop.hbase.mapreduce.replication:org.apache.hadoop.hbase.master.*:org.apache.hadoop.hbase.metrics*:org.apache.hadoop.hbase.migration:org.apache.hadoop.hbase.monitoring:org.apache.hadoop.hbase.p*:org.apache.hadoop.hbase.regionserver.compactions:org.apache.hadoop.hbase.regionserver.handler:org.apache.hadoop.hbase.regionserver.snapshot:org.apache.hadoop.hbase.replication.*:org.apache.hadoop.hbase.rest.filter:org.apache.hadoop.hbase.rest.model:org.apache.hadoop.hbase.rest.p*:org.apache.hadoop.hbase.security.*:org.apache.hadoop.hbase.thrift*:org.apache.hadoop.hbase.tmpl.*:org.apache.hadoop.hbase.tool:org.apache.hadoop.hbase.trace:org.apache.hadoop.hbase.util.byterange*:org.apache.hadoop.hbase.util.test:org.apache.hadoop.hbase.util.vint:org.apache.hadoop.metrics2*:org.apache.hadoop.hbase.io.compress* false @@ -3197,7 +3221,7 @@ testapidocs Test User API The HBase Application Programmer's API test code - Apache HBase™ ${project.version} Test API + Apache HBase® ${project.version} Test API org.apache.hadoop.hbase.backup*:org.apache.hadoop.hbase.catalog:org.apache.hadoop.hbase.client.coprocessor:org.apache.hadoop.hbase.client.metrics:org.apache.hadoop.hbase.codec*:org.apache.hadoop.hbase.constraint:org.apache.hadoop.hbase.coprocessor.*:org.apache.hadoop.hbase.executor:org.apache.hadoop.hbase.fs:*.generated.*:org.apache.hadoop.hbase.io.hfile.*:org.apache.hadoop.hbase.mapreduce.hadoopbackport:org.apache.hadoop.hbase.mapreduce.replication:org.apache.hadoop.hbase.master.*:org.apache.hadoop.hbase.metrics*:org.apache.hadoop.hbase.migration:org.apache.hadoop.hbase.monitoring:org.apache.hadoop.hbase.p*:org.apache.hadoop.hbase.regionserver.compactions:org.apache.hadoop.hbase.regionserver.handler:org.apache.hadoop.hbase.regionserver.snapshot:org.apache.hadoop.hbase.replication.*:org.apache.hadoop.hbase.rest.filter:org.apache.hadoop.hbase.rest.model:org.apache.hadoop.hbase.rest.p*:org.apache.hadoop.hbase.security.*:org.apache.hadoop.hbase.thrift*:org.apache.hadoop.hbase.tmpl.*:org.apache.hadoop.hbase.tool:org.apache.hadoop.hbase.trace:org.apache.hadoop.hbase.util.byterange*:org.apache.hadoop.hbase.util.test:org.apache.hadoop.hbase.util.vint:org.apache.hadoop.metrics2*:org.apache.hadoop.hbase.io.compress* false diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css index 3f42f5ab61d2..9426cd67a4f3 100644 --- a/src/site/resources/css/site.css +++ b/src/site/resources/css/site.css @@ -29,10 +29,9 @@ li { line-height: 120%; } -div#topbar, +header#topbar, div#banner, -div#breadcrumbs, -div#bodyColumn, +main#bodyColumn, footer { width: initial; padding-left: 20px; @@ -52,9 +51,7 @@ div#search-form.navbar-search.pull-right { margin-left: 0; position: initial; } -li#publishDate.pull-right { - list-style: none; -} + .container, .navbar-static-top .container, .navbar-fixed-top .container, @@ -105,14 +102,13 @@ li#publishDate.pull-right { } /* Override weird body padding thing that causes scrolling */ -@media (max-width: 767px) -body { +@media (max-width: 767px) { + body { padding-right: 0; padding-left: 0; -} - -@media (max-width: 767px) -.navbar-fixed-top, .navbar-fixed-bottom, .navbar-static-top { - margin-left: 0; - margin-right: 0; + } + .navbar-fixed-top, .navbar-fixed-bottom, .navbar-static-top { + margin-left: 0; + margin-right: 0; + } } \ No newline at end of file diff --git a/src/site/site.xml b/src/site/site.xml index c430faf2753b..7d05b7419c28 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -33,9 +33,9 @@ my end-user's GAV for ease of releasing this to maven central until the upstream update happens and is released. See HBASE-14785 and HBASE-21005 for more info. --> - com.github.joshelser + org.apache.maven.skins maven-fluido-skin - 1.7.1-HBase + 1.12.0 @@ -50,6 +50,11 @@ false true » + + apache/hbase + right + red + @@ -67,7 +72,7 @@ images/hbase_logo_with_orca_large.png http://hbase.apache.org/ - + @@ -152,5 +157,17 @@ - +
+ + Copyright ©2007–${current.year} The Apache Software Foundation. All rights reserved.
+ Apache HBase, HBase, Apache, the Apache HBase logo and the ASF logo are either registered trademarks or trademarks of the Apache Software Foundation. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. + +
+ Last Published: ${current.date} +
+ ]]> +
+ diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 67d962baed2a..b2dac50bcb92 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -21,21 +21,21 @@ under the License. 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"> - Apache HBase™ Home + Apache HBase® Home -
-

Apache HBase™ is the Hadoop database, a distributed, scalable, big data store.

-

Use Apache HBase™ when you need random, realtime read/write access to your Big Data. +

+

Apache HBase® is the Hadoop database, a distributed, scalable, big data store.

+

Use Apache HBase® when you need random, realtime read/write access to your Big Data. This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters of commodity hardware. - Apache HBase is an open-source, distributed, versioned, non-relational database modeled after Google's Bigtable: A Distributed Storage System for Structured Data by Chang et al. - Just as Bigtable leverages the distributed data storage provided by the Google File System, Apache HBase provides Bigtable-like capabilities on top of Hadoop and HDFS. + Apache HBase® is an open-source, distributed, versioned, non-relational database modeled after Google's Bigtable: A Distributed Storage System for Structured Data by Chang et al. + Just as Bigtable leverages the distributed data storage provided by the Google File System, Apache HBase® provides Bigtable-like capabilities on top of Hadoop and HDFS.

-

Click here to download Apache HBase™.

+

Click here to download Apache HBase®.

@@ -44,7 +44,7 @@ under the License.

  • Strictly consistent reads and writes.
  • Automatic and configurable sharding of tables
  • Automatic failover support between RegionServers.
    • -
  • Convenient base classes for backing Hadoop MapReduce jobs with Apache HBase tables.
    • +
  • Convenient base classes for backing Hadoop MapReduce jobs with Apache HBase® tables.
  • Easy to use Java API for client access.
  • Block cache and Bloom Filters for real-time queries.
  • Query predicate push down via server side Filters
    • @@ -55,20 +55,20 @@ under the License.

    -

    See the Architecture Overview, the Apache HBase Reference Guide FAQ, and the other documentation links.

    +

    See the Architecture Overview, the Apache HBase® Reference Guide FAQ, and the other documentation links.

    Export Control

    The HBase distribution includes cryptographic software. See the export control notice here

    Code Of Conduct

    We expect participants in discussions on the HBase project mailing lists, Slack and IRC channels, and JIRA issues to abide by the Apache Software Foundation's Code of Conduct. More information can be found here.

    License
    -

    Apache HBase is licensed under the Apache License, Version 2.0

    +

    Apache HBase® is licensed under the Apache License, Version 2.0

    Trademarks

    Apache HBase, HBase, Apache, the Apache feather logo, and the Apache HBase project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.

    Thanks

    Thanks for all the sponsors, who are supporting Apache or supporting the HBase project!

    Security and Vulnerability information
    -

    See the Security chapter in the Apache HBase Reference Guide, and the general Apache Security information!

    +

    See the Security chapter in the Apache HBase® Reference Guide, and the general Apache Security information!