From 6ca9586a073f35926ef18fb574a85412562cda27 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 1 May 2015 18:35:55 -0400 Subject: documentation, reflect absence of version directory branches --- data/doc/sisu/markup-samples/manual/README | 8 ++++---- .../markup-samples/manual/_sisu/sisu_document_make | 2 +- .../sisu/markup-samples/manual/en/sisu_commands.sst | 10 +--------- data/doc/sisu/markup-samples/manual/en/sisu_config.ssi | 12 ++++++------ data/doc/sisu/markup-samples/manual/en/sisu_howto.sst | 18 +++++++----------- .../sisu/markup-samples/manual/en/sisu_install_run.sst | 8 +------- data/doc/sisu/markup-samples/manual/en/sisu_markup.sst | 2 -- .../sisu/markup-samples/manual/en/sisu_synopsis.ssi | 12 ------------ 8 files changed, 20 insertions(+), 52 deletions(-) (limited to 'data/doc/sisu/markup-samples/manual') diff --git a/data/doc/sisu/markup-samples/manual/README b/data/doc/sisu/markup-samples/manual/README index dab91438..7d2481c7 100644 --- a/data/doc/sisu/markup-samples/manual/README +++ b/data/doc/sisu/markup-samples/manual/README @@ -1,5 +1,5 @@ -ruby ../../../../../bin/sisu6 --txt --no-ocn -v en/README.ssm -ruby ../../../../../bin/sisu6 --txt --no-ocn -v --no-manifest --dump='../../../../../..' en/README.ssm +ruby ../../../../../bin/sisu --txt --no-ocn -v en/README.ssm +ruby ../../../../../bin/sisu --txt --no-ocn -v --no-manifest --dump='../../../../../..' en/README.ssm -ruby ../../../../../bin/sisu6 --manpage -v en/sisu.ssm -ruby ../../../../../bin/sisu6 --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm +ruby ../../../../../bin/sisu --manpage -v en/sisu.ssm +ruby ../../../../../bin/sisu --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm 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 080786e2..7c377f4c 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: /${sisu_stable}/,'7.0.0' /${sisu_dev}/,'7.0.0' /${debian_stable}/,'*{Jessie}*' /${debian_testing}/,'*{Stretch}*' + :substitute: /${sisu_stable}/,'7.0.0' /${sisu_dev}/,'7.0.0' /${vn}/,'v7' /${debian_stable}/,'*{Jessie}*' /${debian_testing}/,'*{Stretch}*' :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 3bf24cad..6fd5912e 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst @@ -1,4 +1,4 @@ -% SiSU 5.0 +% SiSU 7.0 @title: SiSU :subtitle: Commands @@ -451,14 +451,6 @@ on its own, provides SiSU version information !_ -v [filename/wildcard] \\ see --verbose -!_ --v5 [filename/wildcard] \\ -invokes the sisu v5 document parser/generator. You may run sisu5 instead. This is the current default and is normally omitted. -={ SiSU command:sisu5|sisu version 5|--v5 } - -!_ --v6 [filename/wildcard] \\ -invokes the sisu v6 document parser/generator. You may run sisu6 instead. -={ SiSU command:sisu6|sisu version 6|--v6 } - !_ --verbose [filename/wildcard] \\ provides verbose output of what is being generated, where output is placed (and error messages if any), as with -u flag provides a url mapping of files created for each of the processing flag requests. Alias -v ={ SiSU command:verbose|--verbose|-v (verbose) } diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi index a4e5d3b1..e7e108ae 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi +++ b/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi @@ -35,15 +35,15 @@ The SiSU configuration file is a yaml file, which means indentation is significa SiSU resource configuration is determined by looking at the following files if they exist: -_1 ./_sisu/v5/sisurc.yml +_1 ./_sisu/${vn}/sisurc.yml _1 ./_sisu/sisurc.yml -_1 ~/.sisu/v5/sisurc.yml +_1 ~/.sisu/${vn}/sisurc.yml _1 ~/.sisu/sisurc.yml -_1 /etc/sisu/v5/sisurc.yml +_1 /etc/sisu/${vn}/sisurc.yml _1 /etc/sisu/sisurc.yml @@ -62,15 +62,15 @@ Most sisu document headers relate to metadata, the exception is the @make: heade The search order is as for resource configuration: -_1 ./_sisu/v5/sisu_document_make +_1 ./_sisu/${vn}/sisu_document_make _1 ./_sisu/sisu_document_make -_1 ~/.sisu/v5/sisu_document_make +_1 ~/.sisu/${vn}/sisu_document_make _1 ~/.sisu/sisu_document_make -_1 /etc/sisu/v5/sisu_document_make +_1 /etc/sisu/${vn}/sisu_document_make _1 /etc/sisu/sisu_document_make diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst b/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst index 6fffb29e..f40d5329 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst @@ -235,27 +235,23 @@ _1 sisu -vR[and processing flags] [filename/wildcard] Sample provided, on untarring the source tarball: -_1 conf/sisu/v5/sisurc.yml - -_1 conf/sisu/v6/sisurc.yml +_1 conf/sisu/sisurc.yml and on installation under: -_1 /etc/sisu/v5/sisurc.yml - -_1 /etc/sisu/v6/sisurc.yml +_1 /etc/sisu/sisurc.yml The following paths are searched: -_1 ./_sisu/v5/sisurc.yml or ./_sisu/v6/sisurc.yml +_1 ./_sisu/${vn}/sisurc.yml _1 ./_sisu/sisurc.yml -_1 ~/.sisu/v5/sisurc.yml or ~/.sisu/v6/sisurc.yml +_1 ~/.sisu/${vn}/sisurc.yml _1 ~/.sisu/sisurc.yml -_1 /etc/sisu/v5/sisurc.yml /etc/sisu/v6/sisurc.yml +_1 /etc/sisu/${vn}/sisurc.yml _1 /etc/sisu/sisurc.yml @@ -1112,11 +1108,11 @@ _1 http://www.jus.uio.no/sisu/SiSU/examples.html There is syntax support for some editors provided (together with a README file) in -_1 ./data/sisu/v5/conf/editor-syntax-etc +_1 ./data/sisu/${vn}/conf/editor-syntax-etc usually installed to: -_1 /usr/share/sisu/v5/conf/editor-syntax-etc +_1 /usr/share/sisu/${vn}/conf/editor-syntax-etc 2~ License 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 97fdbd28..6f69abc3 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 @@ -61,13 +61,7 @@ _1 qi gem --create --build --install --unstable Provided you have ruby & rake, this can be done with the single command: -_1 rake gem_create_build_install # (to build and install sisu v5 & sisu v6, alias gemcbi) - -separate gems are made/installed for sisu v5 & sisu v6 contained in source: - -_1 rake gem_create_build_install_stable # (to build and install sisu v5, alias gem5cbi) - -_1 rake gem_create_build_install_unstable # (to build and install sisu v6, alias gem6cbi) +_1 rake gem_create_build_install # (to build and install, alias gemcbi) for individual steps (create, build, install) see rake options, rake -T to specify sisu version for sisu installed via gem diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst index 43c161d1..d94f9a7a 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst @@ -207,8 +207,6 @@ code{ synopsis=sisu [-abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard ] . sisu [-Ddcv] [instruction] . sisu [-CcFLSVvW] - . sisu --v5 [operations] - . sisu --v6 [operations] @links: { SiSU Homepage }http://www.sisudoc.org/ diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi index 81644d76..9ca2a260 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi +++ b/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi @@ -33,16 +33,4 @@ sisu [ -CcFLSVvW ] Note: commands should be issued from within the directory that contains the marked up files, cd to markup directory. -sisu ships with version5 and version 6 (which is under development). - -sisu --v6 [and options/operations as above] - -or - -sisu6 [and options/operations as above] - -sisu version 1 has been discontinued. - -for settings see sisu --help env - sisu [ filename/ wildcard] == sisu -0 [filename/wildcard] -- cgit v1.2.3