hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject [18/23] hbase git commit: HBASE-14762 Update docs about publishing website to show gitsubpub method instead of svnsubpub
Date Thu, 05 Nov 2015 17:37:11 GMT
HBASE-14762 Update docs about publishing website to show gitsubpub method instead of svnsubpub

Also some reformatting to remove trailing whitespace and rewrap long lines.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c585072b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c585072b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c585072b

Branch: refs/heads/hbase-12439
Commit: c585072bc39bbfddb81d3cbafeeca0a83c523130
Parents: 9fc7858
Author: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Authored: Thu Nov 5 09:06:43 2015 +1000
Committer: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Committed: Thu Nov 5 09:17:37 2015 +1000

----------------------------------------------------------------------
 dev-support/publish_hbase_website.sh            | 260 -------------------
 .../appendix_contributing_to_documentation.adoc | 258 ++++++++++--------
 src/main/asciidoc/_chapters/developer.adoc      |  27 +-
 src/main/asciidoc/_chapters/preface.adoc        |  14 +-
 4 files changed, 165 insertions(+), 394 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c585072b/dev-support/publish_hbase_website.sh
----------------------------------------------------------------------
diff --git a/dev-support/publish_hbase_website.sh b/dev-support/publish_hbase_website.sh
deleted file mode 100755
index 1560bcf..0000000
--- a/dev-support/publish_hbase_website.sh
+++ /dev/null
@@ -1,260 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-USAGE="Usage: $0 [-i | -a] [-g <dir>] [-s <dir>]\n\
--h          Show this message\n\
--i          Prompts the user for input\n\
--a          Does not prompt the user. Potentially dangerous.\n\
--g          The local location of the HBase git repository\n\
--s          The local location of the HBase svn checkout\n\
-Either -i or -a is required.\n\
-Edit the script to set default Git and SVN directories."
-
-if [ "$#" == "0" ]; then
-  echo -e "$USAGE"
-  exit 1
-fi
-
-# Process args
-INTERACTIVE=0
-AUTO=0
-GIT_DIR=
-SVN_DIR=
-while getopts "hiag:s:" OPTION
-do
-  case $OPTION in
-    h)
-      echo -e "$USAGE"
-      exit
-      ;;
-    i)
-      if [ $AUTO -eq 1 ]; then
-        echo "Cannot specify both -i and -a."
-        echo -e "$USAGE"
-        exit 1
-      else
-        INTERACTIVE=1
-        AUTO=0
-      fi
-      ;;
-    a)
-      # We don't actually use this variable but require it to be
-      # set explicitly because it will commit changes without asking
-      if [ $INTERACTIVE -eq 1 ]; then
-        echo "Cannot specify both -i and -a."
-        echo -e "$USAGE"
-        exit 1
-      else
-        AUTO=1
-        INTERACTIVE=0
-      fi
-      ;;
-    g)
-      GIT_DIR=$OPTARG
-      if [ ! -d "$GIT_DIR/.git" ]; then
-        echo "Git directory $GIT_DIR does not exist or is not a Git repository."
-        exit 1
-      fi
-      ;;
-    s)
-      SVN_DIR=$OPTARG
-      if [ ! -d "$SVN_DIR/.svn" ]; then
-        echo "SVN directory $SVN_DIR does not exist or is not a Subversion repository."
-        exit 1
-      fi
-      ;;
-  esac
-done
-
-# Set GIT_DIR and SVN_DIR to defaults if not given
-if [ -z "$GIT_DIR" ]; then
-  GIT_DIR="$HOME/git/hbase"
-fi
-if [ -z "$SVN_DIR" ]; then
-  SVN_DIR="$HOME/svn/hbase.apache.org/trunk"
-fi
-
-export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx3g -XX:MaxPermSize=256m"}
-
-cd $GIT_DIR
-
-# Get the latest
-echo "Updating Git"
-git checkout -q master
-git pull -q
-status=$?
-if [ $status -ne 0 ]; then
-  echo "git pull command failed."
-  echo " Please examine and run this script again after you have corrected the problem."
-fi
-
-GIT_SHA=$(git log --pretty=format:%H -n1)
-
-# Generate the site to ~/git/hbase/target/site
-if [ $INTERACTIVE -eq 1 ]; then
-  read -p "Build the site? (y/n)" yn
-  case $yn in
-    [Yy]* )
-      echo "Building $GIT_SHA"
-      mvn clean site post-site site:stage
-      status=$?
-      if [ $status -ne 0 ]; then
-        echo "The site does not build. Aborting."
-        exit $status
-      fi
-      ;;
-    [Nn]* )
-      echo "Not building the site."
-      if [ -d target/staging ]; then
-        echo "Using site in $GIT_DIR/target/staging directory."
-      else
-        echo "Not building the site but $GIT_DIR/target/staging does not exist. Giving up."
-        exit 1
-      fi
-      ;;
-  esac
-else
-  echo "Building the site in auto mode."
-  mvn clean site post-site site:stage
-  status=$?
-  if [ $status != 0 ]; then
-    echo "The site does not build. Aborting."
-    exit $status
-  fi
-fi
-
-
-# Refresh the local copy of the live website
-echo "Updating Subversion."
-cd $SVN_DIR
-# Be aware that this will restore all the files deleted a few lines down
-# if you are debugging this script
-# and need to run it multiple times without svn committing
-svn update -q
-
-# Make a list of things that are in SVN but not the generated site
-# and not auto-generated
-# -- we might need to delete these
-# But we never want to delete images or logos
-
-stale_dirs_exist=0
-echo "The following DIRECTORIES (if any) might be stale:" |tee /tmp/out.txt
-find . -type d  ! -path '*0.94*' ! -path '*apidocs*' ! -path '*xref*' ! -path '*book*' !
-path '*svn*' | \
-  sed 's/\.\///g' | grep -v images | grep -v logos | grep -v img | grep -v css | \
-  while read i; do
-  if [ ! -d "$GIT_DIR/target/staging/$i" ]; then
-    echo $i
-    stale_dirs_exist=1
-  fi
-done
-
-stale_files_exist=0
-echo "The following FILES (if any) might be stale:" |tee -a /tmp/out.txt
-find . -type f  ! -path '*0.94*' ! -path '*apidocs*' ! -path '*xref*' ! -path '*book*' !
-path '*svn*' | \
-  sed 's/\.\///g' | grep -v images | grep -v logos | grep -v img | grep -v css | grep -v
hbase-default.xml | \
-  while read i; do
-  if [ ! -f "$GIT_DIR/target/staging/$i" ]; then
-    echo $i
-    stale_files_exist=1
-  fi
-done
-
-if [ $INTERACTIVE -eq 1 ]; then
-  if [ $stale_dirs_exist -eq 1 -o $stale_files_exist -eq 1 ]; then
-    read -p "Exit to take care of them? (y/n)" yn
-    case $yn in
-      [Yy]* )
-        exit
-        ;;
-      [Nn]* )
-        ;;
-      * ) echo "Please answer yes or no.";;
-    esac
-  fi
-else
-  if [ $stale_dirs_exist -eq 1 -o $stale_files_exist -eq 1 ]; then
-    echo "Stale files or directories exist, but not taking care of stale directories and
files in auto mode." |tee -a /tmp/out.txt
-    echo "If necessary, handle them in a manual commit."|tee -a /tmp/out.txt
-  fi
-fi
-
-# Delete known auto-generated  content from trunk
-echo "Deleting known auto-generated content from SVN"
-rm -rf apidocs devapidocs xref xref-test book book.html java.html apache_hbase_reference_guide.pdf*
-
-# Copy generated site to svn -- cp takes different options on Darwin and GNU
-echo "Copying the generated site to SVN"
-if [ `uname` == "Darwin" ]; then
-  COPYOPTS='-r'
-elif [ `uname` == "Linux" ]; then
-  COPYOPTS='-au'
-fi
-
-cp $COPYOPTS $GIT_DIR/target/staging/. .
-
-# Look for things we need to fix up in svn
-
-echo "Untracked files: svn add"
-svn status |grep '?' |sed -e "s/[[:space:]]//g"|cut -d '?' -f 2|while read i; do
-  svn add $i
-done
-
-echo "Locally deleted files: svn del"
-svn status |grep '!' |sed -e "s/[[:space:]]//g"|cut -d '!' -f 2|while read i; do
-  svn del $i
-done
-
-svn_added=$(svn status | grep ^A|wc -l|awk {'print $1'})
-svn_removed=$(svn status | grep ^D|wc -l|awk {'print $1'})
-svn_modified=$(svn status |grep ^M|wc -l|awk {'print $1'})
-
-echo -e "Published site at $GIT_SHA. \n\
-\n\
-Added $svn_added files. \n\
-Removed $svn_removed files. \n\
-Modified $svn_modified files." |tee /tmp/commit.txt
-
-if [ $INTERACTIVE -eq 1 ]; then
-  read -p "Commit changes? This will publish the website. (y/n)" yn
-  case $yn in
-  [Yy]* )
-    echo "Commit message:"
-    cat /tmp/commit.txt
-    svn commit -F /tmp/commit.txt
-    exit
-    ;;
-  [Nn]* )
-    read -p "Revert SVN changes? (y/n)" revert
-    case $revert in
-    [Yy]* )
-      svn revert -R .
-      svn update
-      exit
-      ;;
-    [Nn]* )
-      exit
-      ;;
-    esac
-    ;;
-  esac
-else
-  echo "Commit message:"
-  cat /tmp/commit.txt
-  svn commit -q -F /tmp/commit.txt
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hbase/blob/c585072b/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc b/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
index 6b31059..1b674e7 100644
--- a/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
+++ b/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
@@ -30,15 +30,14 @@
 :toc: left
 :source-language: java
 
