From f89b2e6cb641b8e5f097fa34415d3c5f20a2851a Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 15 Jul 2014 18:17:08 -0400 Subject: documents / documentation related * COPYRIGHT, date * sisu.org, minor * README * manpage --- README | 11 +++++++---- data/doc/sisu/COPYRIGHT | 4 ++-- data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make | 2 +- data/doc/sisu/markup-samples/manual/en/sisu_commands.sst | 7 +++++-- data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst | 4 ++-- data/doc/sisu/sisu.org | 4 ++-- man/man1/sisu.1 | 9 ++++++--- 7 files changed, 25 insertions(+), 16 deletions(-) diff --git a/README b/README index a4970509..5f87fcdd 100644 --- a/README +++ b/README @@ -81,9 +81,9 @@ specify sisu version for sisu installed via gem gem search sisu - sisu _5.4.5_ --version + sisu _5.5.1_ --version - sisu _6.0.11_ --version + sisu _6.1.1_ --version to uninstall sisu installed via gem @@ -246,6 +246,9 @@ assumed for most other flags, creates new intermediate files for processing processing of other output. This step is assumed for most processing flags. To skip it see -n. Alias -m. +*--asciitext [filename/wildcard]* +asciitext, smart text (not available) + *-b [filename/wildcard]* see --xhtml @@ -308,7 +311,7 @@ see --sqlite see --zap *--docbook [filename/wildcard/url]* -docbook smart text (not available) +docbook xml *--dump[=directory_path] [filename/wildcard]* places output in directory specified, if none is specified in the current @@ -347,7 +350,7 @@ see --sample-search-form see --find *--fictionbook [filename/wildcard/url]* -fictionbook smart text (not available) +fictionbook xml (not available) *--find [optional string part of filename]* without match string, glob all .sst .ssm files in directory (including language diff --git a/data/doc/sisu/COPYRIGHT b/data/doc/sisu/COPYRIGHT index a43d9916..c77a68f1 100644 --- a/data/doc/sisu/COPYRIGHT +++ b/data/doc/sisu/COPYRIGHT @@ -9,7 +9,7 @@ Source: http://sisudoc.org/sisu/archive/pool/main/s/sisu/ git://git.sisudoc.org/git/code/sisu.git Files: SiSU * -Copyright: 1997, 2012, Ralph Amissah +Copyright: 1997, 2014, Ralph Amissah License: GPL-3+ Files: data/sisu/v*/conf/editor-syntax-etc/emacs/sisu-mode.el @@ -30,7 +30,7 @@ License: LGPL-2.1 Files: debian/* Copyright: 2005, Ralph Amissah - 2010, SiSU Project Debian, Ralph Amissah + 2014, SiSU Project Debian, Ralph Amissah License: GPL-3+ License: GPL-3+ diff --git a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make index 72706d10..9bb0b2fa 100644 --- a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make +++ b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make @@ -3,7 +3,7 @@ :breaks: new=C; break=1 :bold: /Debian|Ruby|SiSU/ :italics: /Linux|GPL|GPLv3|LaTeX|PostgreSQL|SQLite|SQL|Vim|ascii|plaintext|UTF-?8|HTML|XHTML|XML|EPUB|OpenDocument|ODF|ODT|PDF|pgSQL|TeXinfo|YAML|YML|OCN|object citation system|object citation numbering|granular search|Dublin Core/ - :substitute: /${debian_stable}/,'*{Wheezy}*' /${debian_testing}/,'*{Jessie}*' + :substitute: /${sisu_stable}/,'5.5.1' /${sisu_dev}/,'6.1.1' /${debian_stable}/,'*{Wheezy}*' /${debian_testing}/,'*{Jessie}*' :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst index 016ef7ea..16661dd6 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst @@ -43,6 +43,9 @@ produces plaintext with Unix linefeeds and without markup, (object numbers are o !_ --ao [filename/wildcard/url] \\ assumed for most other flags, creates new intermediate files for processing (abstract objects, document abstraction) that is used in all subsequent processing of other output. This step is assumed for most processing flags. To skip it see -n. Alias -m. +!_ --asciitext [filename/wildcard] \\ +asciitext, smart text (not available) + !_ -b [filename/wildcard] \\ see --xhtml @@ -89,7 +92,7 @@ see --sqlite see --zap !_ --docbook [filename/wildcard/url] \\ -docbook smart text (not available) +docbook xml !_ --dump[=directory_path] [filename/wildcard] \\ places output in directory specified, if none is specified in the current directory (pwd). Unlike using default settings HTML files have embedded css. Compare --redirect @@ -125,7 +128,7 @@ see --sample-search-form see --find !_ --fictionbook [filename/wildcard/url] \\ -fictionbook smart text (not available) +fictionbook xml (not available) !_ --find [optional string part of filename] \\ without match string, glob all .sst .ssm files in directory (including language subdirectories). With match string, find files that match given string in directory (including language subdirectories). Alias -f, --glob, -G diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst b/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst index 667a6459..b77e216a 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst @@ -52,9 +52,9 @@ to specify sisu version for sisu installed via gem gem search sisu -_1 sisu _5.3.3_ --version +_1 sisu _${sisu_stable}_ --version -_1 sisu _6.0.3_ --version +_1 sisu _${sisu_dev}_ --version to uninstall sisu installed via gem diff --git a/data/doc/sisu/sisu.org b/data/doc/sisu/sisu.org index 64246368..196ab051 100644 --- a/data/doc/sisu/sisu.org +++ b/data/doc/sisu/sisu.org @@ -1860,7 +1860,7 @@ levels 1 2 & 3 are now distinguished (touches ) override part font size settings for different levels (B C D) -**** TODO [#C] #744384 [w|u] sisu syntax: relies on empty lines +**** DONE CLOSED [#C] #744384 [w|u] sisu syntax: relies on empty lines From: Daniel Baumann @@ -2220,7 +2220,7 @@ Daniel consider, work on possibly, later -**** TODO [#C] #744408 [w|u] sisu: support more than one level of includes/nested includes +**** DONE (5.5.0::6.1.0) [#C] #744408 [w|u] sisu: support more than one level of includes/nested includes From: Daniel Baumann diff --git a/man/man1/sisu.1 b/man/man1/sisu.1 index 8789a75d..93677518 100644 --- a/man/man1/sisu.1 +++ b/man/man1/sisu.1 @@ -1,4 +1,4 @@ -.TH "sisu" "1" "2014-07-11" "6.1.0" "SiSU" +.TH "sisu" "1" "2014-07-15" "6.1.1" "SiSU" .br .SH NAME .br @@ -143,6 +143,9 @@ assumed for most other flags, creates new intermediate files for processing processing of other output. This step is assumed for most processing flags. To skip it see -n. Alias -m. .TP +.B --asciitext [filename/wildcard] +asciitext, smart text (not available) +.TP .B -b [filename/wildcard] see --xhtml .TP @@ -205,7 +208,7 @@ see --sqlite see --zap .TP .B --docbook [filename/wildcard/url] -docbook smart text (not available) +docbook xml .TP .B --dump[=directory_path] [filename/wildcard] places output in directory specified, if none is specified in the current @@ -245,7 +248,7 @@ see --sample-search-form see --find .TP .B --fictionbook [filename/wildcard/url] -fictionbook smart text (not available) +fictionbook xml (not available) .TP .B --find [optional string part of filename] without match string, glob all .sst .ssm files in directory (including language -- cgit v1.2.3