From 5dafd395158f0bcb4d754c588fb8294d97a77f7a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 10 May 2011 16:23:59 +0200 Subject: [PATCH] +\n for ikiwiki Signed-off-by: Nico Schottelius --- README | 6 ++++-- build.sh | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README b/README index 6f1a759c..635d381d 100644 --- a/README +++ b/README @@ -51,9 +51,11 @@ UNIX, simplicity, familar environment | cdist is configured in POSIX shell ### Documentation The cdist documentation is included as manpages in the distribution. -You can [browse the documentation for the latest version online](man) as well. -Or you can watch the youtube video + + * You can [browse the documentation of the latest version online](man) as well. + * Or you can watch the youtube **video** [cdist installation and first usage in less than 60 seconds][http://www.youtube.com/watch?v=PRMjzy48eTI). + * Have a look at the [given speeches](speeches) ### OS support diff --git a/build.sh b/build.sh index 919605b4..b1d27817 100755 --- a/build.sh +++ b/build.sh @@ -39,6 +39,7 @@ WEBPAGE=${WEBBASE}.mdwn MANDIR=doc/man MAN1DSTDIR=${MANDIR}/man1 MAN7DSTDIR=${MANDIR}/man7 +SPEECHESDIR=doc/speeches case "$1" in man) @@ -85,7 +86,8 @@ case "$1" in ;; speeches) - for speech in doc/speeches/*tex; do + cd "$SPEECHESDIR" + for speech in *tex; do pdflatex $speech pdflatex $speech pdflatex $speech @@ -95,9 +97,13 @@ case "$1" in web) cp README ${WEBDIR}/${WEBPAGE} rm -rf ${WEBDIR}/${WEBBASE}/man && mkdir ${WEBDIR}/${WEBBASE}/man + rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches + cp ${MAN1DSTDIR}/*.html ${MAN7DSTDIR}/*.html ${WEBDIR}/${WEBBASE}/man + cp ${SPEECHESDIR}/*.pdf ${WEBDIR}/${WEBBASE}/speeches + git describe > ${WEBDIR}/${WEBBASE}/man/VERSION - cd ${WEBDIR} && git add ${WEBBASE}/man + cd ${WEBDIR} && git add ${WEBBASE} cd ${WEBDIR} && git commit -m "cdist update" ${WEBBASE} ${WEBPAGE} cd ${WEBDIR} && make pub ;;