asterixdb-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Till Westmann (Code Review)" <do-not-re...@asterixdb.incubator.apache.org>
Subject Change in incubator-asterixdb-site[asf-site]: update site editing instructions
Date Fri, 26 Feb 2016 01:14:56 GMT
Till Westmann has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/671

Change subject: update site editing instructions
......................................................................

update site editing instructions

Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
---
M content/site.html
M site.md
2 files changed, 17 insertions(+), 13 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site refs/changes/71/671/1

diff --git a/content/site.html b/content/site.html
index aaf6347..392557c 100644
--- a/content/site.html
+++ b/content/site.html
@@ -123,10 +123,13 @@
 
 <h2 id="making-a-change-to-the-site">Making a change to the site</h2>
 
-<p>The general overview is as follows:
-- Make edits and check the output of ‘jekyll build’
-- Commit the change and propose it for review
-- Either wait for a review, or submit the change</p>
+<p>The general overview is as follows:</p>
+
+<ul>
+  <li>Make edits and check the output of <code>jekyll build</code></li>
+  <li>Commit the change and propose it for review</li>
+  <li>Either wait for a review, or submit the change</li>
+</ul>
 
 <h3 id="editing-and-viewing-the-change">Editing and viewing the change.</h3>
 
@@ -150,12 +153,12 @@
 
 <p>When the submitted review is committed in Gerrit, pull it and overwrite your current
asf-site branch:</p>
 
-<pre><code>   ➤ git pull gerrit
+<pre><code>   ➤ git pull --rebase gerrit asf-site
 </code></pre>
 
-<p>Then, push the exact commit from the Gerrit web interface to the ASF git repository.
Do this with care! ASF git doesn’t allow hard resets on branches, so whatever you push here
is final.</p>
+<p>Then, push the <code>asf-site</code> branch to the ASF git repository.
Do this with care! ASF git doesn’t allow hard resets on branches, so whatever you push here
is final.</p>
 
-<pre><code>   ➤ git push origin (SHA1 of submitted commit)
+<pre><code>   ➤ git push origin asf-site
 </code></pre>
 
 
diff --git a/site.md b/site.md
index f4f7487..e1ba5fd 100644
--- a/site.md
+++ b/site.md
@@ -36,9 +36,10 @@
 ## Making a change to the site
 
 The general overview is as follows:
-- Make edits and check the output of 'jekyll build'
-- Commit the change and propose it for review
-- Either wait for a review, or submit the change
+
+* Make edits and check the output of `jekyll build`
+* Commit the change and propose it for review
+* Either wait for a review, or submit the change
 
 ### Editing and viewing the change.
 
@@ -65,12 +66,12 @@
 When the submitted review is committed in Gerrit, pull it and overwrite your current asf-site
branch:
 
 
-       ➤ git pull gerrit
+       ➤ git pull --rebase gerrit asf-site
 
 
-Then, push the exact commit from the Gerrit web interface to the ASF git repository. Do this
with care! ASF git doesn't allow hard resets on branches, so whatever you push here is final.
+Then, push the `asf-site` branch to the ASF git repository. Do this with care! ASF git doesn't
allow hard resets on branches, so whatever you push here is final.
 
 
-       ➤ git push origin (SHA1 of submitted commit)
+       ➤ git push origin asf-site
 
 

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/671
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70bca5a064395d87a24d792e0a2cd48bb7735a94
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <tillw@apache.org>

Mime
View raw message