Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 35B7D19A89 for ; Mon, 14 Mar 2016 23:52:09 +0000 (UTC) Received: (qmail 59025 invoked by uid 500); 14 Mar 2016 23:52:09 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 58990 invoked by uid 500); 14 Mar 2016 23:52:09 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 58981 invoked by uid 99); 14 Mar 2016 23:52:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Mar 2016 23:52:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F10E6DFAFF; Mon, 14 Mar 2016 23:52:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Message-Id: <31a83a645e0e42b6a23f903dee897c9f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: accumulo git commit: Jekyll build from gh-pages:3de6faf Date: Mon, 14 Mar 2016 23:52:08 +0000 (UTC) Repository: accumulo Updated Branches: refs/heads/asf-site 4f9846846 -> 30999fdbe Jekyll build from gh-pages:3de6faf Remove conflicting index file from 'jekyll new' and use jekyll --safe Update site instructions Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/30999fdb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/30999fdb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/30999fdb Branch: refs/heads/asf-site Commit: 30999fdbe3b391ce9797cc1d5cae76dc9d23faa2 Parents: 4f98468 Author: Christopher Tubbs Authored: Mon Mar 14 18:53:18 2016 -0400 Committer: Christopher Tubbs Committed: Mon Mar 14 19:47:47 2016 -0400 ---------------------------------------------------------------------- css/main.css | 637 +++++++++++++++------------------------------------- feed.xml | 4 +- releasing.html | 12 +- source.html | 41 +++- 4 files changed, 225 insertions(+), 469 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/30999fdb/css/main.css ---------------------------------------------------------------------- diff --git a/css/main.css b/css/main.css index 1fb1692..abcaccb 100644 --- a/css/main.css +++ b/css/main.css @@ -1,457 +1,180 @@ -/** - * Reset some basic elements - */ -body, h1, h2, h3, h4, h5, h6, -p, blockquote, pre, hr, -dl, dd, ol, ul, figure { - margin: 0; - padding: 0; } - -/** - * Basic styling - */ -body { - font: 400 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif; - color: #111; - background-color: #fdfdfd; - -webkit-text-size-adjust: 100%; - -webkit-font-feature-settings: "kern" 1; - -moz-font-feature-settings: "kern" 1; - -o-font-feature-settings: "kern" 1; - font-feature-settings: "kern" 1; - font-kerning: normal; } - -/** - * Set `margin-bottom` to maintain vertical rhythm - */ -h1, h2, h3, h4, h5, h6, -p, blockquote, pre, -ul, ol, dl, figure, -.highlight { - margin-bottom: 15px; } - -/** - * Images - */ -img { - max-width: 100%; - vertical-align: middle; } - -/** - * Figures - */ -figure > img { - display: block; } - -figcaption { - font-size: 14px; } - -/** - * Lists - */ -ul, ol { - margin-left: 30px; } - -li > ul, -li > ol { - margin-bottom: 0; } - -/** - * Headings - */ -h1, h2, h3, h4, h5, h6 { - font-weight: 400; } - -/** - * Links - */ -a { - color: #2a7ae2; - text-decoration: none; } - a:visited { - color: #1756a9; } - a:hover { - color: #111; - text-decoration: underline; } - -/** - * Blockquotes - */ -blockquote { - color: #828282; - border-left: 4px solid #e8e8e8; - padding-left: 15px; - font-size: 18px; - letter-spacing: -1px; - font-style: italic; } - blockquote > :last-child { - margin-bottom: 0; } - -/** - * Code formatting - */ -pre, -code { - font-size: 15px; - border: 1px solid #e8e8e8; - border-radius: 3px; - background-color: #eef; } - -code { - padding: 1px 5px; } - -pre { - padding: 8px 12px; - overflow-x: auto; } - pre > code { - border: 0; - padding-right: 0; - padding-left: 0; } - -/** - * Wrapper - */ -.wrapper { - max-width: -webkit-calc(800px - (30px * 2)); - max-width: calc(800px - (30px * 2)); - margin-right: auto; - margin-left: auto; - padding-right: 30px; - padding-left: 30px; } - @media screen and (max-width: 800px) { - .wrapper { - max-width: -webkit-calc(800px - (30px)); - max-width: calc(800px - (30px)); - padding-right: 15px; - padding-left: 15px; } } - -/** - * Clearfix - */ -.wrapper:after, .footer-col-wrapper:after { - content: ""; - display: table; - clear: both; } - -/** - * Icons - */ -.icon > svg { - display: inline-block; - width: 16px; - height: 16px; - vertical-align: middle; } - .icon > svg path { - fill: #828282; } - -/** - * Site header - */ -.site-header { - border-top: 5px solid #424242; - border-bottom: 1px solid #e8e8e8; - min-height: 56px; - position: relative; } - -.site-title { - font-size: 26px; - font-weight: 300; - line-height: 56px; - letter-spacing: -1px; - margin-bottom: 0; - float: left; } - .site-title, .site-title:visited { - color: #424242; } - -.site-nav { - float: right; - line-height: 56px; } - .site-nav .menu-icon { - display: none; } - .site-nav .page-link { - color: #111; - line-height: 1.5; } - .site-nav .page-link:not(:last-child) { - margin-right: 20px; } - @media screen and (max-width: 600px) { - .site-nav { - position: absolute; - top: 9px; - right: 15px; - background-color: #fdfdfd; - border: 1px solid #e8e8e8; - border-radius: 5px; - text-align: right; } - .site-nav .menu-icon { - display: block; - float: right; - width: 36px; - height: 26px; - line-height: 0; - padding-top: 10px; - text-align: center; } - .site-nav .menu-icon > svg { - width: 18px; - height: 15px; } - .site-nav .menu-icon > svg path { - fill: #424242; } - .site-nav .trigger { - clear: both; - display: none; } - .site-nav:hover .trigger { - display: block; - padding-bottom: 5px; } - .site-nav .page-link { - display: block; - padding: 5px 10px; - margin-left: 20px; } - .site-nav .page-link:not(:last-child) { - margin-right: 0; } } - -/** - * Site footer - */ -.site-footer { - border-top: 1px solid #e8e8e8; - padding: 30px 0; } - -.footer-heading { - font-size: 18px; - margin-bottom: 15px; } - -.contact-list, -.social-media-list { - list-style: none; - margin-left: 0; } - -.footer-col-wrapper { - font-size: 15px; - color: #828282; - margin-left: -15px; } - -.footer-col { - float: left; - margin-bottom: 15px; - padding-left: 15px; } - -.footer-col-1 { - width: -webkit-calc(35% - (30px / 2)); - width: calc(35% - (30px / 2)); } - -.footer-col-2 { - width: -webkit-calc(20% - (30px / 2)); - width: calc(20% - (30px / 2)); } - -.footer-col-3 { - width: -webkit-calc(45% - (30px / 2)); - width: calc(45% - (30px / 2)); } - -@media screen and (max-width: 800px) { - .footer-col-1, - .footer-col-2 { - width: -webkit-calc(50% - (30px / 2)); - width: calc(50% - (30px / 2)); } - - .footer-col-3 { - width: -webkit-calc(100% - (30px / 2)); - width: calc(100% - (30px / 2)); } } -@media screen and (max-width: 600px) { - .footer-col { - float: none; - width: -webkit-calc(100% - (30px / 2)); - width: calc(100% - (30px / 2)); } } -/** - * Page content - */ -.page-content { - padding: 30px 0; } - -.page-heading { - font-size: 20px; } - -.post-list { - margin-left: 0; - list-style: none; } - .post-list > li { - margin-bottom: 30px; } - -.post-meta { - font-size: 14px; - color: #828282; } - -.post-link { - display: block; - font-size: 24px; } - -/** - * Posts - */ -.post-header { - margin-bottom: 30px; } - -.post-title { - font-size: 42px; - letter-spacing: -1px; - line-height: 1; } - @media screen and (max-width: 800px) { - .post-title { - font-size: 36px; } } - -.post-content { - margin-bottom: 30px; } - .post-content h2 { - font-size: 32px; } - @media screen and (max-width: 800px) { - .post-content h2 { - font-size: 28px; } } - .post-content h3 { - font-size: 26px; } - @media screen and (max-width: 800px) { - .post-content h3 { - font-size: 22px; } } - .post-content h4 { - font-size: 20px; } - @media screen and (max-width: 800px) { - .post-content h4 { - font-size: 18px; } } - -/** - * Syntax highlighting styles - */ -.highlight { - background: #fff; } - .highlighter-rouge .highlight { - background: #eef; } - .highlight .c { - color: #998; - font-style: italic; } - .highlight .err { - color: #a61717; - background-color: #e3d2d2; } - .highlight .k { - font-weight: bold; } - .highlight .o { - font-weight: bold; } - .highlight .cm { - color: #998; - font-style: italic; } - .highlight .cp { - color: #999; - font-weight: bold; } - .highlight .c1 { - color: #998; - font-style: italic; } - .highlight .cs { - color: #999; - font-weight: bold; - font-style: italic; } - .highlight .gd { - color: #000; - background-color: #fdd; } - .highlight .gd .x { - color: #000; - background-color: #faa; } - .highlight .ge { - font-style: italic; } - .highlight .gr { - color: #a00; } - .highlight .gh { - color: #999; } - .highlight .gi { - color: #000; - background-color: #dfd; } - .highlight .gi .x { - color: #000; - background-color: #afa; } - .highlight .go { - color: #888; } - .highlight .gp { - color: #555; } - .highlight .gs { - font-weight: bold; } - .highlight .gu { - color: #aaa; } - .highlight .gt { - color: #a00; } - .highlight .kc { - font-weight: bold; } - .highlight .kd { - font-weight: bold; } - .highlight .kp { - font-weight: bold; } - .highlight .kr { - font-weight: bold; } - .highlight .kt { - color: #458; - font-weight: bold; } - .highlight .m { - color: #099; } - .highlight .s { - color: #d14; } - .highlight .na { - color: #008080; } - .highlight .nb { - color: #0086B3; } - .highlight .nc { - color: #458; - font-weight: bold; } - .highlight .no { - color: #008080; } - .highlight .ni { - color: #800080; } - .highlight .ne { - color: #900; - font-weight: bold; } - .highlight .nf { - color: #900; - font-weight: bold; } - .highlight .nn { - color: #555; } - .highlight .nt { - color: #000080; } - .highlight .nv { - color: #008080; } - .highlight .ow { - font-weight: bold; } - .highlight .w { - color: #bbb; } - .highlight .mf { - color: #099; } - .highlight .mh { - color: #099; } - .highlight .mi { - color: #099; } - .highlight .mo { - color: #099; } - .highlight .sb { - color: #d14; } - .highlight .sc { - color: #d14; } - .highlight .sd { - color: #d14; } - .highlight .s2 { - color: #d14; } - .highlight .se { - color: #d14; } - .highlight .sh { - color: #d14; } - .highlight .si { - color: #d14; } - .highlight .sx { - color: #d14; } - .highlight .sr { - color: #009926; } - .highlight .s1 { - color: #d14; } - .highlight .ss { - color: #990073; } - .highlight .bp { - color: #999; } - .highlight .vc { - color: #008080; } - .highlight .vg { - color: #008080; } - .highlight .vi { - color: #008080; } - .highlight .il { - color: #099; } +/** Reset some basic elements */ +body, h1, h2, h3, h4, h5, h6, p, blockquote, pre, hr, dl, dd, ol, ul, figure { margin: 0; padding: 0; } + +/** Basic styling */ +body { font: 400 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif; color: #111; background-color: #fdfdfd; -webkit-text-size-adjust: 100%; -webkit-font-feature-settings: "kern" 1; -moz-font-feature-settings: "kern" 1; -o-font-feature-settings: "kern" 1; font-feature-settings: "kern" 1; font-kerning: normal; } + +/** Set `margin-bottom` to maintain vertical rhythm */ +h1, h2, h3, h4, h5, h6, p, blockquote, pre, ul, ol, dl, figure, .highlight { margin-bottom: 15px; } + +/** Images */ +img { max-width: 100%; vertical-align: middle; } + +/** Figures */ +figure > img { display: block; } + +figcaption { font-size: 14px; } + +/** Lists */ +ul, ol { margin-left: 30px; } + +li > ul, li > ol { margin-bottom: 0; } + +/** Headings */ +h1, h2, h3, h4, h5, h6 { font-weight: 400; } + +/** Links */ +a { color: #2a7ae2; text-decoration: none; } +a:visited { color: #1756a9; } +a:hover { color: #111; text-decoration: underline; } + +/** Blockquotes */ +blockquote { color: #828282; border-left: 4px solid #e8e8e8; padding-left: 15px; font-size: 18px; letter-spacing: -1px; font-style: italic; } +blockquote > :last-child { margin-bottom: 0; } + +/** Code formatting */ +pre, code { font-size: 15px; border: 1px solid #e8e8e8; border-radius: 3px; background-color: #eef; } + +code { padding: 1px 5px; } + +pre { padding: 8px 12px; overflow-x: auto; } +pre > code { border: 0; padding-right: 0; padding-left: 0; } + +/** Wrapper */ +.wrapper { max-width: -webkit-calc(800px - (30px * 2)); max-width: calc(800px - (30px * 2)); margin-right: auto; margin-left: auto; padding-right: 30px; padding-left: 30px; } +@media screen and (max-width: 800px) { .wrapper { max-width: -webkit-calc(800px - (30px)); max-width: calc(800px - (30px)); padding-right: 15px; padding-left: 15px; } } + +/** Clearfix */ +.wrapper:after, .footer-col-wrapper:after { content: ""; display: table; clear: both; } + +/** Icons */ +.icon > svg { display: inline-block; width: 16px; height: 16px; vertical-align: middle; } +.icon > svg path { fill: #828282; } + +/** Site header */ +.site-header { border-top: 5px solid #424242; border-bottom: 1px solid #e8e8e8; min-height: 56px; position: relative; } + +.site-title { font-size: 26px; font-weight: 300; line-height: 56px; letter-spacing: -1px; margin-bottom: 0; float: left; } +.site-title, .site-title:visited { color: #424242; } + +.site-nav { float: right; line-height: 56px; } +.site-nav .menu-icon { display: none; } +.site-nav .page-link { color: #111; line-height: 1.5; } +.site-nav .page-link:not(:last-child) { margin-right: 20px; } +@media screen and (max-width: 600px) { .site-nav { position: absolute; top: 9px; right: 15px; background-color: #fdfdfd; border: 1px solid #e8e8e8; border-radius: 5px; text-align: right; } + .site-nav .menu-icon { display: block; float: right; width: 36px; height: 26px; line-height: 0; padding-top: 10px; text-align: center; } + .site-nav .menu-icon > svg { width: 18px; height: 15px; } + .site-nav .menu-icon > svg path { fill: #424242; } + .site-nav .trigger { clear: both; display: none; } + .site-nav:hover .trigger { display: block; padding-bottom: 5px; } + .site-nav .page-link { display: block; padding: 5px 10px; margin-left: 20px; } + .site-nav .page-link:not(:last-child) { margin-right: 0; } } + +/** Site footer */ +.site-footer { border-top: 1px solid #e8e8e8; padding: 30px 0; } + +.footer-heading { font-size: 18px; margin-bottom: 15px; } + +.contact-list, .social-media-list { list-style: none; margin-left: 0; } + +.footer-col-wrapper { font-size: 15px; color: #828282; margin-left: -15px; } + +.footer-col { float: left; margin-bottom: 15px; padding-left: 15px; } + +.footer-col-1 { width: -webkit-calc(35% - (30px / 2)); width: calc(35% - (30px / 2)); } + +.footer-col-2 { width: -webkit-calc(20% - (30px / 2)); width: calc(20% - (30px / 2)); } + +.footer-col-3 { width: -webkit-calc(45% - (30px / 2)); width: calc(45% - (30px / 2)); } + +@media screen and (max-width: 800px) { .footer-col-1, .footer-col-2 { width: -webkit-calc(50% - (30px / 2)); width: calc(50% - (30px / 2)); } + .footer-col-3 { width: -webkit-calc(100% - (30px / 2)); width: calc(100% - (30px / 2)); } } +@media screen and (max-width: 600px) { .footer-col { float: none; width: -webkit-calc(100% - (30px / 2)); width: calc(100% - (30px / 2)); } } +/** Page content */ +.page-content { padding: 30px 0; } + +.page-heading { font-size: 20px; } + +.post-list { margin-left: 0; list-style: none; } +.post-list > li { margin-bottom: 30px; } + +.post-meta { font-size: 14px; color: #828282; } + +.post-link { display: block; font-size: 24px; } + +/** Posts */ +.post-header { margin-bottom: 30px; } + +.post-title { font-size: 42px; letter-spacing: -1px; line-height: 1; } +@media screen and (max-width: 800px) { .post-title { font-size: 36px; } } + +.post-content { margin-bottom: 30px; } +.post-content h2 { font-size: 32px; } +@media screen and (max-width: 800px) { .post-content h2 { font-size: 28px; } } +.post-content h3 { font-size: 26px; } +@media screen and (max-width: 800px) { .post-content h3 { font-size: 22px; } } +.post-content h4 { font-size: 20px; } +@media screen and (max-width: 800px) { .post-content h4 { font-size: 18px; } } + +/** Syntax highlighting styles */ +.highlight { background: #fff; } +.highlighter-rouge .highlight { background: #eef; } +.highlight .c { color: #998; font-style: italic; } +.highlight .err { color: #a61717; background-color: #e3d2d2; } +.highlight .k { font-weight: bold; } +.highlight .o { font-weight: bold; } +.highlight .cm { color: #998; font-style: italic; } +.highlight .cp { color: #999; font-weight: bold; } +.highlight .c1 { color: #998; font-style: italic; } +.highlight .cs { color: #999; font-weight: bold; font-style: italic; } +.highlight .gd { color: #000; background-color: #fdd; } +.highlight .gd .x { color: #000; background-color: #faa; } +.highlight .ge { font-style: italic; } +.highlight .gr { color: #a00; } +.highlight .gh { color: #999; } +.highlight .gi { color: #000; background-color: #dfd; } +.highlight .gi .x { color: #000; background-color: #afa; } +.highlight .go { color: #888; } +.highlight .gp { color: #555; } +.highlight .gs { font-weight: bold; } +.highlight .gu { color: #aaa; } +.highlight .gt { color: #a00; } +.highlight .kc { font-weight: bold; } +.highlight .kd { font-weight: bold; } +.highlight .kp { font-weight: bold; } +.highlight .kr { font-weight: bold; } +.highlight .kt { color: #458; font-weight: bold; } +.highlight .m { color: #099; } +.highlight .s { color: #d14; } +.highlight .na { color: #008080; } +.highlight .nb { color: #0086B3; } +.highlight .nc { color: #458; font-weight: bold; } +.highlight .no { color: #008080; } +.highlight .ni { color: #800080; } +.highlight .ne { color: #900; font-weight: bold; } +.highlight .nf { color: #900; font-weight: bold; } +.highlight .nn { color: #555; } +.highlight .nt { color: #000080; } +.highlight .nv { color: #008080; } +.highlight .ow { font-weight: bold; } +.highlight .w { color: #bbb; } +.highlight .mf { color: #099; } +.highlight .mh { color: #099; } +.highlight .mi { color: #099; } +.highlight .mo { color: #099; } +.highlight .sb { color: #d14; } +.highlight .sc { color: #d14; } +.highlight .sd { color: #d14; } +.highlight .s2 { color: #d14; } +.highlight .se { color: #d14; } +.highlight .sh { color: #d14; } +.highlight .si { color: #d14; } +.highlight .sx { color: #d14; } +.highlight .sr { color: #009926; } +.highlight .s1 { color: #d14; } +.highlight .ss { color: #990073; } +.highlight .bp { color: #999; } +.highlight .vc { color: #008080; } +.highlight .vg { color: #008080; } +.highlight .vi { color: #008080; } +.highlight .il { color: #099; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/30999fdb/feed.xml ---------------------------------------------------------------------- diff --git a/feed.xml b/feed.xml index 8d08ec4..d2d49a0 100644 --- a/feed.xml +++ b/feed.xml @@ -6,8 +6,8 @@ https://accumulo.apache.org// - Sat, 12 Mar 2016 23:55:40 -0500 - Sat, 12 Mar 2016 23:55:40 -0500 + Mon, 14 Mar 2016 19:47:30 -0400 + Mon, 14 Mar 2016 19:47:30 -0400 Jekyll v3.1.2 http://git-wip-us.apache.org/repos/asf/accumulo/blob/30999fdb/releasing.html ---------------------------------------------------------------------- diff --git a/releasing.html b/releasing.html index 4abf0e8..30b6c0c 100644 --- a/releasing.html +++ b/releasing.html @@ -309,13 +309,13 @@ to avoid known vulnerabilitiesUnpack the source release tarball and change to its root directory, or checkout the SCM tag for the release
  • Build the javadocs with mvn clean package javadoc:aggregate -DskipTests -Paggregate-javadocs
  • Take note that the javadocs you will need to copy are the entire contents of ./target/site/apidocs/
    • -
  • Checkout the Accumulo CMS repository
    • -
  • Remove any existing apidocs from the appropriate version folder in the CMS repository (e.g. content/1.6/apidocs for a 1.6.x release)
    • -
  • Copy the entire contents of the new apidocs directory (identified in step 3) to the CMS repository (e.g. to content/1.6/apidocs)
    • +
  • Checkout the gh-pages branch (you may need to move the contents of ./target/site/apidocs outside your git workspace to switch branches)
    • +
  • Remove any existing apidocs from the appropriate version folder (e.g. 1.6/apidocs for a 1.6.x release)
    • +
  • Copy the entire contents of the new apidocs directory (identified in step 3) to the destination (e.g. to 1.6/apidocs)
    • +
  • Continue updating the site content, as needed
  • Commit the changes
    • -
  • Wait for the staging build to complete
    • -
  • Verify the javadocs have been published to the staging site (e.g. https://accumulo.staging.apache.org/1.6/apidocs)
    • -
  • Continue updating the staging site, as needed, and publish when done
    • +
  • Update the site using jekyll with ./_devtools/git-hooks/post-commit (if you don’t have the commit hook already configured)
    • +
  • Don’t forget to push both the gh-pages and asf-site branches
  • Verify that javadocs have been updated on the production site (e.g. https://accumulo.apache.org/1.6/apidocs)
    • http://git-wip-us.apache.org/repos/asf/accumulo/blob/30999fdb/source.html ---------------------------------------------------------------------- diff --git a/source.html b/source.html index 4856e0a..1de9812 100644 --- a/source.html +++ b/source.html @@ -213,9 +213,42 @@ if (ga.hasOwnProperty('loaded') && ga.loaded === true) {

    Website

    -

    Accumulo’s web site is maintained with Apache Subversion here using Apache’s Content Management System. -Committers may edit the site by following these instructions. Non-committers should follow -this FAQ entry.

    +

    Accumulo’s web site is developed using Jekyll. Development is +performed by editing the contents of the gh-pages branch, either +directly by a committer, with a pull request to GitHub, or a patch +submitted to JIRA. The rendered site can be previewed locally or on +GitHub, and the rendered site (in the _site directory) will be +merged into the asf-site branch to update our official/canonical +site after being built with the _config-asf.yml configuration.

    + +

    To get help with jekyll:

    + +
    jekyll help
+
    +
    + +

    To test the site locally (usually on http://localhost:4000):

    + +
    jekyll serve --config _config-asf.yml --safe
+
    +
    + +

    To build for updating the asf-site branch:

    + +
    jekyll build --config _config-asf.yml --safe
+
    +
    + +

    For preview convenience and consistent builds and testing, build using a +version which looks the same locally and on GitHub.

    + +

    A post-commit hook is available for you to automatically create a +commit in the asf-site branch locally each time you commit to the gh-pages +branch. You can also run this command manually:

    + +
    ./_devtools/git-hooks/post-commit
+
    +

    Developer’s Guide

    @@ -319,7 +352,7 @@ nothing to commit (working directory clean)

    Issue Tracking

    -

    Accumulo tracks issues with JIRA. Every commit should reference a JIRA ticket of the form ACCUMULO-#.

    +

    Accumulo tracks issues with JIRA. Every commit should reference a JIRA ticket of the form ACCUMULO-#.

    Merging Practices