-The Apache HBase project welcomes contributions to all aspects of the project, including
the documentation.
+The Apache HBase project welcomes contributions to all aspects of the project,
+including the documentation.
 
 In HBase, documentation includes the following areas, and probably some others:
 
 * The link:http://hbase.apache.org/book.html[HBase Reference
   Guide] (this book)
 * The link:http://hbase.apache.org/[HBase website]
-* The link:http://wiki.apache.org/hadoop/Hbase[HBase
-  Wiki]
 * API documentation
 * Command-line utility output and help text
 * Web UI strings, explicit help text, context-sensitive strings, and others
@@ -46,99 +45,121 @@ In HBase, documentation includes the following areas, and probably some
others:
 * Comments in source files, configuration files, and others
 * Localization of any of the above into target languages other than English
 
-No matter which area you want to help out with, the first step is almost always to download
(typically by cloning the Git repository) and familiarize yourself with the HBase source code.
-The only exception in the list above is the HBase Wiki, which is edited online.
-For information on downloading and building the source, see <<developer,developer>>.
-
-=== Getting Access to the Wiki
-
-The HBase Wiki is not well-maintained and much of its content has been moved into the HBase
Reference Guide (this guide). However, some pages on the Wiki are well maintained, and it
would be great to have some volunteers willing to help out with the Wiki.
-To request access to the Wiki, register a new account at link:https://wiki.apache.org/hadoop/Hbase?action=newaccount[https://wiki.apache.org/hadoop/Hbase?action=newaccount].
-Contact one of the HBase committers, who can either give you access or refer you to someone
who can.
+No matter which area you want to help out with, the first step is almost always
+to download (typically by cloning the Git repository) and familiarize yourself
+with the HBase source code. For information on downloading and building the source,
+see <<developer,developer>>.
 
 === Contributing to Documentation or Other Strings
 
