[interchange-docs] xmldocs - docelic modified 14 files

docs at icdevgroup.org docs at icdevgroup.org
Mon Aug 20 14:37:38 EDT 2007


User:      docelic
Date:      2007-08-20 18:37:38 GMT
Modified:  .        TODO
Modified:  bin      refs-autogen
Modified:  docbook  html-chunks.xsl
Modified:  guides   databases.xml faq.xml iccattut.xml index.xml
Modified:           install.xml optimization.xml programming-style.xml
Modified:           release.xml search.xml upgrade.xml xmldocs.xml
Log:
Remove the recently added code for [restrict]s and replace
with a much cleaner solution on docbook/xslt level.

Revision  Changes    Path
1.104     +1 -0      xmldocs/TODO


rev 1.104, prev_rev 1.103
Index: TODO
===================================================================
RCS file: /var/cvs/xmldocs/TODO,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- TODO	18 Aug 2007 21:33:39 -0000	1.103
+++ TODO	20 Aug 2007 18:37:37 -0000	1.104
@@ -1,4 +1,5 @@
 Bugs:
+- search doc se nevidi jer je search neki actionmap
 - on online docs, mention that obsolete examples are obsolete, 
   provide search box, provide static files for download, 
 	describe keys like alt+n



1.119     +0 -10     xmldocs/bin/refs-autogen


rev 1.119, prev_rev 1.118
Index: refs-autogen
===================================================================
RCS file: /var/cvs/xmldocs/bin/refs-autogen,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- refs-autogen	18 Aug 2007 21:33:39 -0000	1.118
+++ refs-autogen	20 Aug 2007 18:37:37 -0000	1.119
@@ -857,16 +857,6 @@
 			}
 		}
 
-		# XXX Ok, here are two ugly hacks to insert IC
-		# [restrict] thing for online docs.
-		$symbols{$group}{$key} =~
-		s#<title>#<title><phrase condition='online'>[restrict log='none']</phrase>#s or
-		warn "Didn't manage to insert restrict for $group/$key!\n";
-
-		$symbols{$group}{$key} =~
-		s#(.*)</para>#$1<phrase condition='online'>\[/restrict\]</phrase></para>#s or
-		warn "Didn't manage to insert /restrict for $group/$key!\n";
-
 		$refpage .= $symbols{$group}{$key};
 	}
 



1.21      +13 -3     xmldocs/docbook/html-chunks.xsl


rev 1.21, prev_rev 1.20
Index: html-chunks.xsl
===================================================================
RCS file: /var/cvs/xmldocs/docbook/html-chunks.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- html-chunks.xsl	18 Aug 2007 21:33:39 -0000	1.20
+++ html-chunks.xsl	20 Aug 2007 18:37:38 -0000	1.21
@@ -17,9 +17,11 @@
 	<xsl:param name="use.id.as.filename"/>
 	<xsl:param name="root.filename">index</xsl:param>
 	<xsl:param name="chunk.fast">0</xsl:param>
+	<xsl:param name="chunk.quetly">1</xsl:param>
 	<xsl:param name="chunk.section.depth">1</xsl:param>
+	<xsl:param name="chunk.first.sections">1</xsl:param>
 	<xsl:param name="chunker.output.encoding" select="'ISO-8859-1'" />
-	<xsl:param name="chunker.output.indent">no</xsl:param>
+	<xsl:param name="chunker.output.indent">yes</xsl:param>
 
 	
 	<!-- a parameter added to docbook after my inquiry. Will have no
@@ -30,7 +32,14 @@
 	<xsl:param name="refclass.suppress">1</xsl:param>
 
 
-  <xsl:template name="user.footer.content" >
+
+	<!-- insert [restrict] [/restrict] into documents for online
+		viewing -->
+	<xsl:template name="user.header.content">
+		<xsl:comment>[restrict log='none']</xsl:comment>
+	</xsl:template>
+	<xsl:template name="user.footer.content">
+		<xsl:comment>[/restrict]</xsl:comment>
   <p class='w3c'>
     <a href="http://www.docbook.org/">
       <img
