Merge branch 'upstream' into debian/sid

1 files changed, 84 insertions, 0 deletions

diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
index 217eade6..343af720 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
@@ -53,8 +53,92 @@ The output directory root can be set in the sisurc.yml file. Under the root, sub
 
 The last part of a directory path, representing the sub-directory in which a document set resides, is the directory name that will be used for the output directory. This has implications for the organisation of document collections as it could make sense to place documents of a particular subject, or type within a directory identifying them. This grouping as suggested could be by subject (sales_law, english_literature); or just as conveniently by some other classification (X University). The mapping means it is also possible to place in the same output directory documents that are for organisational purposes kept separately, for example documents on a given subject of two different institutions may be kept in two different directories of the same name, under a directory named after each institution, and these would be output to the same output directory. Skins could be associated with each institution on a directory basis and resulting documents will take on the appropriate different appearance.
 
+3~ General Directories
+
+code{
+
+./subject_name/
+
+% files stored at this level e.g. sisu_manual.sst
+
+./subject_name/_sisu
+
+% configuration file e.g. sisurc.yml
+
+./subject_name/_sisu/skin
+
+% skins in various skin directories doc, dir, site, yml
+
+./subject_name/_sisu/css
+
+./subject_name/_sisu/image
+
+% images for documents contained in this directory
+
+./subject_name/_sisu/mm
+
+}code
+
+3~ Remote Directories
+
+code{
+
+./subject_name/
+
+% containing sub_directories named after the generated files from which they are made
+
+./subject_name/src
+
+% contains shared source files text and binary e.g. sisu_manual.sst and sisu_manual.sst.zip
+
+./subject_name/_sisu
+
+% configuration file e.g. sisurc.yml
+
+./subject_name/_sisu/skin
+
+% skins in various skin directories doc, dir, site, yml
+
+./subject_name/_sisu/css
+
+./subject_name/_sisu/image
+
+% images for documents contained in this directory
+
+./subject_name/_sisu/mm
+
+}code
+
+3~ Sisupod
+
+code{
+
+./sisupod/
+
+% files stored at this level e.g. sisu_manual.sst
+
+./sisupod/_sisu
+
+% configuration file e.g. sisurc.yml
+
+./sisupod/_sisu/skin
+
+% skins in various skin directories doc, dir, site, yml
+
+./sisupod/_sisu/css
+
+./sisupod/_sisu/image
+
+% images for documents contained in this directory
+
+./sisupod/_sisu/mm
+
+}code
+
 2~ Organising Content
 
+
+
 % .SH "SKINS \- document, directory and site skins"