-If you spot an error in a string in a UI, utility, script, log message, or elsewhere, or
you think something could be made more clear, or you think text needs to be added where it
doesn't currently exist, the first step is to file a JIRA.
-Be sure to set the component to `Documentation` in addition any other involved components.
-Most components have one or more default owners, who monitor new issues which come into those
queues.
-Regardless of whether you feel able to fix the bug, you should still file bugs where you
see them.
+If you spot an error in a string in a UI, utility, script, log message, or elsewhere,
+or you think something could be made more clear, or you think text needs to be added
+where it doesn't currently exist, the first step is to file a JIRA. Be sure to set
+the component to `Documentation` in addition any other involved components. Most
+components have one or more default owners, who monitor new issues which come into
+those queues. Regardless of whether you feel able to fix the bug, you should still
+file bugs where you see them.
 
 If you want to try your hand at fixing your newly-filed bug, assign it to yourself.
-You will need to clone the HBase Git repository to your local system and work on the issue
there.
-When you have developed a potential fix, submit it for review.
-If it addresses the issue and is seen as an improvement, one of the HBase committers will
commit it to one or more branches, as appropriate.
+You will need to clone the HBase Git repository to your local system and work on
+the issue there. When you have developed a potential fix, submit it for review.
+If it addresses the issue and is seen as an improvement, one of the HBase committers
+will commit it to one or more branches, as appropriate.
 
 .Procedure: Suggested Work flow for Submitting Patches
-This procedure goes into more detail than Git pros will need, but is included in this appendix
so that people unfamiliar with Git can feel confident contributing to HBase while they learn.
+This procedure goes into more detail than Git pros will need, but is included
+in this appendix so that people unfamiliar with Git can feel confident contributing
+to HBase while they learn.
 
 . If you have not already done so, clone the Git repository locally.
   You only need to do this once.
-. Fairly often, pull remote changes into your local repository by using the `git pull` command,
while your master branch is checked out.
+. Fairly often, pull remote changes into your local repository by using the
+`git pull` command, while your tracking branch is checked out.
 . For each issue you work on, create a new branch.
-  One convention that works well for naming the branches is to name a given branch the same
as the JIRA it relates to:
+  One convention that works well for naming the branches is to name a given branch
+  the same as the JIRA it relates to:
 +
 ----
 $ git checkout -b HBASE-123456
 ----
 
