Merge tag 'sisu_5.5.0' into debian/sid

SiSU 5.5.0

1 files changed, 16 insertions, 7 deletions

diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index f6f4a943..8789a75d 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2014-05-18" "6.0.6" "SiSU"
+.TH "sisu" "1" "2014-07-11" "6.1.0" "SiSU"
 .br
 .SH NAME
 .br
@@ -2458,8 +2458,8 @@ master document
 .B .sst
 regular markup file, or
 .B .ssi
-(insert/information) A secondary file of the composite document is built prior
-to processing with the same prefix and the suffix
+(insert). A secondary file of the composite document is built prior to
+processing with the same prefix and the suffix
 .B ._sst
 
 .BR
@@ -2587,10 +2587,12 @@ with the same prefix and the suffix ._sst [^11]
 Inserts are documents prepared solely for the purpose of being incorporated
 into one or more master documents. They resemble regular
 .B SiSU
-text files except they are ignored by the
-.B SiSU
-processor. Making a file a .ssi file is a quick and convenient way of flagging
-that it is not intended that the file should be processed on its own.
+text files (.sst). Since sisu -5.5.0 (6.1.0) .ssi files can like .ssm files
+include other .sst or .ssm files. .ssi files cannot be called by the sisu
+processor directly and can only be incorporated in other documents. Making a
+file a .ssi file is a quick and convenient way of breaking up a document that
+is to be included in a master document, and flagging that the file to be
+incorporated .ssi is not intended that the file should be processed on its own.
 .SH SISUPOD, ZIPPED BINARY CONTAINER (SISUPOD.ZIP, .SSP)
 
 
@@ -3534,6 +3536,13 @@ sisu --pg --update -v en/sisu_manual.ssm
 
 .BR
 To create a sample search form, from within the same directory run:
+.nf
+sisu --sample-search-form --db-pg
+.fi
+
+
+.BR
+and copy the resulting cgi form to your cgi-bin directory
 
 .BR
 A sample setup for nginx is provided that assumes data will be stored under