summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2010-11-26 11:39:39 +0100
committerThomas Schwinge <thomas@schwinge.name>2010-11-26 11:39:39 +0100
commitbe9d6d6621906287172212c55460e28dc50418ed (patch)
treefd20fa8dd5b64dcdaf0e57a498950595d9c8e242
parent1f0e31cfa2c521b3a60d784c66d57922e96b5bd5 (diff)
parent7280981382b9dabd94874b9dca6591e7d351fc36 (diff)
Merge branch 'YAML_for_tags'
-rw-r--r--.library/IkiWiki/Plugin/ymlfront.pm4
-rw-r--r--community/meetings/debconf10.mdwn9
-rw-r--r--community/meetings/ghm2010.mdwn8
-rw-r--r--tag.mdwn54
-rw-r--r--tag/fixed_in_debian.mdwn2
-rw-r--r--tag/open_issue_documentation.mdwn2
-rw-r--r--tag/open_issue_porting.mdwn2
-rw-r--r--tag/stable_URL.mdwn2
8 files changed, 64 insertions, 19 deletions
diff --git a/.library/IkiWiki/Plugin/ymlfront.pm b/.library/IkiWiki/Plugin/ymlfront.pm
index 6af4e5d6..9c033833 100644
--- a/.library/IkiWiki/Plugin/ymlfront.pm
+++ b/.library/IkiWiki/Plugin/ymlfront.pm
@@ -391,6 +391,10 @@ sub parse_yml {
$content =~ /^(.*?)\[\[!ymlfront.*?\]\](.*?)$/s;
$start_of_content = $1;
$rest_of_content = $2;
+ # TODO: This breaks if the YAML string itself contains ]].
+ # Workaround: all [[!ymlfront [...]]] directives shall be
+ # at the end of the files.
+ $rest_of_content = '';
}
}
}
diff --git a/community/meetings/debconf10.mdwn b/community/meetings/debconf10.mdwn
index bafd7de0..261686cc 100644
--- a/community/meetings/debconf10.mdwn
+++ b/community/meetings/debconf10.mdwn
@@ -16,5 +16,12 @@ License|/fdl]]."]]"""]]
[[!ymlfront data="""
-banck_hurd: "presentation (including video) by Michael Banck: [*Debian GNU/Hurd -- Past. Present. And Future?*](http://penta.debconf.org/dc10_schedule/events/595.en.html) ([slides](http://people.debian.org/~mbanck/debian-hurd.pdf))"
+
+banck_hurd:
+
+ "presentation (including video) by Michael Banck: [*Debian GNU/Hurd -- Past.
+ Present. And
+ Future?*](http://penta.debconf.org/dc10_schedule/events/595.en.html)
+ ([slides](http://people.debian.org/~mbanck/debian-hurd.pdf))"
+
"""]]
diff --git a/community/meetings/ghm2010.mdwn b/community/meetings/ghm2010.mdwn
index e216bfe4..b7d7e880 100644
--- a/community/meetings/ghm2010.mdwn
+++ b/community/meetings/ghm2010.mdwn
@@ -16,5 +16,11 @@ License|/fdl]]."]]"""]]
[[!ymlfront data="""
-walfield_hurd: "video of the presentation by Neal Walfield: [*GNU/Hurd: It's About Freedom (Or: Why you should care)*](http://audio-video.gnu.org/video/ghm2010/GNU-Hurd_-_Its_About_Freedom,_Or_Why_you_should_care.ogv)"
+
+walfield_hurd:
+
+ "video of the presentation by Neal Walfield: [*GNU/Hurd: It's About Freedom
+ (Or: Why you should
+ care)*](http://audio-video.gnu.org/video/ghm2010/GNU-Hurd_-_Its_About_Freedom,_Or_Why_you_should_care.ogv)"
+
"""]]
diff --git a/tag.mdwn b/tag.mdwn
index 6051de3b..acabfb28 100644
--- a/tag.mdwn
+++ b/tag.mdwn
@@ -15,31 +15,51 @@ moment:
pages="tag/* and !tag/*/*"
show=title]]
-Most of them should be self-explanatory.
+Most of them should be self-explanatory, and for the others, here are the
+explanations:
* *fixed_in_debian*
- This tag is used to tag items that have been fixed in the [[Debian
- GNU/Hurd|hurd/running/debian]] distribution, but not yet in the upstream
- sources.
+ {{$fixed_in_debian}}
* *open_issue_documentation*
- Use for tagging pages / items that need to be handled / improved for
- documentation purposes.
-
+ {{$open_issue_documentation}}
+
* *open_issue_porting*
- A list of open issues in porting software to run on GNU/Hurd systems. This
- list also includes [[toolchain]]-level items, items that are either
- already solved in [[Debian GNU/Hurd|hurd/running/debian]] systems (tagged
- *fixed_in_debian*) or being worked around, so if you're out for working on
- application-level porting issues, then perusing through the list of
- [[Debian packages that need porting|hurd/running/debian/porting]] may be
- better.
+ {{$open_issue_porting}}
* *stable_URL*
- These pages are tagged as having a *stable URL*. That is, they're linked
- to from external pages, and their locations should not be changed
- needlessly.
+ {{$stable_URL}}
+
+
+[[!ymlfront data="""
+
+fixed_in_debian:
+
+ This tag is used to tag items that have been fixed in the [[Debian
+ GNU/Hurd|hurd/running/debian]] distribution, but not yet in the upstream
+ sources.
+
+open_issue_documentation:
+
+ Used for tagging pages / items that need to be handled / improved for
+ documentation purposes.
+
+open_issue_porting:
+
+ A list of open issues in porting software to run on GNU/Hurd systems. This
+ list also includes [[toolchain]]-level items, items that are either already
+ solved in [[Debian GNU/Hurd|hurd/running/debian]] systems (tagged
+ *fixed_in_debian*) or being worked around, so if you're out for working on
+ application-level porting issues, then perusing through the list of [[Debian
+ packages that need porting|hurd/running/debian/porting]] may be better.
+
+stable_URL:
+
+ These pages are tagged as having a *stable URL*. That is, they're linked to
+ from external pages, and their locations should not be changed needlessly.
+
+"""]]
diff --git a/tag/fixed_in_debian.mdwn b/tag/fixed_in_debian.mdwn
index b8aeddc8..4d946fd4 100644
--- a/tag/fixed_in_debian.mdwn
+++ b/tag/fixed_in_debian.mdwn
@@ -10,6 +10,8 @@ License|/fdl]]."]]"""]]
[[!meta title="fixed_in_debian"]]
+{{$tag#fixed_in_debian}}
+
[[!map
pages="tagged(fixed_in_debian)"
show=title]]
diff --git a/tag/open_issue_documentation.mdwn b/tag/open_issue_documentation.mdwn
index eb7f87a2..f0d1cb4c 100644
--- a/tag/open_issue_documentation.mdwn
+++ b/tag/open_issue_documentation.mdwn
@@ -10,6 +10,8 @@ License|/fdl]]."]]"""]]
[[!meta title="open_issue_documentation"]]
+{{$tag#open_issue_documentation}}
+
[[!map
pages="tagged(open_issue_documentation)"
show=title]]
diff --git a/tag/open_issue_porting.mdwn b/tag/open_issue_porting.mdwn
index 0bc33c0d..efa488b7 100644
--- a/tag/open_issue_porting.mdwn
+++ b/tag/open_issue_porting.mdwn
@@ -10,6 +10,8 @@ License|/fdl]]."]]"""]]
[[!meta title="open_issue_porting"]]
+{{$tag#open_issue_porting}}
+
[[!map
pages="tagged(open_issue_porting)"
show=title]]
diff --git a/tag/stable_URL.mdwn b/tag/stable_URL.mdwn
index 8b25517e..ff4067f6 100644
--- a/tag/stable_URL.mdwn
+++ b/tag/stable_URL.mdwn
@@ -10,6 +10,8 @@ License|/fdl]]."]]"""]]
[[!meta title="stable_URL"]]
+{{$tag#stable_URL}}
+
[[!map
pages="tagged(stable_URL)"
show=title]]