@@ -45,7 +54,7 @@
         class='w3cimg'/>
     </a>
   </p>
-  </xsl:template>
+	</xsl:template>
 
 
 	<!-- Norman Walsh gave me a nice idea and code. Since chunked documents
@@ -131,6 +140,7 @@
 
 	<xsl:include href="common.xsl"/>
 	<xsl:include href="html-common.xsl"/>
+
 
 </xsl:stylesheet>
 



1.4       +1 -2      xmldocs/guides/databases.xml


rev 1.4, prev_rev 1.3
Index: databases.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/databases.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- databases.xml	18 Aug 2007 23:49:37 -0000	1.3
+++ databases.xml	20 Aug 2007 18:37:38 -0000	1.4
@@ -27,7 +27,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -140,6 +139,6 @@
 <section id='userdb'>
 	<title>User Database</title>
 <para>
-<phrase condition='online'>[/restrict]</phrase></para>
+</para>
 </section>
 </article>



1.12      +0 -3      xmldocs/guides/faq.xml


rev 1.12, prev_rev 1.11
Index: faq.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/faq.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- faq.xml	18 Aug 2007 23:49:37 -0000	1.11
+++ faq.xml	20 Aug 2007 18:37:38 -0000	1.12
@@ -31,7 +31,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -1992,8 +1991,6 @@
 All in all, &IC; has been proven to be securable over time.
 But we all have to do our part and think about what we are doing
 with user-entered data.
-
-<phrase condition="online">[/restrict]</phrase>
 </para>
 </answer></qandaentry>
 



1.41      +0 -2      xmldocs/guides/iccattut.xml


rev 1.41, prev_rev 1.40
Index: iccattut.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/iccattut.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- iccattut.xml	18 Aug 2007 23:49:37 -0000	1.40
+++ iccattut.xml	20 Aug 2007 18:37:38 -0000	1.41
@@ -72,7 +72,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -1250,7 +1249,6 @@
 		</para></listitem>
 		<listitem><para>
 		Organize your products into categories and group lists by category
-		<phrase condition="online">[/restrict]</phrase>
 		</para></listitem>
 	</itemizedlist>
 </sect1>



1.20      +0 -4      xmldocs/guides/index.xml


rev 1.20, prev_rev 1.19
Index: index.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/index.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- index.xml	18 Aug 2007 23:49:37 -0000	1.19
+++ index.xml	20 Aug 2007 18:37:38 -0000	1.20
@@ -10,9 +10,6 @@
 <titleabbrev>index</titleabbrev>
 </bookinfo>
 
-<para><phrase condition="online">[restrict log='none']</phrase></para>
-
-
 <!--
 <informaltable
 	align='center' pgwide='1' orient='port' title='' label='' frame='vsides'
@@ -272,7 +269,6 @@
 
 <para role="copyright">
 	Copyright 2005-2007 <ulink url='http://www.icdevgroup.org/'>Interchange Development Group (http://www.icdevgroup.org/)</ulink>, Davor Ocelic, <ulink url='mailto:docelic+icdevgroup.org'>(docelic+icdevgroup.org)</ulink>
-	<phrase condition="online">[/restrict]</phrase>
 </para>
 
 </book>



1.11      +0 -2      xmldocs/guides/install.xml


rev 1.11, prev_rev 1.10
Index: install.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/install.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- install.xml	18 Aug 2007 23:49:37 -0000	1.10
+++ install.xml	20 Aug 2007 18:37:38 -0000	1.11
@@ -27,7 +27,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -412,7 +411,6 @@
 	<para>
 	For all information on starting, stopping, restarting and otherwise
 	controlling the &IC; server, see &howto-daemon-control;.
-	<phrase condition="online">[/restrict]</phrase>
 	</para>
 </sect1>
 



1.5       +0 -2      xmldocs/guides/optimization.xml


rev 1.5, prev_rev 1.4
Index: optimization.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/optimization.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- optimization.xml	18 Aug 2007 23:49:37 -0000	1.4
+++ optimization.xml	20 Aug 2007 18:37:38 -0000	1.5
@@ -32,7 +32,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -494,7 +493,6 @@
 			You can also retrieve values using <code>[scratchd <replaceable>VARIABLE_NAME</replaceable>]</code>
 			to return the contents and delete them from the session at the same
 			time.
-			<phrase condition="online">[/restrict]</phrase>
 			</para>
 		</sect3>
 	</sect2>



1.12      +0 -2      xmldocs/guides/programming-style.xml


rev 1.12, prev_rev 1.11
Index: programming-style.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/programming-style.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- programming-style.xml	18 Aug 2007 23:49:37 -0000	1.11
+++ programming-style.xml	20 Aug 2007 18:37:38 -0000	1.12
@@ -41,7 +41,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -300,7 +299,6 @@
   ['TagDir',        'root_dir_array',   'code'],
 ]]></programlisting>
 </literallayout>
