Regenerate website
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/c6d92268 Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/c6d92268 Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/c6d92268 Branch: refs/heads/asf-site Commit: c6d922685e79463fa7f41a8f9dcd86aee59923c0 Parents: b470eb5 Author: Zur, Aviem <a...@paypal.com> Authored: Sun Mar 19 05:55:02 2017 +0200 Committer: Zur, Aviem <a...@paypal.com> Committed: Sun Mar 19 05:55:02 2017 +0200 ---------------------------------------------------------------------- content/contribute/contribution-guide/index.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam-site/blob/c6d92268/content/contribute/contribution-guide/index.html ---------------------------------------------------------------------- diff --git a/content/contribute/contribution-guide/index.html b/content/contribute/contribution-guide/index.html index 4d4a782..af492a9 100644 --- a/content/contribute/contribution-guide/index.html +++ b/content/contribute/contribution-guide/index.html @@ -214,7 +214,7 @@ <li><a href="#website" id="markdown-toc-website">Website</a> <ul> <li><a href="#one-time-setup-2" id="markdown-toc-one-time-setup-2">One-time Setup</a></li> <li><a href="#working-on-your-change" id="markdown-toc-working-on-your-change">Working on your change</a></li> - <li><a href="#committing-website-changes" id="markdown-toc-committing-website-changes">Committing website changes</a></li> + <li><a href="#committing-website-changes-committers-only" id="markdown-toc-committing-website-changes-committers-only">Committing website changes (committers only)</a></li> </ul> </li> </ul> @@ -736,7 +736,7 @@ $ git checkout -b <my-branch> origin/asf-site <p>While you are working on your pull request, you can test and develop live by running the following command in the root folder of the website:</p> -<div class="highlighter-rouge"><pre class="highlight"><code>$ bundle exec jekyll serve +<div class="highlighter-rouge"><pre class="highlight"><code>$ bundle exec jekyll serve --incremental </code></pre> </div> @@ -758,11 +758,20 @@ $ git checkout -b <my-branch> origin/asf-site <p>During review, committers will patch in your PR, generate the static <code class="highlighter-rouge">content/</code>, and review the changes.</p> -<h4 id="committing-website-changes">Committing website changes</h4> +<h4 id="committing-website-changes-committers-only">Committing website changes (committers only)</h4> <p>Follow the same committer process as above, but using repository <code class="highlighter-rouge">apache/beam-site</code> and branch <code class="highlighter-rouge">asf-site</code>.</p> -<p>In addition, the committer is responsible for doing the final <code class="highlighter-rouge">jekyll build</code> to generate the static content, so follow the instructions above to install <code class="highlighter-rouge">jekyll</code>.</p> +<p>In addition, the committer is responsible for doing the final <code class="highlighter-rouge">bundle exec jekyll build</code> to generate the static content, so follow the instructions above to install <code class="highlighter-rouge">jekyll</code>.</p> + +<p>This command generates the <code class="highlighter-rouge">content/</code> directory. The committer should add and commit the content related to the PR.</p> + +<div class="highlighter-rouge"><pre class="highlight"><code>$ git add content/<files related to the pr> +$ git commit -m "Regenerate website" +</code></pre> +</div> + +<p>Finally you should merge the changes into the <code class="highlighter-rouge">asf-site</code> branch and push them into the <code class="highlighter-rouge">apache</code> repository.</p> </div>