Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9B16C200BEB for ; Wed, 23 Nov 2016 00:21:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 99B26160B0C; Tue, 22 Nov 2016 23:21:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C0274160B1C for ; Wed, 23 Nov 2016 00:21:28 +0100 (CET) Received: (qmail 30177 invoked by uid 500); 22 Nov 2016 23:21:28 -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 30098 invoked by uid 99); 22 Nov 2016 23:21:28 -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; Tue, 22 Nov 2016 23:21:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CAB13E04BB; Tue, 22 Nov 2016 23:21:27 +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 Date: Tue, 22 Nov 2016 23:21:28 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] accumulo-website git commit: Jekyll build from master:b9e3c64 archived-at: Tue, 22 Nov 2016 23:21:29 -0000 Jekyll build from master:b9e3c64 Update docs for updating the website Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/bd585f68 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/bd585f68 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/bd585f68 Branch: refs/heads/asf-site Commit: bd585f68c4bec11fd5871652d774d2e55391902b Parents: 59a6d65 Author: Christopher Tubbs Authored: Tue Nov 22 18:15:43 2016 -0500 Committer: Christopher Tubbs Committed: Tue Nov 22 18:19:13 2016 -0500 ---------------------------------------------------------------------- contributor/releasing.html | 4 ++-- contributor/source.html | 6 +++--- feed.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/bd585f68/contributor/releasing.html ---------------------------------------------------------------------- diff --git a/contributor/releasing.html b/contributor/releasing.html index 9eec7f2..7135175 100644 --- a/contributor/releasing.html +++ b/contributor/releasing.html @@ -262,13 +262,13 @@ to avoid known vulnerabilities<
  • Unpack 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 gh-pages branch (you may need to move the contents of ./target/site/apidocs outside your git workspace to switch branches)
    • +
  • Checkout the master branch of the accumulo-website repo (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
  • 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
    • +
  • Don’t forget to push both the master and asf-site branches back to the accumulo-website repo
  • 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-website/blob/bd585f68/contributor/source.html ---------------------------------------------------------------------- diff --git a/contributor/source.html b/contributor/source.html index 79c168a..7223aaa 100644 --- a/contributor/source.html +++ b/contributor/source.html @@ -166,7 +166,7 @@

    Website

    Accumulo’s web site is developed using Jekyll. Development is -performed by editing the contents of the gh-pages branch, either +performed by editing the contents of the accumulo-website master 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 @@ -214,8 +214,8 @@ bundle install

    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 +

    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 master branch. You can also run this command manually:

    ./_devtools/git-hooks/post-commit

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/bd585f68/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 52cd0d1..6e3a8d1 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 
     https://accumulo.apache.org/
     
-    Mon, 21 Nov 2016 11:23:52 -0500
-    Mon, 21 Nov 2016 11:23:52 -0500
+    Tue, 22 Nov 2016 18:19:07 -0500
+    Tue, 22 Nov 2016 18:19:07 -0500
     Jekyll v3.3.0