-<phrase condition="online">[/restrict]</phrase>
 		</para></listitem>
 	</itemizedlist>
 </sect1>



1.5       +1 -2      xmldocs/guides/release.xml


rev 1.5, prev_rev 1.4
Index: release.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/release.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- release.xml	18 Aug 2007 23:49:37 -0000	1.4
+++ release.xml	20 Aug 2007 18:37:38 -0000	1.5
@@ -64,14 +64,13 @@
 	<title>Website</title>
 
 	<para>
-	<phrase condition="online">[/restrict]</phrase>
 	</para>
 </sect1>
 
 <!--
 
 RELEASING A NEW VERSION OF INTERCHANGE
-$Id: release.xml,v 1.4 2007/08/18 23:49:37 docelic Exp $
+$Id: release.xml,v 1.5 2007/08/20 18:37:38 docelic Exp $
 
 
 Pre-release:



1.22      +0 -2      xmldocs/guides/search.xml


rev 1.22, prev_rev 1.21
Index: search.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/search.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- search.xml	18 Aug 2007 23:49:37 -0000	1.21
+++ search.xml	20 Aug 2007 18:37:38 -0000	1.22
@@ -25,7 +25,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -821,7 +820,6 @@
        os=yes"
 ]Renaissance and Impressionist Paintings&lt;a&gt;
 </programlisting>
-<phrase condition="online">[/restrict]</phrase>
 		</para>
 		</section>
 </section>



1.6       +0 -2      xmldocs/guides/upgrade.xml


rev 1.6, prev_rev 1.5
Index: upgrade.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/upgrade.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upgrade.xml	18 Aug 2007 23:49:37 -0000	1.5
+++ upgrade.xml	20 Aug 2007 18:37:38 -0000	1.6
@@ -35,7 +35,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -1032,7 +1031,6 @@
 If you do this wrong, you'll get an error that looks like this:</para>
 
 <para>
-<phrase condition="online">[/restrict]</phrase>
 <programlisting>
  115.202.115.237 H8gbq6oK:115.202.115.237 - \
   [28/February/2001:18:58:50 -0500] testcat /cgi-bin/testcat.cgi \



1.17      +0 -2      xmldocs/guides/xmldocs.xml


rev 1.17, prev_rev 1.16
Index: xmldocs.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/xmldocs.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xmldocs.xml	18 Aug 2007 23:49:37 -0000	1.16
+++ xmldocs.xml	20 Aug 2007 18:37:38 -0000	1.17
@@ -27,7 +27,6 @@
 
 	<legalnotice>
 		<para>
-		<phrase condition="online">[restrict log='none']</phrase>
 		This documentation is free; you can redistribute it and/or modify
 		it under the terms of the &GNU; General Public License as published by
 		the Free Software Foundation; either version 2 of the License, or
@@ -191,7 +190,6 @@
 	<ulink url="http://www.docbook.org/tdg/en/html/ulink.html">ulink</ulink> - link to external resources<sbr/>
 	<ulink url="http://www.docbook.org/tdg/en/html/warning.html">warning</ulink> - warning block, stands out<sbr/>
 	<ulink url="http://www.docbook.org/tdg/en/html/xref.html">xref</ulink> - link within the same document<sbr/>
-<phrase condition="online">[/restrict]</phrase>
 	</para>
 
 </sect1>








More information about the docs mailing list