|
1 swat.c - patch is currently disabled because tme man-section 5 is not converted to 4 |
|
2 # git-like |
|
3 #--- a/source3/web/swat.c 2009-07-03 04:21:14.000000000 -0700 |
|
4 #+++ b/source3/web/swat.c 2009-09-01 07:39:04.758980165 -0700 |
|
5 #@@ -203,12 +203,12 @@ |
|
6 # char *output; |
|
7 # if(strcmp(pLabel, pTranslated) != 0) { |
|
8 # output = talloc_asprintf(ctx, |
|
9 #- "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A> %s <br><span class=\"i18n_translated_parm\">%s</span>", |
|
10 #+ "<A HREF=\"/swat/help/manpages/smb.conf.4.html#%s\" target=\"docs\"> %s</A> %s <br><span class=\"i18n_translated_parm\">%s</span>", |
|
11 # pAnchor, pHelp, pLabel, pTranslated); |
|
12 # return output; |
|
13 # } |
|
14 # output = talloc_asprintf(ctx, |
|
15 #- "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A> %s", |
|
16 #+ "<A HREF=\"/swat/help/manpages/smb.conf.4.html#%s\" target=\"docs\"> %s</A> %s", |
|
17 # pAnchor, pHelp, pLabel); |
|
18 # return output; |
|
19 # } |
|
20 #@@ -1257,7 +1257,7 @@ |
|
21 # printf("<H3>%s</H3>\n", _("Important Note:")); |
|
22 # printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box ")); |
|
23 # printf("%s",_("are autoloaded printers from ")); |
|
24 #- printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name")); |
|
25 #+ printf("<A HREF=\"/swat/help/smb.conf.4.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name")); |
|
26 # printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect.")); |
|
27 # |
|
28 # if (cgi_variable("Commit") && snum >= 0) { |
|
29 # git-like |
|
30 --- a/docs-xml/configure.ac-bkp 2011-05-23 11:40:30.309466703 +0200 |
|
31 +++ b/docs-xml/configure.ac 2011-05-23 12:18:34.727978926 +0200 |
|
32 @@ -54,5 +54,8 @@ |
|
33 fi |
|
34 |
|
35 AC_SUBST(TARGETS) |
|
36 +AC_SUBST(BUILDDIR) |
|
37 +AC_SUBST(DOCBOOKXSLVER) |
|
38 +AC_SUBST(DOCBOOKXSLDIR) |
|
39 |
|
40 AC_OUTPUT( Makefile.settings build/catalog.xml) |
|
41 # git-like |
|
42 --- a/docs-xml/smbdotconf/generate-file-list.sh Sat Feb 20 01:12:25 2010 |
|
43 +++ b/docs-xml/smbdotconf/generate-file-list.sh Mon Jan 18 03:38:09 2010 |
|
44 @@ -9,7 +9,10 @@ |
|
45 cd $DIR |
|
46 |
|
47 echo "<section xmlns:xi=\"http://www.w3.org/2003/XInclude\">" |
|
48 -for I in `find . -mindepth 2 -type f -name '*.xml' | sort -t/ -k3 | xargs` |
|
49 + |
|
50 +#for I in `find . -mindepth 2 -type f -name '*.xml' | sort -t/ -k3 | xargs` |
|
51 +# Remove lines containing just one slash |
|
52 +for I in `find . -type f -name '*.xml' | grep -v '^[^/]*/[^/]*$' | sort -t/ -k3 | xargs` |
|
53 do |
|
54 echo "<xi:include href='$I' parse='xml'/>" |
|
55 done |
|
56 # git-like |
|
57 --- a/docs-xml/build/catalog.xml.in-bkp 2011-05-23 11:41:02.207116056 +0200 |
|
58 +++ b/docs-xml/build/catalog.xml.in 2011-05-23 12:09:22.968664219 +0200 |
|
59 @@ -2,6 +2,49 @@ |
|
60 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> |
|
61 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> |
|
62 |
|
63 +<!-- There is obsolete release of the docbook-xml in Solaris so we should |
|
64 + download more recent release and rewrite references to it --> |
|
65 + |
|
66 + <delegatePublic |
|
67 + publicIdStartString="-//OASIS//ENTITIES DocBook XML" |
|
68 + catalog="file:///usr/share/sgml/docbook/xmlcatalog"/> |
|
69 + |
|
70 + <delegatePublic |
|
71 + publicIdStartString="-//OASIS//DTD DocBook XML" |
|
72 + catalog="file:///usr/share/sgml/docbook/xmlcatalog"/> |
|
73 + |
|
74 + <delegatePublic |
|
75 + publicIdStartString="ISO 8879:1986" |
|
76 + catalog="file:///usr/share/sgml/docbook/xmlcatalog"/> |
|
77 + |
|
78 + <delegateSystem |
|
79 + systemIdStartString="http://www.oasis-open.org/docbook/" |
|
80 + catalog="file:///usr/share/sgml/docbook/xmlcatalog"/> |
|
81 + |
|
82 + <delegateURI |
|
83 + uriStartString="http://www.oasis-open.org/docbook/" |
|
84 + catalog="file:///usr/share/sgml/docbook/xmlcatalog"/> |
|
85 + |
|
86 + <rewriteSystem |
|
87 + systemIdStartString="http://docbook.sourceforge.net/release/xsl/@DOCBOOKXSLVER@" |
|
88 + rewritePrefix="file:///@DOCBOOKXSLDIR@"/> |
|
89 + |
|
90 + <rewriteURI |
|
91 + uriStartString="http://docbook.sourceforge.net/release/xsl/@DOCBOOKXSLVER@" |
|
92 + rewritePrefix="file:///@DOCBOOKXSLDIR@"/> |
|
93 + |
|
94 + <rewriteSystem |
|
95 + systemIdStartString="http://docbook.sourceforge.net/release/xsl/current" |
|
96 + rewritePrefix="file:///@DOCBOOKXSLDIR@"/> |
|
97 + |
|
98 + <rewriteURI |
|
99 + uriStartString="http://docbook.sourceforge.net/release/xsl/current" |
|
100 + rewritePrefix="file:///@DOCBOOKXSLDIR@"/> |
|
101 + |
|
102 + <rewriteSystem |
|
103 + systemIdStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0" |
|
104 + rewritePrefix="file:///usr/share/xml/scrollkeeper/dtds"/> |
|
105 + |
|
106 <!-- XML Catalog file for SAMBA. --> |
|
107 |
|
108 <rewriteURI |