aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtes2006-03-07 21:29:32 +0000
committerLudovic Courtes2006-03-07 21:29:32 +0000
commita1fe0c70cf816c122d3ba640bc9abf553f076d5d (patch)
tree40c60a3c1b2ca71206a151fb173412992e22c843 /doc
parent7ddcfdf4f07723986ec519fb8b9eb965bd24ea1d (diff)
parent950293910c75c4ecd7d3ff072c428150d55d7f78 (diff)
downloadskribilo-a1fe0c70cf816c122d3ba640bc9abf553f076d5d.tar.gz
skribilo-a1fe0c70cf816c122d3ba640bc9abf553f076d5d.tar.lz
skribilo-a1fe0c70cf816c122d3ba640bc9abf553f076d5d.zip
Merge from lcourtes@laas.fr--2004-libre
Patches applied: * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 67-69) - Doc: undoed `patch-65'. - Removed the global engine table. - Inventory fix. git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-42
Diffstat (limited to 'doc')
-rw-r--r--doc/user/.arch-inventory2
-rw-r--r--doc/user/markup.skb5
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/user/.arch-inventory b/doc/user/.arch-inventory
index 348e7be..52f57b5 100644
--- a/doc/user/.arch-inventory
+++ b/doc/user/.arch-inventory
@@ -1,4 +1,4 @@
# Skribilo-generated files.
-precious ^user\.(html|ps)$
+precious ^user(-[0-9]+)?\.(html|ps)$
# arch-tag: 827d1e94-1b36-474e-bcdb-a4235b4af848
diff --git a/doc/user/markup.skb b/doc/user/markup.skb
index 22cbce3..272bfbe 100644
--- a/doc/user/markup.skb
+++ b/doc/user/markup.skb
@@ -67,9 +67,8 @@ calls are legal ,(tt "section") calls:])
;*---------------------------------------------------------------------*/
;* Markups */
;*---------------------------------------------------------------------*/
-;; FIXME: Processors (used by the following files) are broken!
-;;(include "document.skb")
-;;(include "sectioning.skb")
+(include "document.skb")
+(include "sectioning.skb")
(include "toc.skb")
(include "ornament.skb")
(include "line.skb")