summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2014-11-21 21:00:23 -0400
committerJoey Hess2014-11-21 21:00:23 -0400
commit158b0aedc4846caf1a33b9216aff9cb43250579c (patch)
tree66a5f83d4c8d8f1ff3b101827d690793c081b4ac /doc
parentd65a4fad6c803720dca59a5f3eee3d57e33620c1 (diff)
parentbf663218d3bfbffab7863ead3cf26818a5c7d3fb (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'doc')
-rw-r--r--doc/footer/column_a.mdwn4
-rw-r--r--doc/index.mdwn4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/footer/column_a.mdwn b/doc/footer/column_a.mdwn
index 26554043..a95696e9 100644
--- a/doc/footer/column_a.mdwn
+++ b/doc/footer/column_a.mdwn
@@ -2,3 +2,7 @@
[[!inline pages="news/* and !*/Discussion" show=0 archive=yes
title="propellor news"]]
+
+## enjoy
+
+Hope you find Propellor fun and useful!
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 246deed2..ccefacba 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,10 +19,6 @@
</tr>
</table>
-## enjoy
-
-Hope you find Propellor fun and useful!
-
<pre>
-- _ ______`| ,-.__
{- Propellor -- / \___-=O`/|O`/__| (____.'