-. Make your suggested changes on your branch, committing your changes to your local repository
often.
-  If you need to switch to working on a different issue, remember to check out the appropriate
branch.
-. When you are ready to submit your patch, first be sure that HBase builds cleanly and behaves
as expected in your modified branch.
-  If you have made documentation changes, be sure the documentation and website builds by
running `mvn clean site`.
-+
-NOTE: Before you use the `site` target the very first time, be sure you have built HBase
at least once, in order to fetch all the Maven dependencies you need.
-+
-----
-$ mvn clean install -DskipTests               # Builds HBase
-----
-+
-----
-$ mvn clean site -DskipTests                  # Builds the website and documentation
-----
-+
-If any errors occur, address them.
-
-. If it takes you several days or weeks to implement your fix, or you know that the area
of the code you are working in has had a lot of changes lately, make sure you rebase your
branch against the remote master and take care of any conflicts before submitting your patch.
+. Make your suggested changes on your branch, committing your changes to your
+local repository often. If you need to switch to working on a different issue,
+remember to check out the appropriate branch.
+. When you are ready to submit your patch, first be sure that HBase builds cleanly
+and behaves as expected in your modified branch.
+. If you have made documentation changes, be sure the documentation and website
+builds by running `mvn clean site`.
+. If it takes you several days or weeks to implement your fix, or you know that
+the area of the code you are working in has had a lot of changes lately, make
+sure you rebase your branch against the remote master and take care of any conflicts
+before submitting your patch.
 +
 ----
-
 $ git checkout HBASE-123456
 $ git rebase origin/master
 ----
 
-. Generate your patch against the remote master.
-  Run the following command from the top level of your git repository (usually called `hbase`):
+. Generate your patch against the remote master. Run the following command from
+the top level of your git repository (usually called `hbase`):
 +
 ----
 $ git format-patch --stdout origin/master > HBASE-123456.patch
 ----
 +
 The name of the patch should contain the JIRA ID.
-Look over the patch file to be sure that you did not change any additional files by accident
and that there are no other surprises.
-When you are satisfied, attach the patch to the JIRA and click the btn:[Patch Available]
button.
-A reviewer will review your patch.
-If you need to submit a new version of the patch, leave the old one on the JIRA and add a
version number to the name of the new patch.
-
+. Look over the patch file to be sure that you did not change any additional files
+by accident and that there are no other surprises.
+. When you are satisfied, attach the patch to the JIRA and click the
+btn:[Patch Available] button. A reviewer will review your patch.
+. If you need to submit a new version of the patch, leave the old one on the
+JIRA and add a version number to the name of the new patch.
 . After a change has been committed, there is no need to keep your local branch around.
-  Instead you should run `git pull` to get the new change into your master branch.
 
 === Editing the HBase Website
 
 The source for the HBase website is in the HBase source, in the _src/main/site/_ directory.
-Within this directory, source for the individual pages is in the _xdocs/_ directory, and
images referenced in those pages are in the _images/_ directory.
+Within this directory, source for the individual pages is in the _xdocs/_ directory,
+and images referenced in those pages are in the _resources/images/_ directory.
 This directory also stores images used in the HBase Reference Guide.
 
-The website's pages are written in an HTML-like XML dialect called xdoc, which has a reference
guide at link:http://maven.apache.org/archives/maven-1.x/plugins/xdoc/reference/xdocs.html.
-You can edit these files in a plain-text editor, an IDE, or an XML editor such as XML Mind
XML Editor (XXE) or Oxygen XML Author. 
+The website's pages are written in an HTML-like XML dialect called xdoc, which
+has a reference guide at
+link:http://maven.apache.org/archives/maven-1.x/plugins/xdoc/reference/xdocs.html.
+You can edit these files in a plain-text editor, an IDE, or an XML editor such
+as XML Mind XML Editor (XXE) or Oxygen XML Author.
+
+To preview your changes, build the website using the `mvn clean site -DskipTests`
+command. The HTML output resides in the _target/site/_ directory.
+When you are satisfied with your changes, follow the procedure in
+<<submit_doc_patch_procedure,submit doc patch procedure>> to submit your patch.
 
-To preview your changes, build the website using the +mvn clean site
-                -DskipTests+ command.
-The HTML output resides in the _target/site/_ directory.
-When you are satisfied with your changes, follow the procedure in <<submit_doc_patch_procedure,submit
doc patch procedure>> to submit your patch.
+[[website_publish]]
+=== Publishing the HBase Website and Documentation
+
+HBase uses the ASF's `gitpubsub` mechanism.
+. After generating the website and documentation
+artifacts using `mvn clean site site:stage`, check out the `asf-site` repository.
+
+. Remove previously-generated content using the following command:
++
+----
+rm -rf rm -rf *apidocs* *xref* *book* *.html *.pdf* css js
+----
++
+WARNING: Do not remove the `0.94/` directory. To regenerate them, you must check out
+the 0.94 branch and run `mvn clean site site:stage` from there, and then copy the
+artifacts to the 0.94/ directory of the `asf-site` branch.
+
+. Copy the contents of `target/staging` to the branch.
+
+. Add and commit your changes, and submit a patch for review.
 
 === HBase Reference Guide Style Guide and Cheat Sheet
 
