summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/design/assistant/blog.mdwn17
-rw-r--r--doc/devblog.mdwn10
-rw-r--r--doc/devblog/moving_blogs.mdwn5
-rw-r--r--doc/footer/column_a.mdwn4
4 files changed, 26 insertions, 10 deletions
diff --git a/doc/design/assistant/blog.mdwn b/doc/design/assistant/blog.mdwn
index ea21a726b..f83e96945 100644
--- a/doc/design/assistant/blog.mdwn
+++ b/doc/design/assistant/blog.mdwn
@@ -1,10 +1,11 @@
-Work on the git-annex assistant is [crowdfunded](https://campaign.joeyh.name/).
-I'll be blogging about my progress here on a semi-daily basis.
+This blog was updated on a semi-daily basis by Joey during the year of work
+concentrating on the git-annex assistant that was funded by his kickstarter
+campaign.
-[[!sidebar content="""
-[[!calendar type="month" pages="page(design/assistant/blog/*)"]]
-[[!calendar type="month" month="-1" pages="page(design/assistant/blog/*)"]]
-[[!calendar type="month" month="-2" pages="page(design/assistant/blog/*)"]]
-"""]]
+Post-kickstarter work will instead appear on the [[devblog]]. However,
+this page's RSS feed will continue to work, so you don't have to migrate
+your RSS reader.
-[[!inline pages="page(design/assistant/blog/*)" show=0]]
+[[!inline pages="page(/devblog/*)" show=-1 feedshow=7]]
+
+[[!inline pages="page(design/assistant/blog/*)" show=0 feeds=no]]
diff --git a/doc/devblog.mdwn b/doc/devblog.mdwn
new file mode 100644
index 000000000..aa66b0100
--- /dev/null
+++ b/doc/devblog.mdwn
@@ -0,0 +1,10 @@
+Work on git-annex is [crowdfunded](https://campaign.joeyh.name/).
+Joey blogs about his progress here on a semi-daily basis.
+
+[[!sidebar content="""
+[[!calendar type="month" pages="page(devblog/*)"]]
+[[!calendar type="month" month="-1" pages="page(devblog/*)"]]
+[[!calendar type="month" month="-2" pages="page(devblog/*)"]]
+"""]]
+
+[[!inline pages="page(devblog/*)" show=0]]
diff --git a/doc/devblog/moving_blogs.mdwn b/doc/devblog/moving_blogs.mdwn
new file mode 100644
index 000000000..f6dac56c9
--- /dev/null
+++ b/doc/devblog/moving_blogs.mdwn
@@ -0,0 +1,5 @@
+I've started a new page for my devblog, since I'm not focusing extensively
+on the assistant and so keeping the blog [[here|design/assistant/blog]]
+increasingly felt wrong. Also, my new year of
+[crowdfunded development](https://campaign.joeyh.name)
+formally starts in September, so a new blog seemed good.
diff --git a/doc/footer/column_a.mdwn b/doc/footer/column_a.mdwn
index 400193ed0..92c77d840 100644
--- a/doc/footer/column_a.mdwn
+++ b/doc/footer/column_a.mdwn
@@ -2,6 +2,6 @@
[[!inline pages="news/* and !*/Discussion" archive=yes show=2 feeds=no]]
-### [[Dev blog|design/assistant/blog]]
+### [[devblog|devblog]]
-[[!inline pages="design/assistant/blog/* and !*/Discussion" archive=yes show=5 feeds=no]]
+[[!inline pages="devblog/* and !*/Discussion" archive=yes show=5 feeds=no]]