accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [2/2] accumulo-website git commit: Jekyll build from master:b9e3c64
Date Tue, 22 Nov 2016 23:21:28 GMT
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 <ctubbsii@apache.org>
Authored: Tue Nov 22 18:15:43 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
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 <a href="https://www.kb.cert.org/vuls/id/225657">vulnerabilities<
   <li>Unpack the source release tarball and change to its root directory, or checkout
the SCM tag for the release</li>
   <li>Build the javadocs with <code class="highlighter-rouge">mvn clean package
javadoc:aggregate -DskipTests -Paggregate-javadocs</code></li>
   <li>Take note that the javadocs you will need to copy are the entire contents of
<code class="highlighter-rouge">./target/site/apidocs/</code></li>
-  <li>Checkout the <code class="highlighter-rouge">gh-pages</code> branch
(you may need to move the contents of <code class="highlighter-rouge">./target/site/apidocs</code>
outside your git workspace to switch branches)</li>
+  <li>Checkout the <code class="highlighter-rouge">master</code> branch
of the accumulo-website repo (you may need to move the contents of <code class="highlighter-rouge">./target/site/apidocs</code>
outside your git workspace to switch branches)</li>
   <li>Remove any existing apidocs from the appropriate version folder (e.g. 1.6/apidocs
for a 1.6.x release)</li>
   <li>Copy the entire contents of the new apidocs directory (identified in step 3)
to the destination (e.g. to 1.6/apidocs)</li>
   <li>Continue updating the site content, as needed</li>
   <li>Commit the changes</li>
   <li>Update the site using jekyll with <code class="highlighter-rouge">./_devtools/git-hooks/post-commit</code>
(if you don’t have the commit hook already configured)</li>
-  <li>Don’t forget to push both the <code class="highlighter-rouge">gh-pages</code>
and <code class="highlighter-rouge">asf-site</code> branches</li>
+  <li>Don’t forget to push both the <code class="highlighter-rouge">master</code>
and <code class="highlighter-rouge">asf-site</code> branches back to the accumulo-website
repo</li>
   <li>Verify that javadocs have been updated on the production site (e.g. https://accumulo.apache.org/1.6/apidocs/)</li>
 </ol>
 

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 @@
 <h3 id="website">Website</h3>
 
 <p>Accumulo’s web site is developed using <a href="https://jekyllrb.com">Jekyll</a>.
Development is
-performed by editing the contents of the <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=tree;h=gh-pages">gh-pages</a>
branch, either
+performed by editing the contents of the <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo-website.git;a=tree;h=master">accumulo-website
master</a> branch, either
 directly by a committer, with a pull request to <a href="https://github.com/apache/accumulo">GitHub</a>,
or a patch
 submitted to <a href="https://issues.apache.org/jira/browse/ACCUMULO">JIRA</a>.
The rendered site can be previewed locally or on
 <a href="http://apache.github.io/accumulo">GitHub</a>, and the rendered site
(in the <code class="highlighter-rouge">_site</code> directory) will be
@@ -214,8 +214,8 @@ bundle install
 <p>For preview convenience and consistent builds and testing, build using a
 version which looks the same locally and on GitHub.</p>
 
-<p>A <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=_devtools/git-hooks/post-commit;hb=gh-pages">post-commit
hook</a> is available for you to automatically create a
-commit in the <code class="highlighter-rouge">asf-site</code> branch locally
each time you commit to the <code class="highlighter-rouge">gh-pages</code>
+<p>A <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo-website.git;a=blob_plain;f=_devtools/git-hooks/post-commit;hb=master">post-commit
hook</a> is available for you to automatically create a
+commit in the <code class="highlighter-rouge">asf-site</code> branch locally
each time you commit to the <code class="highlighter-rouge">master</code>
 branch. You can also run this command manually:</p>
 
 <div class="highlighter-rouge"><pre class="highlight"><code>./_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 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Mon, 21 Nov 2016 11:23:52 -0500</pubDate>
-    <lastBuildDate>Mon, 21 Nov 2016 11:23:52 -0500</lastBuildDate>
+    <pubDate>Tue, 22 Nov 2016 18:19:07 -0500</pubDate>
+    <lastBuildDate>Tue, 22 Nov 2016 18:19:07 -0500</lastBuildDate>
     <generator>Jekyll v3.3.0</generator>
     
       <item>


Mime
View raw message