-The HBase Reference Guide is written in Asciidoc and built using link:http://asciidoctor.org[AsciiDoctor].
The following cheat sheet is included for your reference. More nuanced and comprehensive documentation
is available at link:http://asciidoctor.org/docs/user-manual/.
+The HBase Reference Guide is written in Asciidoc and built using link:http://asciidoctor.org[AsciiDoctor].
+The following cheat sheet is included for your reference. More nuanced and comprehensive
documentation
+is available at link:http://asciidoctor.org/docs/user-manual/.
 
 .AsciiDoc Cheat Sheet
 [cols="1,1,a",options="header"]
@@ -147,15 +168,15 @@ The HBase Reference Guide is written in Asciidoc and built using link:http://asc
 | A paragraph | a paragraph | Just type some text with a blank line at the top and bottom.
 | Add line breaks within a paragraph without adding blank lines | Manual line breaks | This
will break + at the plus sign. Or prefix the whole paragraph with a line containing '[%hardbreaks]'
 | Give a title to anything | Colored italic bold differently-sized text | .MyTitle (no space
between the period and the words) on the line before the thing to be titled
-| In-Line Code or commands | monospace | \`text`  
+| In-Line Code or commands | monospace | \`text`
 | In-line literal content (things to be typed exactly as shown) | bold mono | \*\`typethis`*
 | In-line replaceable content (things to substitute with your own values) | bold italic mono
| \*\_typesomething_*
-| Code blocks with highlighting | monospace, highlighted, preserve space | 
+| Code blocks with highlighting | monospace, highlighted, preserve space |
 ........
 [source,java]
----- 
-  myAwesomeCode() { 
-} 
+----
+  myAwesomeCode() {
+}
 ----
 ........
 | Code block included from a separate file | included just as though it were part of the
main file |
@@ -167,49 +188,49 @@ include\::path/to/app.rb[]
 ................
 | Include only part of a separate file | Similar to Javadoc | See link:http://asciidoctor.org/docs/user-manual/#by-tagged-regions
 | Filenames, directory names, new terms | italic | \_hbase-default.xml_
-| External naked URLs | A link with the URL as link text | 
+| External naked URLs | A link with the URL as link text |
 ----
 link:http://www.google.com
 ----
 
-| External URLs with text | A link with arbitrary link text | 
+| External URLs with text | A link with arbitrary link text |
 ----
 link:http://www.google.com[Google]
 ----
 
-| Create an internal anchor to cross-reference | not rendered | 
+| Create an internal anchor to cross-reference | not rendered |
 ----
 [[anchor_name]]
 ----
-| Cross-reference an existing anchor using its default title| an internal hyperlink using
the element title if available, otherwise using the anchor name | 
+| Cross-reference an existing anchor using its default title| an internal hyperlink using
the element title if available, otherwise using the anchor name |
 ----
 <<anchor_name>>
 ----
-| Cross-reference an existing anchor using custom text | an internal hyperlink using arbitrary
text | 
+| Cross-reference an existing anchor using custom text | an internal hyperlink using arbitrary
text |
 ----
 <<anchor_name,Anchor Text>>
 ----
-| A block image | The image with alt text | 
+| A block image | The image with alt text |
 ----
-image::sunset.jpg[Alt Text] 
+image::sunset.jpg[Alt Text]
 ----
 (put the image in the src/main/site/resources/images directory)
-| An inline image | The image with alt text, as part of the text flow | 
+| An inline image | The image with alt text, as part of the text flow |
 ----
 image:sunset.jpg [Alt Text]
 ----
 (only one colon)
-| Link to a remote image | show an image hosted elsewhere | 
+| Link to a remote image | show an image hosted elsewhere |
 ----
-image::http://inkscape.org/doc/examples/tux.svg[Tux,250,350] 
+image::http://inkscape.org/doc/examples/tux.svg[Tux,250,350]
 ----
 (or `image:`)
 | Add dimensions or a URL to the image | depends | inside the brackets after the alt text,
specify width, height and/or link="http://my_link.com"
-| A footnote | subscript link which takes you to the footnote | 
+| A footnote | subscript link which takes you to the footnote |
 ----
 Some text.footnote:[The footnote text.]
 ----
-| A note or warning with no title | The admonition image followed by the admonition | 
+| A note or warning with no title | The admonition image followed by the admonition |
 ----
 NOTE:My note here
 ----
@@ -217,7 +238,7 @@ NOTE:My note here
 ----
 WARNING:My warning here
 ----
-| A complex note | The note has a title and/or multiple paragraphs and/or code blocks or
lists, etc | 
+| A complex note | The note has a title and/or multiple paragraphs and/or code blocks or
lists, etc |
 ........
 .The Title
 [NOTE]
@@ -228,26 +249,26 @@ some source code
 ----
 ====
 ........
