Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-20 19:49:04 -04:00
commit 7b3338a4f6
3 changed files with 15 additions and 10 deletions

4
doc/footer/column_a.mdwn Normal file
View File

@ -0,0 +1,4 @@
## news
[[!inline pages="news/* and !*/Discussion" show="4" archive=yes
title="propellor news"]]

4
doc/footer/column_b.mdwn Normal file
View File

@ -0,0 +1,4 @@
## posts
[[!inline pages="internal(feeds/*) and !*/Discussion" show="4" archive=yes
title="propellor blog posts"]]

View File

@ -11,6 +11,13 @@
[[!inline raw=yes pages="README"]]
<table>
<tr>
<td width="50%" valign="top">[[!inline feeds=no template=bare pages=footer/column_a]]</td>
<td widtd="50%" valign="top">[[!inline feeds=no template=bare pages=footer/column_b]]</td>
</tr>
</table>
## enjoy
Hope you find Propellor fun and useful!
@ -27,13 +34,3 @@ hosts = -- (o) `
Propellor is free software, licensed under the BSD license.
You are encouraged to send patches and improve it. See [[contributing]].
## news
[[!inline pages="news/* and !*/Discussion" show="4" archive=yes
title="propellor news"]]
## feeds
[[!inline pages="internal(feeds/*) and !*/Discussion" show="4" archive=yes
title="propellor blog posts"]]