get rid of blog description; more welcome fixes

diff --git a/personal/_config.yml b/personal/_config.yml
index f08b44a87f20df4e57078b99f88e25f6cbbfd4ce..0d456bea37db145df975adc450653de53e5903db 100644 (file)
--- a/personal/_config.yml
+++ b/personal/_config.yml
@@ -6,7 +6,6 @@ timezone: "Europe/Berlin"
 
 blog:
     title: "Ralf's Ramblings"
-    description: "Ralf rambling on things"
 
 readmes:
     src_base: "/home/r/src"

diff --git a/personal/_posts/2015-10-08-welcome.md b/personal/_posts/2015-10-08-welcome.md
index 6a4e88b209aba82f2d3d945d1ce6e06b0ab1228b..43b4e8b365214b3317e3bf7c91cc1c01c6c5ea91 100644 (file)
--- a/personal/_posts/2015-10-08-welcome.md
+++ b/personal/_posts/2015-10-08-welcome.md
@@ -4,6 +4,6 @@ categories: meta
 ---
 
 I'll use this blog to write random articles on things that matter to me, and that I want to share.
-So far, I don't know what this will end up being about - probably mostly about [research](https://www.mpi-sws.org/~jung/) and related topics, as that's what I do.
+So far, I don't know what this will end up being about - probably mostly about programming languages research and related topics, as that's what I do.
 
-In the mean time, you can check out my [research](/cs) and [project](/projects) pages.
+In the mean time, you can check out my [research](https://www.mpi-sws.org/~jung/) and [project](/projects) pages.

diff --git a/personal/blog/feed.xml b/personal/blog/feed.xml
index 4e3b89ad4ec853ebe077372c681ebfd4a4577e7f..7a7e919aa8e57fca2bd85e98b25948a7756d8e2d 100644 (file)
--- a/personal/blog/feed.xml
+++ b/personal/blog/feed.xml
@@ -6,9 +6,9 @@ slug: Subscribe
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>{{ site.blog.title | xml_escape }}</title>
-    <description>{{ site.blog.description | xml_escape }}</description>
-    <link>{{ site.url }}/</link>
-    <atom:link href="{{ "/feed.xml" | prepend: site.url }}" rel="self" type="application/rss+xml"/>
+    <description>{{ site.blog.title | xml_escape }}</description>
+    <link>{{ site.url }}{{ site.baseurl }}/</link>
+    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
     <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
     <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
     <generator>Jekyll v{{ jekyll.version }}</generator>
@@ -17,8 +17,8 @@ slug: Subscribe
         <title>{{ post.title | xml_escape }}</title>
         <description>{{ post.content | xml_escape }}</description>
         <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-        <link>{{ post.url | prepend: site.url }}</link>
-        <guid isPermaLink="true">{{ post.url | prepend: site.url }}</guid>
+        <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
+        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
         {% for tag in post.tags %}
         <category>{{ tag | xml_escape }}</category>
         {% endfor %}

diff --git a/personal/style.scss b/personal/style.scss
index 7f82f55c48044ffdbbc62060d5ffe08f8406b22e..2953065df2feb545e57a27e01553a29b9b31e3be 100644 (file)
--- a/personal/style.scss
+++ b/personal/style.scss
@@ -65,7 +65,7 @@ h4 {
 
 /* Layout and Color stuff */
 
-g/* General page structure */
+/* General page structure */
 html {
     overflow-y: scroll;
 }

diff --git a/upload.sh b/upload.sh
new file mode 100755 (executable)
index 0000000..3869f77
--- /dev/null
+++ b/upload.sh
@@ -0,0 +1,5 @@
+#/bin/bash
+cd "$(dirname "$0")"
+
+personal/upload.sh
+research/upload.sh