-| Bullet lists | bullet lists | 
+| Bullet lists | bullet lists |
 ----
 * list item 1
 ----
 (see http://asciidoctor.org/docs/user-manual/#unordered-lists)
-| Numbered lists | numbered list | 
+| Numbered lists | numbered list |
 ----
-. list item 2 
+. list item 2
 ----
 (see http://asciidoctor.org/docs/user-manual/#ordered-lists)
-| Checklists | Checked or unchecked boxes | 
+| Checklists | Checked or unchecked boxes |
 Checked:
 ----
-- [*] 
+- [*]
 ----
 Unchecked:
 ----
 - [ ]
 ----
-| Multiple levels of lists | bulleted or numbered or combo | 
+| Multiple levels of lists | bulleted or numbered or combo |
 ----
 . Numbered (1), at top level
 * Bullet (2), nested under 1
@@ -257,9 +278,9 @@ Unchecked:
 ** Bullet (6), nested under 5
 - [x] Checked (7), at top level
 ----
-| Labelled lists / variablelists | a list item title or summary followed by content | 
+| Labelled lists / variablelists | a list item title or summary followed by content |
 ----
-Title:: content 
+Title:: content
 
 Title::
   content
@@ -288,7 +309,7 @@ ____
 ........
 
 If you want to insert literal Asciidoc content that keeps being interpreted, when in doubt,
use eight dots as the delimiter at the top and bottom.
-| Nested Sections | chapter, section, sub-section, etc | 
+| Nested Sections | chapter, section, sub-section, etc |
 ----
 = Book (or chapter if the chapter can be built alone, see the leveloffset info below)
 
@@ -296,7 +317,7 @@ If you want to insert literal Asciidoc content that keeps being interpreted,
whe
 
 === Section (or subsection, etc)
 
-==== Subsection 
+==== Subsection
 ----
 
 and so on up to 6 levels (think carefully about going deeper than 4 levels, maybe you can
just titled paragraphs or lists instead). Note that you can include a book inside another
book by adding the `:leveloffset:+1` macro directive directly before your include, and resetting
it to 0 directly after. See the _book.adoc_ source for examples, as this is how this guide
handles chapters. *Don't do it for prefaces, glossaries, appendixes, or other special types
of chapters.*
@@ -309,7 +330,7 @@ include::[/path/to/file.adoc]
 
 For plenty of examples. see _book.adoc_.
 | A table | a table | See http://asciidoctor.org/docs/user-manual/#tables. Generally rows
are separated by newlines and columns by pipes
-| Comment out a single line | A  line is skipped during rendering | 
+| Comment out a single line | A  line is skipped during rendering |
 `+//+ This line won't show up`
 | Comment out a block | A section of the file is skipped during rendering |
 ----
@@ -317,7 +338,7 @@ For plenty of examples. see _book.adoc_.
 Nothing between the slashes will show up.
 ////
 ----
-| Highlight text for review | text shows up with yellow background | 
+| Highlight text for review | text shows up with yellow background |
 ----
 Test between #hash marks# is highlighted yellow.
 ----
@@ -326,20 +347,27 @@ Test between #hash marks# is highlighted yellow.
 
 === Auto-Generated Content
 
-Some parts of the HBase Reference Guide, most notably <<config.files,config.files>>,
are generated automatically, so that this area of the documentation stays in sync with the
code.
-This is done by means of an XSLT transform, which you can examine in the source at _src/main/xslt/configuration_to_asciidoc_chapter.xsl_.
-This transforms the _hbase-common/src/main/resources/hbase-default.xml_            file into
an Asciidoc output which can be included in the Reference Guide.
-Sometimes, it is necessary to add configuration parameters or modify their descriptions.
-Make the modifications to the source file, and they will be included in the Reference Guide
when it is rebuilt.
+Some parts of the HBase Reference Guide, most notably <<config.files,config.files>>,
+are generated automatically, so that this area of the documentation stays in
+sync with the code. This is done by means of an XSLT transform, which you can examine
+in the source at _src/main/xslt/configuration_to_asciidoc_chapter.xsl_. This
+transforms the _hbase-common/src/main/resources/hbase-default.xml_ file into an
+Asciidoc output which can be included in the Reference Guide.
 
-It is possible that other types of content can and will be automatically generated from HBase
source files in the future.
+Sometimes, it is necessary to add configuration parameters or modify their descriptions.
+Make the modifications to the source file, and they will be included in the
+Reference Guide when it is rebuilt.
 
+It is possible that other types of content can and will be automatically generated
+from HBase source files in the future.
 
 === Images in the HBase Reference Guide
 
-You can include images in the HBase Reference Guide. It is important to include an image
title if possible, and alternate text always. 
-This allows screen readers to navigate to the image and also provides alternative text for
the image.
-The following is an example of an image with a title and alternate text. Notice the double
colon.
+You can include images in the HBase Reference Guide. It is important to include
+an image title if possible, and alternate text always. This allows screen readers
+to navigate to the image and also provides alternative text for the image.
+The following is an example of an image with a title and alternate text. Notice
+the double colon.
 
 [source,asciidoc]
 ----
@@ -347,42 +375,53 @@ The following is an example of an image with a title and alternate text.
Notice
 image::sunset.jpg[Alt Text]
 ----
 
-Here is an example of an inline image with alternate text. Notice the single colon. Inline
images cannot have titles. They are generally small images like GUI buttons.
+Here is an example of an inline image with alternate text. Notice the single colon.
+Inline images cannot have titles. They are generally small images like GUI buttons.
 
 [source,asciidoc]
 ----
 image:sunset.jpg[Alt Text]
 ----
 
-
 When doing a local build, save the image to the _src/main/site/resources/images/_ directory.
 When you link to the image, do not include the directory portion of the path.
 The image will be copied to the appropriate target location during the build of the output.
 
-When you submit a patch which includes adding an image to the HBase Reference Guide, attach
the image to the JIRA.
-If the committer asks where the image should be committed, it should go into the above directory.
+When you submit a patch which includes adding an image to the HBase Reference Guide,
+attach the image to the JIRA. If the committer asks where the image should be
+committed, it should go into the above directory.
 
 === Adding a New Chapter to the HBase Reference Guide
 
-If you want to add a new chapter to the HBase Reference Guide, the easiest way is to copy
an existing chapter file, rename it, and change the ID (in double brackets) and title. Chapters
are located in the _src/main/asciidoc/_chapters/_ directory.
+If you want to add a new chapter to the HBase Reference Guide, the easiest way
+is to copy an existing chapter file, rename it, and change the ID (in double
+brackets) and title. Chapters are located in the _src/main/asciidoc/_chapters/_
+directory.
 
-Delete the existing content and create the new content.
-Then open the _src/main/asciidoc/book.adoc_ file, which is the main file for the HBase Reference
Guide, and copy an existing `include` element to include your new chapter in the appropriate
location.
-Be sure to add your new file to your Git repository before creating your patch.
+Delete the existing content and create the new content. Then open the
+_src/main/asciidoc/book.adoc_ file, which is the main file for the HBase Reference
+Guide, and copy an existing `include` element to include your new chapter in the
+appropriate location. Be sure to add your new file to your Git repository before
+creating your patch.
 
 When in doubt, check to see how other files have been included.
 
 === Common Documentation Issues
 
-The following documentation issues come up often.
-Some of these are preferences, but others can create mysterious build errors or other problems.
+The following documentation issues come up often. Some of these are preferences,
+but others can create mysterious build errors or other problems.
 
 [qanda]
 Isolate Changes for Easy Diff Review.::
-  Be careful with pretty-printing or re-formatting an entire XML file, even if the formatting
has degraded over time. If you need to reformat a file, do that in a separate JIRA where you
do not change any content. Be careful because some XML editors do a bulk-reformat when you
open a new file, especially if you use GUI mode in the editor.
+  Be careful with pretty-printing or re-formatting an entire XML file, even if
+  the formatting has degraded over time. If you need to reformat a file, do that
+  in a separate JIRA where you do not change any content. Be careful because some
+  XML editors do a bulk-reformat when you open a new file, especially if you use
+  GUI mode in the editor.
 
 Syntax Highlighting::
-  The HBase Reference Guide uses `coderay` for syntax highlighting. To enable syntax highlighting
for a given code listing, use the following type of syntax:
+  The HBase Reference Guide uses `coderay` for syntax highlighting. To enable
+  syntax highlighting for a given code listing, use the following type of syntax:
 +
 ........
 [source,xml]
@@ -391,5 +430,6 @@ Syntax Highlighting::
 ----
 ........
 +
-Several syntax types are supported. The most interesting ones for the HBase Reference Guide
are `java`, `xml`, `sql`, and `bash`.
+Several syntax types are supported. The most interesting ones for the HBase
+Reference Guide are `java`, `xml`, `sql`, and `bash`.
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/c585072b/src/main/asciidoc/_chapters/developer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc
index 163d47b..d1172ae 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -89,7 +89,7 @@ GIT is our repository of record for all but the Apache HBase website.
 We used to be on SVN.
 We migrated.
 See link:https://issues.apache.org/jira/browse/INFRA-7768[Migrate Apache HBase SVN Repos
to Git].
-Updating hbase.apache.org still requires use of SVN (See <<hbase.org,hbase.org>>).
See link:http://hbase.apache.org/source-repository.html[Source Code
+See link:http://hbase.apache.org/source-repository.html[Source Code
                 Management] page for contributor and committer links or seach for HBase on
