summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlax <vlax@tuxfamily.org>2009-05-02 20:26:04 (GMT)
committer vlax <vlax@tuxfamily.org>2009-05-02 20:26:04 (GMT)
commitf84faa787b2286d2129e7923cddcbee1395c9666 (patch)
treedb38f0a20f2d763067a5aa6a17af2771c539e85a
parent8ccfa487801bc76222d38a3fc64ec76212361527 (diff)
parent48dafac077d7cb6198c1fe92a17a4eabcb4c54b4 (diff)
Merge branch 'master' of git@code.dyne.org:manuals
-rw-r--r--dynebolic/EN/console.sgml6
-rw-r--r--dynebolic/EN/devel.sgml8
-rw-r--r--dynebolic/EN/install.sgml2
-rw-r--r--dynebolic/EN/system.sgml1
-rw-r--r--dynebolic/EN/video.sgml1
-rw-r--r--freej/Makefile3
-rwxr-xr-xutils/formatimages.sh11
7 files changed, 24 insertions, 8 deletions
diff --git a/dynebolic/EN/console.sgml b/dynebolic/EN/console.sgml
index c023f56..88c2223 100644
--- a/dynebolic/EN/console.sgml
+++ b/dynebolic/EN/console.sgml
@@ -255,6 +255,8 @@ I have a directory in there called 'adam'), I would type:
</userinput> <lineannotation><keycap>[Enter]</keycap></lineannotation>
</screen>
+</para>
+
</section>
<section>
@@ -603,6 +605,8 @@ drwxr-xr-x 17 root root 4096 Oct 5 09:31 usr
drwxr-xr-x 15 root root 4096 Oct 9 13:57 var
</screen>
+</para>
+
<para>
The above listing is a fairly standard directory structure for Linux.
Each name on the far right represents a directory, and each directory
@@ -659,7 +663,7 @@ at best get a superficial glimpse. We will arbitrarily choose a
couple: <emphasis>nano</emphasis> and <emphasis>vim</emphasis>. We
will also look at <emphasis>less</emphasis> which is not an editor but
is a command that allows you to read files on your system.
-
+</para>
<section>
<title>less</title>
diff --git a/dynebolic/EN/devel.sgml b/dynebolic/EN/devel.sgml
index 15b13c1..2d93b6c 100644
--- a/dynebolic/EN/devel.sgml
+++ b/dynebolic/EN/devel.sgml
@@ -223,7 +223,7 @@ and that's it! your new module will be found in
$DYNE_SYS_MNT/dyne/SDK/cdrom/dyne/modules/spaghetti.dyne and ready
to be included in the next CD ISO that you can pack with dynesdk
mkiso.
-<para>
+</para>
<para>
Before releasing your module into the public, is a good idea to fill
@@ -241,7 +241,7 @@ packager The Crazy Cook http://tuttifrutti.org/~crazycook
Just use your favorite text editor to fill in these fields, leave a
space or a tab between the field name and value and that's it.
-<para>
+</para>
<para>
@@ -311,7 +311,7 @@ To do this you simply have to create a <emphasis>skel</emphasis>
directory inside your module: all files that are included in it will
be automatically copied into all users home directories and setted up
to be adopted for users that are created in future. <
-<para>
+</para>
<para>
In your modules you can include any kernel module correctly compiled
@@ -347,7 +347,7 @@ skel optional directory, contains all settings to be added to /home/user and /e
kernel optional directory, contains kernel modules that can be loaded by loadmod
</screen>
You have the power to create, now go make something wonderful! :)
-<para>
+</para>
</section>
diff --git a/dynebolic/EN/install.sgml b/dynebolic/EN/install.sgml
index d84e4a6..3435920 100644
--- a/dynebolic/EN/install.sgml
+++ b/dynebolic/EN/install.sgml
@@ -401,7 +401,7 @@ configuration file is provided
in <emphasis>/etc/synergy.conf</emphasis> and it must be modified
with the hostnames of your computers (to be associated to IP numeric
addresses in /etc/hosts).
-
+</para>
<para>
The main computer where the keyboard and mouse are attached should run
diff --git a/dynebolic/EN/system.sgml b/dynebolic/EN/system.sgml
index a658e11..5879ddd 100644
--- a/dynebolic/EN/system.sgml
+++ b/dynebolic/EN/system.sgml
@@ -189,6 +189,7 @@ Fat32, Ext2, ReiserFS, Beos (BeFS), and NTFS (supported since version
2.5). The nest is just one file created in the /dyne directory at the
root of your partition (C:\ or D:\ in the DOS filesystem) called
<emphasis>dyne.nst</emphasis>. To erase a nest simply delete that file.
+</para>
<para>
Since version 2.5 it is also possible to mount nests after boot: just
diff --git a/dynebolic/EN/video.sgml b/dynebolic/EN/video.sgml
index ea18c08..ca70ad8 100644
--- a/dynebolic/EN/video.sgml
+++ b/dynebolic/EN/video.sgml
@@ -106,7 +106,6 @@ be interesting and sometimes very useful to your research.
<secondary> FreeJ </secondary>
</indexterm>
-<para>
<ulink url="http://freej.dyne.org">FreeJ</ulink> is a vision mixer: an
instrument for realtime video manipulation used in the fields of dance
teather, veejaying, medical visualisation and TV.
diff --git a/freej/Makefile b/freej/Makefile
index 111cc8f..951856b 100644
--- a/freej/Makefile
+++ b/freej/Makefile
@@ -100,8 +100,9 @@ postscript : $(DEPS)
rtf : $(DEPS)
rm -f $(filename).rtf
+ $(utils)/formatimages.sh $(lang) rtf
cd $(lang) && SP_ENCODING=XML \
- docbook2rtf -d $(DSSSL-pdf) \
+ docbook2rtf -d $(DSSSL-pdf) -s . \
$(filename).sgml
tex : $(DEPS)
diff --git a/utils/formatimages.sh b/utils/formatimages.sh
index 32d577f..18961df 100755
--- a/utils/formatimages.sh
+++ b/utils/formatimages.sh
@@ -37,6 +37,17 @@ case $target in
;;
+ rtf)
+ # rtf images want no extensions
+ outdir="$lang/images"
+ mkdir -p $outdir
+ for i in `ls images/*`; do
+ file="`basename $i | cut -d. -f1`"
+ echo "converting $file without extension"
+ cp $i "$outdir/${file}"
+ done
+
+ ;;
*)
echo "ERROR in image/convert.sh - must specify a target, i.e: convert.sh EN html"