Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/samba/samba36/patches/docs-xml.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 29 Oct 2015 11:05:40 -0700
changeset 5029 77413b29eb5a
parent 4463 0f8d88e8430f
permissions -rw-r--r--
22107485 More Userland component man page normalizations
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4433
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     1
 
--- a/docs-xml/configure.ac-bkp	2011-05-23 11:40:30.309466703 +0200
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     2
 
+++ b/docs-xml/configure.ac	2011-05-23 12:18:34.727978926 +0200
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -54,5 +54,8 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     4
 
 fi
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     5
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     6
 
 AC_SUBST(TARGETS)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     7
 
+AC_SUBST(BUILDDIR)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     8
 
+AC_SUBST(DOCBOOKXSLVER)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
     9
 
+AC_SUBST(DOCBOOKXSLDIR)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    10
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    11
 
 AC_OUTPUT( Makefile.settings build/catalog.xml)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    12
 
# git-like
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    13
 
--- a/docs-xml/smbdotconf/generate-file-list.sh	Sat Feb 20 01:12:25 2010
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    14
 
+++ b/docs-xml/smbdotconf/generate-file-list.sh	Mon Jan 18 03:38:09 2010
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    15
 
@@ -9,7 +9,10 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    16
 
 cd $DIR
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    17
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    18
 
 echo "<section xmlns:xi=\"http://www.w3.org/2003/XInclude\">"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    19
 
-for I in `find . -mindepth 2 -type f -name '*.xml' | sort -t/ -k3 | xargs`
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    20
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    21
 
+#for I in `find . -mindepth 2 -type f -name '*.xml' | sort -t/ -k3 | xargs`
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    22
 
+# Remove lines containing just one slash
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    23
 
+for I in `find . -type f -name '*.xml' | grep -v '^[^/]*/[^/]*$' | sort -t/ -k3 | xargs`
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    24
 
 do
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    25
 
 	echo "<xi:include href='$I' parse='xml'/>"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    26
 
 done
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    27
 
# git-like
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    28
 
--- a/docs-xml/build/catalog.xml.in-bkp	2011-05-23 11:41:02.207116056 +0200
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    29
 
+++ b/docs-xml/build/catalog.xml.in	2011-05-23 12:09:22.968664219 +0200
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    30
 
@@ -2,6 +2,49 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    31
 
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    32
 
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    33
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    34
 
+<!-- There is obsolete release of the docbook-xml in Solaris so we should
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    35
 
+     download more recent release and rewrite references to it -->
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    36
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    37
 
+   <delegatePublic
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    38
 
+	publicIdStartString="-//OASIS//ENTITIES DocBook XML"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    39
 
+	catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    40
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    41
 
+   <delegatePublic
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    42
 
+	publicIdStartString="-//OASIS//DTD DocBook XML"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    43
 
+	catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    44
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    45
 
+   <delegatePublic
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    46
 
+	publicIdStartString="ISO 8879:1986"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    47
 
+	catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    48
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    49
 
+   <delegateSystem
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    50
 
+	systemIdStartString="http://www.oasis-open.org/docbook/"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    51
 
+	catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    52
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    53
 
+   <delegateURI
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    54
 
+	uriStartString="http://www.oasis-open.org/docbook/"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    55
 
+	catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    56
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    57
 
+   <rewriteSystem
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    58
 
+	systemIdStartString="http://docbook.sourceforge.net/release/xsl/@DOCBOOKXSLVER@"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    59
 
+	rewritePrefix="file:///@DOCBOOKXSLDIR@"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    60
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    61
 
+   <rewriteURI
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    62
 
+	uriStartString="http://docbook.sourceforge.net/release/xsl/@DOCBOOKXSLVER@"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    63
 
+	rewritePrefix="file:///@DOCBOOKXSLDIR@"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    64
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    65
 
+   <rewriteSystem
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    66
 
+	systemIdStartString="http://docbook.sourceforge.net/release/xsl/current"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    67
 
+	rewritePrefix="file:///@DOCBOOKXSLDIR@"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    68
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    69
 
+   <rewriteURI
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    70
 
+	uriStartString="http://docbook.sourceforge.net/release/xsl/current"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    71
 
+	rewritePrefix="file:///@DOCBOOKXSLDIR@"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    72
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    73
 
+   <rewriteSystem
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    74
 
+	systemIdStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    75
 
+	rewritePrefix="file:///usr/share/xml/scrollkeeper/dtds"/>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    76
 
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    77
 
 <!--  XML Catalog file for SAMBA. -->
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    78
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset 
    79
 
     <rewriteURI
upstream/oracle/userland-gate