the link:http://git.apache.org/[Apache Git] page.
 
 == IDEs
@@ -570,7 +570,8 @@ Checkin the _CHANGES.txt_ and any version changes.
 . Update the documentation.
 +
 Update the documentation under _src/main/asciidoc_.
-This usually involves copying the latest from master and making version-particular adjustments
to suit this release candidate version. 
+This usually involves copying the latest from master and making version-particular
+adjustments to suit this release candidate version.
 
 . Build the source tarball.
 +
@@ -616,7 +617,8 @@ $ mvn install -DskipTests site assembly:single -Prelease
 ----
 
 +
-Otherwise, the build complains that hbase modules are not in the maven repository when you
try to do it at once, especially on fresh repository.
+Otherwise, the build complains that hbase modules are not in the maven repository
+when you try to do it at once, especially on fresh repository.
 It seems that you need the install goal in both steps.
 +
 Extract the generated tarball and check it out.
@@ -771,24 +773,7 @@ See <<appendix_contributing_to_documentation,appendix contributing
to documentat
 [[hbase.org.site.publishing]]
 === Publishing link:http://hbase.apache.org[hbase.apache.org]
 
-As of link:https://issues.apache.org/jira/browse/INFRA-5680[INFRA-5680 Migrate apache hbase
website], to publish the website, build it using Maven, and then deploy it over a checkout
of _https://svn.apache.org/repos/asf/hbase/hbase.apache.org/trunk_                and check
in your changes.
-The script _dev-scripts/publish_hbase_website.sh_ is provided to automate this process and
to be sure that stale files are removed from SVN.
-Review the script even if you decide to publish the website manually.
-Use the script as follows:
-
-----
-$ publish_hbase_website.sh -h
-Usage: publish_hbase_website.sh [-i | -a] [-g <dir>] [-s <dir>]
- -h          Show this message
- -i          Prompts the user for input
- -a          Does not prompt the user. Potentially dangerous.
- -g          The local location of the HBase git repository
- -s          The local location of the HBase svn checkout
- Either --interactive or --silent is required.
- Edit the script to set default Git and SVN directories.
-----
-
-NOTE: The SVN commit takes a long time.
+See <<website_publish>> for instructions on publishing the website and documentation.
 
 [[hbase.tests]]
 == Tests

