aboutsummaryrefslogtreecommitdiffhomepage
path: root/data
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-10-07 10:00:53 -0400
committerRalph Amissah <ralph@amissah.com>2010-10-07 10:00:53 -0400
commit42d7710823483e419854e143561e543144871650 (patch)
treec16d5408dc04df8f2eb6a8114a14eefdbe8a850e /data
parentdebian/changelog 2.7.2-1 (diff)
parentsisu_markup.sst, document a fix (v1 & 2) (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'data')
-rw-r--r--data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst5
-rw-r--r--data/doc/sisu/v2/CHANGELOG28
-rw-r--r--data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst5
-rw-r--r--data/sisu/v2/v/version.yml6
4 files changed, 30 insertions, 14 deletions
diff --git a/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst
index a18e134d..16181d2a 100644
--- a/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst
@@ -631,7 +631,6 @@ code{
{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
-
}code
!_ resulting output:
@@ -640,10 +639,9 @@ code{
{tux.png 64x80 "Gnu/Linux - a better way" }http://www.jus.uio.no/sisu/
-{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
-
{GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.jus.uio.no/sisu/
+{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
!_ linked url footnote shortcut
@@ -738,7 +736,6 @@ No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,0
\* Contributed at least ten times; \** at least 5 times in last month; \*\** more than 100 times in last month.
-
% code{
%
% test
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 154b287c..0fcd3be4 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,33 @@ Reverse Chronological:
%% Development branch UNSTABLE
+%% 2.7.3.orig.tar.gz (2010-10-06:40/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
+ sisu_2.7.3.orig.tar.gz
+ sisu_2.7.3-1.dsc
+ sisu_2.7.3-1.diff.gz
+
+ [debian freeze, fix]
+
+ * hub, fix sisu breakage when -y (manifest) is run without the explicit or
+ implicit calling of -m (creation of document abstraction for processing),
+ (e.g. when --source or --sisupod is called on its own).
+
+ * dal_images, where image dimensions are set in an object, use those, (rather
+ than those determined by imagemagick or graphicsmagick). [note: all must be
+ set in an object, or none]
+
+ * options, a few aliases added (long options)
+
+ * urls, cleaning
+
+ * sisu_markup.sst, document a fix (v1 & 2)
+
%% 2.7.2.orig.tar.gz (2010-10-01:39/5)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
- sisu_2.7.2.orig.tar.gz
- sisu_2.7.2-1.dsc
- sisu_2.7.2-1.diff.gz
+ 05935d437ceb86ba90452b7e21c0b6d6d969dbfc095e5d3989f4870f9c154b87 2742571 sisu_2.7.2.orig.tar.gz
+ b32c4dd3b8ab5259613f2c47d46c3e636c106eadd7dae456f4fc01ea6c4d6ac0 1196 sisu_2.7.2-1.dsc
+ 7dc5e669a5e21c525219d7b1258450630c5fbd47faa620740f0d8ab311995bf5 288299 sisu_2.7.2-1.diff.gz
[debian freeze, fix]
diff --git a/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst
index 275d736e..b718e997 100644
--- a/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst
@@ -637,7 +637,6 @@ code{
{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
-
}code
!_ resulting output:
@@ -646,10 +645,9 @@ code{
{tux.png 64x80 "Gnu/Linux - a better way" }http://www.jus.uio.no/sisu/
-{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
-
{GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.jus.uio.no/sisu/
+{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
!_ linked url footnote shortcut
@@ -744,7 +742,6 @@ No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,0
\* Contributed at least ten times; \** at least 5 times in last month; \*\** more than 100 times in last month.
-
% code{
% test
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index f8d1f833..6ad9e890 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 2.7.2
-:date_stamp: 2010w39/5
-:date: "2010-10-01"
+:version: 2.7.3
+:date_stamp: 2010w40/3
+:date: "2010-10-06"
:project: SiSU