blob: 7aabd4dc07fba8285a1ba82075c43e2fc690c5b9 [file] [log] [blame]
Ian Maxonf84cb812015-12-07 15:09:45 -08001<!DOCTYPE html>
2<html lang="en">
3 <head>
4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1">
7 <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
8 <meta name="description" content="">
9 <meta name="author" content="">
10 <link rel="icon" href="favicon.ico">
Ian Maxon5be42f72024-11-14 15:54:56 -080011 <meta http-equiv="Content-Security-Policy" content="frame-src youtube.com www.youtube.com">
Ian Maxonf84cb812015-12-07 15:09:45 -080012
13 <title>Editing this website</title>
14
15 <!-- Bootstrap core CSS -->
16 <link href="css/bootstrap.min.css" rel="stylesheet">
17 <!-- Bootstrap theme -->
18
19 <!-- Custom styles for this template -->
20 <link href="css/theme.css" rel="stylesheet">
21
22 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
23 <!--[if lt IE 9]>
24 <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
25 <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
26 <![endif]-->
27 <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
28 </head>
29
30 <div class="container theme-showcase" role="main">
Till Westmann00f9bf22016-03-14 13:59:27 -070031 <div class="masthead">
32 <p class="lead">
33 <a href="index.html">
34 <img src="img/asterixdb_tm.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/>
35 </a>
36 </p>
37 </div>
Ian Maxonf84cb812015-12-07 15:09:45 -080038
Till Westmann00f9bf22016-03-14 13:59:27 -070039 <nav class="navbar navbar-default">
Ian Maxonf84cb812015-12-07 15:09:45 -080040 <div class="container">
41 <div class="navbar-header">
42 <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
43 <span class="sr-only">Toggle navigation</span>
44 <span class="icon-bar"></span>
45 <span class="icon-bar"></span>
46 <span class="icon-bar"></span>
47 </button>
48 <a class="navbar-brand" href="index.html">Overview</a>
49 </div>
50 <div class="navbar-collapse collapse">
51 <ul class="nav navbar-nav">
52 <li><a href="download.html">Download</a></li>
53 <li class="dropdown">
54 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
55 <ul class="dropdown-menu" role="menu">
56 <li class="dropdown-header">Stable release</li>
Ian Maxon1c2dec12024-04-01 16:05:43 -070057 <li><a href="docs/0.9.9/index.html">Documentation for 0.9.9<i class="fa fa-external-link fa-sm"></i></a></li>
Ian Maxonf84cb812015-12-07 15:09:45 -080058 <li class="divider"></li>
59 <li class="dropdown-header">Snapshot release</li>
Ian Maxon1c2dec12024-04-01 16:05:43 -070060 <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.10-SNAPSHOT <i class="fa fa-external-link fa-sm"></i></a></li>
Ian Maxon79af4a72018-11-02 17:06:39 -070061 <li class="divider"></li>
62 <li class="dropdown-header">Tutorial for SQL Users</li>
63 <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
Ian Maxonf84cb812015-12-07 15:09:45 -080064 </ul>
65 </li>
66 <li><a href="about.html">About</a></li>
Till Westmann2a321022016-04-08 08:18:14 -070067 <li class="dropdown">
68 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Community<span class="caret"></span></a>
69 <ul class="dropdown-menu" role="menu">
70 <li><a href="community.html">Mailing Lists</a></li>
71 <li><a href="community.html#irc">IRC</a></li>
72 <li><a href="community.html#asterixdb-team">Team</a></li>
73 <li><a href="https://issues.apache.org/jira/browse/ASTERIXDB">Issue Tracker</a></li>
74 </ul>
75 </li>
Ian Maxonf84cb812015-12-07 15:09:45 -080076 <li class="dropdown">
Michael Blowf93d7f52016-10-07 14:36:30 -040077 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Development<span class="caret"></span></a>
Ian Maxonf84cb812015-12-07 15:09:45 -080078 <ul class="dropdown-menu" role="menu">
79 <li class="dropdown-header">For New Contributors</li>
80 <li><a href="dev-setup.html">Development Setup</a></li>
81 <li class="divider"></li>
82 <li class="dropdown-header">For Committers</li>
83 <li><a href="pushing.html">Pushing changes</a></li>
84 <li><a href="site.html">Editing this site</a></li>
Michael Blowf93d7f52016-10-07 14:36:30 -040085 <li class="dropdown-header">Extensions</li>
86 <li><a href="extension.html">Extending AsterixDB</a></li>
Ian Maxonf84cb812015-12-07 15:09:45 -080087 </ul>
88 </li>
89 </ul>
Till Westmann00f9bf22016-03-14 13:59:27 -070090 <ul class="nav navbar-nav navbar-right">
91 <li class="dropdown">
92 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"
93 style="padding-right: 30px">
94 <img src="img/feather.png" style="height:20px"/>Apache Software Foundation<span class="caret"/>
95 </a>
96 <ul class="dropdown-menu dropdown-menu-right" role="menu">
97 <li><a href="http://www.apache.org/"><b>ASF Homepage</b></a></li>
98 <li><a href="http://www.apache.org/licenses/">License</a></li>
99 <li><a href="http://www.apache.org/foundation/sponsorship.html">Donate</a></li>
100 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
101 <li><a href="http://www.apache.org/security/">Security</a></li>
102 </ul>
103 </li>
104 </ul>
Ian Maxonf84cb812015-12-07 15:09:45 -0800105 </div><!--/.nav-collapse -->
106 </div>
107 </nav>
108
109
Till Westmann00f9bf22016-03-14 13:59:27 -0700110 <div class="row">
Ian Maxonf84cb812015-12-07 15:09:45 -0800111<div class="col-md-8 col-centered">
112<h2>Editing this website</h2>
113<!-- Major credit to the Apache Flink guys for writing a great doc in a similar vein for their website
114that happens to use more or less the same tooling as AsterixDB's. Much of this doc is based on it. -->
115
116<ul id="markdown-toc">
117 <li><a href="#prerequisites" id="markdown-toc-prerequisites">Prerequisites</a> <ul>
118 <li><a href="#jekyll" id="markdown-toc-jekyll">Jekyll.</a></li>
119 <li><a href="#checking-out-the-website-sources" id="markdown-toc-checking-out-the-website-sources">Checking out the website sources</a></li>
120 </ul>
121 </li>
122 <li><a href="#making-a-change-to-the-site" id="markdown-toc-making-a-change-to-the-site">Making a change to the site</a> <ul>
123 <li><a href="#editing-and-viewing-the-change" id="markdown-toc-editing-and-viewing-the-change">Editing and viewing the change.</a></li>
124 <li><a href="#submitting-the-change-to-the-live-site" id="markdown-toc-submitting-the-change-to-the-live-site">Submitting the change to the live site</a></li>
125 </ul>
126 </li>
Till Westmannabfde422016-02-29 18:57:58 -0800127 <li><a href="#troubleshooting" id="markdown-toc-troubleshooting">Troubleshooting</a></li>
Ian Maxonf84cb812015-12-07 15:09:45 -0800128</ul>
129
130<hr />
131
132<h2 id="prerequisites">Prerequisites</h2>
133
134<h3 id="jekyll">Jekyll.</h3>
135<p>This website is written using a static website generator called <a href="https://github.com/jekyll/jekyll">Jekyll</a>. To work with editing this website you will need to install it.
136In short, Jekyll uses a combination of templated HTML files and Markdown to compile the final site.
137Generally, the content itself lies within the Markdown files, and the HTML is for layout.
138A full tutorial about how to use Jekyll is out of the scope of this document, but, for our purposes, only Markdown will be edited.</p>
139
140<h3 id="checking-out-the-website-sources">Checking out the website sources</h3>
141
142<p>The website is managed using <code>git</code>. Clone the site as usual</p>
143
Till Westmannc6e439f2016-07-07 14:45:57 -0700144<pre><code>➤ git clone -b asf-site https://git-wip-us.apache.org/repos/asf/asterixdb-site.git
Till Westmann1dba8882016-02-29 15:44:42 -0800145</code></pre>
146
147<p>and <code>cd</code> into the clone</p>
148
Till Westmannc6e439f2016-07-07 14:45:57 -0700149<pre><code>➤ cd asterixdb-site
Ian Maxonf84cb812015-12-07 15:09:45 -0800150</code></pre>
151
152<p>You will notice lots of Markdown files and HTML templates in the repository root. The compiled content of the website itself is served from the <code>content/</code> folder in this repository. That is to say, that the actual content of the website itself, as well as its sources are stored in the same repository. Additionally, the main branch on this repository is <code>asf-site</code> and not <code>master</code></p>
153
154<p>Gerrit is used to submit code reviews for the website just as it is with the main codebase. The main difference the site is not strictly subject to code reviews.</p>
155
Till Westmann1dba8882016-02-29 15:44:42 -0800156<p>Then, you likely will want to check out to make your own topic branch as to not work directly on the “live” branch, like so:</p>
Ian Maxonf84cb812015-12-07 15:09:45 -0800157
Till Westmannabfde422016-02-29 18:57:58 -0800158<pre><code>➤ git checkout -b YOU/site
Till Westmann1dba8882016-02-29 15:44:42 -0800159</code></pre>
160
161<p>And perform the git-gerrit init on this branch</p>
162
Till Westmannabfde422016-02-29 18:57:58 -0800163<pre><code>➤ git gerrit init -u ssh://YOU@asterix-gerrit.ics.uci.edu:29418/ -p incubator-asterixdb-site
Ian Maxonf84cb812015-12-07 15:09:45 -0800164</code></pre>
165
166<h2 id="making-a-change-to-the-site">Making a change to the site</h2>
167
Till Westmann1dba8882016-02-29 15:44:42 -0800168<p>The general overview is as follows:</p>
169
170<ul>
171 <li>Make edits and check the output of <code>jekyll build</code></li>
172 <li>Commit the change and propose it for review</li>
173 <li>Either wait for a review, or submit the change</li>
174</ul>
Ian Maxonf84cb812015-12-07 15:09:45 -0800175
176<h3 id="editing-and-viewing-the-change">Editing and viewing the change.</h3>
177
178<p>For whichever section of the site you want to edit, go ahead and do so with the text editor of your choice. Then, to see what your change looks like, in the repository root, execute:</p>
179
Till Westmannabfde422016-02-29 18:57:58 -0800180<pre><code>➤ jekyll serve --watch
Ian Maxonf84cb812015-12-07 15:09:45 -0800181</code></pre>
182
183<p>This sets up a small integrated web server and compiles the site dynamically as it is edited. Once you are satisfied with how the site looks, go ahead and commit your changes with git.</p>
184
Ian Maxonf84cb812015-12-07 15:09:45 -0800185<p>Once you have made your commit, push it to Gerrit for review:</p>
186
Till Westmannabfde422016-02-29 18:57:58 -0800187<pre><code>➤ git gerrit submit -b asf-site
Ian Maxonf84cb812015-12-07 15:09:45 -0800188</code></pre>
189
Till Westmann1dba8882016-02-29 15:44:42 -0800190<p>For longer edits you might need to update your local <code>asf-site</code> mirror, and then merge that onto your working branch. This will prevent your branch from falling too far out of date, and ensure that your code review proposals will merge successfully with <code>master</code>. Similar to the way this is done for code changes you can use</p>
191
Till Westmannabfde422016-02-29 18:57:58 -0800192<pre><code>➤ git gerrit update -b asf-site
Till Westmann1dba8882016-02-29 15:44:42 -0800193</code></pre>
194
195<p>to do this.</p>
Ian Maxonf84cb812015-12-07 15:09:45 -0800196
197<h3 id="submitting-the-change-to-the-live-site">Submitting the change to the live site</h3>
198
199<p>When the submitted review is committed in Gerrit, pull it and overwrite your current asf-site branch:</p>
200
Till Westmannabfde422016-02-29 18:57:58 -0800201<pre><code>➤ git fetch gerrit
Ian Maxonf84cb812015-12-07 15:09:45 -0800202</code></pre>
203
204<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>
205
Till Westmannabfde422016-02-29 18:57:58 -0800206<pre><code>➤ git push origin (SHA1 of submitted commit):asf-site
207</code></pre>
208
209<h2 id="troubleshooting">Troubleshooting</h2>
210
211<p>If jekyll produces an error message like this one:</p>
212
213<pre><code>➤ jekyll serve --watch
Till Westmannc6e439f2016-07-07 14:45:57 -0700214Configuration file: /.../asterixdb-site/_config.yml
Till Westmannabfde422016-02-29 18:57:58 -0800215You are missing a library required for syntax highlighting. Please run:
216$ [sudo] gem install pygments
217jekyll 3.1.2 | Error: uninitialized constant Kramdown::Converter::PygmentsHtml::FatalException
218</code></pre>
219
220<p>this might fix it:</p>
221
222<pre><code>➤ sudo gem install pygments.rb
Ian Maxonf84cb812015-12-07 15:09:45 -0800223</code></pre>
224
225
226</div>
227</div>
228
229
Till Westmann00f9bf22016-03-14 13:59:27 -0700230 <hr/>
Ian Maxonf84cb812015-12-07 15:09:45 -0800231
Till Westmann00f9bf22016-03-14 13:59:27 -0700232 <footer>
233 <div class="row">
Till Westmann00f9bf22016-03-14 13:59:27 -0700234 <div class="col-md-9 col-centered text-center">
235 <p/>
236 <p>&copy; Copyright 2016 The Apache Software foundation. All Rights Reserved. </p>
237 <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the Apache feather logo are trademarks of the
238 Apache Software Foundation</p>
Ian Maxonf84cb812015-12-07 15:09:45 -0800239 </div>
Till Westmann00f9bf22016-03-14 13:59:27 -0700240 </div>
241 </footer>
242 </div> <!-- /container -->
Ian Maxonf84cb812015-12-07 15:09:45 -0800243
244 <!-- Bootstrap core JavaScript
245 ================================================== -->
246 <!-- Placed at the end of the document so the pages load faster -->
247 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
248 <script src="js/bootstrap.min.js"></script>
249 </body>
250</html>