http://git-wip-us.apache.org/repos/asf/hbase/blob/c585072b/src/main/asciidoc/_chapters/preface.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/preface.adoc b/src/main/asciidoc/_chapters/preface.adoc
index b2a7ef0..50df7ff 100644
--- a/src/main/asciidoc/_chapters/preface.adoc
+++ b/src/main/asciidoc/_chapters/preface.adoc
@@ -35,17 +35,23 @@ in link:http://hbase.apache.org/apidocs/index.html[Javadoc] or
 link:https://issues.apache.org/jira/browse/HBASE[JIRA] where the pertinent information can
be found.
 
 .About This Guide
-This reference guide is a work in progress. The source for this guide can be found in the
_src/main/asciidoc directory of the HBase source. This reference guide is marked up using
link:http://asciidoc.org/[AsciiDoc] from which the finished guide is generated as part of
the 'site' build target. Run
+This reference guide is a work in progress. The source for this guide can be found in the
+_src/main/asciidoc directory of the HBase source. This reference guide is marked up
+using link:http://asciidoc.org/[AsciiDoc] from which the finished guide is generated as part
of the
+'site' build target. Run
 [source,bourne]
 ----
 mvn site
 ----
 to generate this documentation.
 Amendments and improvements to the documentation are welcomed.
-Click link:https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310753&issuetype=1&components=12312132&summary=SHORT+DESCRIPTION[this
link] to file a new documentation bug against Apache HBase with some values pre-selected.
+Click
+link:https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310753&issuetype=1&components=12312132&summary=SHORT+DESCRIPTION[this
link]
+to file a new documentation bug against Apache HBase with some values pre-selected.
 
 .Contributing to the Documentation
-For an overview of AsciiDoc and suggestions to get started contributing to the documentation,
see the <<appendix_contributing_to_documentation,relevant section later in this documentation>>.
+For an overview of AsciiDoc and suggestions to get started contributing to the documentation,
+see the <<appendix_contributing_to_documentation,relevant section later in this documentation>>.
 
 .Heads-up if this is your first foray into the world of distributed computing...
 If this is your first foray into the wonderful world of Distributed Computing, then you are
in for some interesting times.
@@ -60,7 +66,7 @@ Yours, the HBase Community.
 
 .Reporting Bugs
 
-Please use link:https://issues.apache.org/jira/browse/hbase[JIRA] to report non-security-related
bugs. 
+Please use link:https://issues.apache.org/jira/browse/hbase[JIRA] to report non-security-related
bugs.
 
 To protect existing HBase installations from new vulnerabilities, please *do not* use JIRA
to report security-related bugs. Instead, send your report to the mailing list private@apache.org,
which allows anyone to send messages, but restricts who can read them. Someone on that list
will contact you to follow up on your report.
 


Mime
View raw message