From 8c20a748bd0373daa66bd39bb303a1a8b61c6e2d Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 8 Apr 2004 11:18:59 +0000 Subject: Fix samba-docs build after svn conversion and Samba3 By Example addition. Now we are able to build everything in samba-docs properly. (This used to be commit bb09f771958150e9465a5dc9d8e62aa8477c17a4) --- docs/Makefile.in | 29 ++- docs/configure.in | 2 +- docs/devel/dev-doc.xml | 2 +- docs/entities/global.entities | 565 +++++++++++++++++++++++++++++++++++++++++ docs/entities/xinclude.dtd | 31 +++ docs/global.ent | 565 ----------------------------------------- docs/howto/index.xml | 2 +- docs/manpages/editreg.1.xml | 2 +- docs/manpages/findsmb.1.xml | 2 +- docs/manpages/lmhosts.5.xml | 2 +- docs/manpages/log2pcap.1.xml | 2 +- docs/manpages/mount.cifs.8.xml | 2 +- docs/manpages/net.8.xml | 2 +- docs/manpages/nmbd.8.xml | 2 +- docs/manpages/nmblookup.1.xml | 2 +- docs/manpages/ntlm_auth.1.xml | 2 +- docs/manpages/pdbedit.8.xml | 2 +- docs/manpages/profiles.1.xml | 2 +- docs/manpages/rpcclient.1.xml | 2 +- docs/manpages/samba.7.xml | 2 +- docs/manpages/smbcacls.1.xml | 2 +- docs/manpages/smbclient.1.xml | 2 +- docs/manpages/smbcontrol.1.xml | 2 +- docs/manpages/smbcquotas.1.xml | 2 +- docs/manpages/smbd.8.xml | 2 +- docs/manpages/smbget.1.xml | 2 +- docs/manpages/smbmnt.8.xml | 2 +- docs/manpages/smbmount.8.xml | 2 +- docs/manpages/smbpasswd.5.xml | 2 +- docs/manpages/smbpasswd.8.xml | 2 +- docs/manpages/smbsh.1.xml | 2 +- docs/manpages/smbspool.8.xml | 2 +- docs/manpages/smbstatus.1.xml | 2 +- docs/manpages/smbtar.1.xml | 2 +- docs/manpages/smbtree.1.xml | 2 +- docs/manpages/smbumount.8.xml | 2 +- docs/manpages/swat.8.xml | 2 +- docs/manpages/tdbbackup.8.xml | 2 +- docs/manpages/tdbdump.8.xml | 2 +- docs/manpages/testparm.1.xml | 2 +- docs/manpages/testprns.1.xml | 2 +- docs/manpages/vfstest.1.xml | 2 +- docs/manpages/wbinfo.1.xml | 2 +- docs/manpages/winbindd.8.xml | 2 +- docs/xslt/expand-sambadoc.xsl | 2 +- 45 files changed, 653 insertions(+), 619 deletions(-) create mode 100644 docs/entities/global.entities create mode 100644 docs/entities/xinclude.dtd delete mode 100644 docs/global.ent (limited to 'docs') diff --git a/docs/Makefile.in b/docs/Makefile.in index 7602476cb4..791a1532a9 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -31,24 +31,25 @@ LATEX += --interaction nonstopmode endif # Paths -OUTPUTDIR = output -ARCHIVEDIR = output/archive +TOPDIR = $(shell pwd) +OUTPUTDIR = $(TOPDIR)/output +ARCHIVEDIR = $(OUTPUTDIR)/archive SRCDIR = @srcdir@ MANDIR=$(OUTPUTDIR)/manpages EPSTOPDF = @EPSTOPDF@ -MANPAGEDIR = manpages -HOWTODIR = howto +MANPAGEDIR = $(TOPDIR)/manpages +HOWTODIR = $(TOPDIR)/howto MAKEINDEX = @MAKEINDEX@ IMAGEPROJDIR = $(HOWTODIR)/imagefiles -GUIDEDOC = guide -EXAMPLESDIR = examples -DEVDOC = devdoc -SMBDOTCONFDOC = smbdotconf +GUIDEDOC = $(TOPDIR)/guide +EXAMPLESDIR = $(TOPDIR)/examples +DEVDOC = $(TOPDIR)/devdoc +SMBDOTCONFDOC = $(TOPDIR)/smbdotconf PSDIR = $(OUTPUTDIR) PDFDIR = $(OUTPUTDIR) DVIDIR = $(OUTPUTDIR) TXTDIR = $(OUTPUTDIR)/textdocs -FAQHOWTODIR = faq +FAQHOWTODIR = $(TOPDIR)/faq FAQDIR = $(OUTPUTDIR)/faq HTMLDIR=$(OUTPUTDIR)/htmldocs PLUCKERDIR=$(OUTPUTDIR)/plucker @@ -153,7 +154,7 @@ clean: rm -f $(PLUCKERDIR)/*.pdb # Text files -$(TXTDIR): +$(TXTDIR): $(OUTPUTDIR) mkdir $(TXTDIR) $(TXTDIR)/%.txt: %.xml @@ -196,12 +197,14 @@ $(PSDIR)/%.ps: $(DVIDIR)/%.dvi xslt/figures/%.pdf: xslt/figures/%.eps $(EPSTOPDF) $< +$(OUTPUTDIR): + mkdir $(OUTPUTDIR) # Single large HTML files -$(HTMLDIR): +$(HTMLDIR): $(OUTPUTDIR) mkdir $(HTMLDIR) -$(PLUCKERDIR): +$(PLUCKERDIR): $(OUTPUTDIR) mkdir $(PLUCKERDIR) CSS: $(HTMLDIR) xslt/html/samba.css @@ -248,7 +251,7 @@ smb.conf.5.xml: $(SMBDOTCONFDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.all. $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/parameters.service.xml $(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $< -$(MANDIR): +$(MANDIR): $(OUTPUTDIR) mkdir $(MANDIR) $(MANDIR)/%: %.xml diff --git a/docs/configure.in b/docs/configure.in index 5c21f08a83..1fa6c915a2 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -1,4 +1,4 @@ -AC_INIT(global.ent) +AC_INIT(entities/global.entities) AC_PATH_PROG(XSLTPROC, xsltproc) if test "x$XSLTPROC" = x; then diff --git a/docs/devel/dev-doc.xml b/docs/devel/dev-doc.xml index b97b3d8f86..8a9e165a79 100644 --- a/docs/devel/dev-doc.xml +++ b/docs/devel/dev-doc.xml @@ -1,6 +1,6 @@ %globalentities; + %globalentities; diff --git a/docs/entities/global.entities b/docs/entities/global.entities new file mode 100644 index 0000000000..c4b1d7f33e --- /dev/null +++ b/docs/entities/global.entities @@ -0,0 +1,565 @@ + + + + + + + + + + + + + +JelmerR.VernooijR. + + The Samba Team +
jelmer@samba.org
+'> + +&person.jelmer;'> + +GeraldCarter(Jerry) + + Samba Team +
jerry@samba.org
+'> + +&person.jerry;'> + + + JeremyAllison + + Samba Team +
jra@samba.org
+ +'> + +JohnTerpstraH. + + Samba Team +
jht@samba.org
+'> + +&person.jht;'> + +GuentherDeschner + + SuSE +
gd@suse.de
+'> + +&person.gd;'> + +KarlAuer + + Samba Team +
kauer@biplane.com.au
+ +'> + +&person.kauer;'> + +DanShearer + + Samba Team +
dan@samba.org
+ +'> + +&person.danshearer;'> + +TimPotter + + Samba Team +
tpot@samba.org
+ +'> + +&person.tpot;'> + + + AndrewTridgell + + Samba Team +
tridge@samba.org
+ +'> + +JimMcDonough + + IBM +
jmcd@us.ibm.com
+ '> + +&person.jmcd;'> + + + VolkerLendecke + + Samba Team +
Volker.Lendecke@SerNet.DE
+ +'> + + + DavidBannon + + Samba Team +
dbannon@samba.org
+ +'> + + + RafalSzczesniak + + Samba Team +
mimir@samba.org
+ +'> + + + DavidLechnyr + + Unofficial HOWTO +
david@lechnyr.com
+ +'> + + + EricRoseme + + HP Oplocks Usage Recommendations Whitepaper +
eric.roseme@hp.com
+ +'> + + + + + + + + + + + + + + + + + + + + + + + + + + + +-d|--debug=debuglevel + +debuglevel is an integer +from 0 to 10. The default value if this parameter is +not specified is zero. + +The higher this value, the more detail will be +logged to the log files about the activities of the +server. At level 0, only critical errors and serious +warnings will be logged. Level 1 is a reasonable level for +day-to-day running - it generates a small amount of +information about operations carried out. + +Levels above 1 will generate considerable +amounts of log data, and should only be used when +investigating a problem. Levels above 3 are designed for +use only by developers and generate HUGE amounts of log +data, most of which is extremely cryptic. + +Note that specifying this parameter here will +override the log level parameter +in the &smb.conf; file. + +'> + + +-s <configuration file> +The file specified contains the +configuration details required by the server. The +information in this file includes server-specific +information such as what printcap file to use, as well +as descriptions of all the services that the server is +to provide. See &smb.conf; for more information. +The default configuration file name is determined at +compile time. +'> + + +-V +Prints the program version number. + +'> + + +-l|--logfile=logdirectory +Base directory name for log/debug files. The extension +".progname" will be appended (e.g. log.smbclient, +log.smbd, etc...). The log file is never removed by the client. + +'> + + + + +-R <name resolve order> +This option is used to determine what naming +services and in what order to resolve +host names to IP addresses. The option takes a space-separated +string of different name resolution options. + +The options are: "lmhosts", "host", "wins" and "bcast". +They cause names to be resolved as follows : + + +lmhosts: +Lookup an IP address in the Samba lmhosts file. If the +line in lmhosts has no name type attached to the +NetBIOS name +(see the lmhosts + 5 for details) +then any name type matches for lookup. + + +host: +Do a standard host name to IP address resolution, using +the system /etc/hosts, NIS, or DNS +lookups. This method of name resolution is operating +system dependent, for instance on IRIX or Solaris this +may be controlled by the /etc/nsswitch.conf + file). Note that this method is only used +if the NetBIOS name type being queried is the 0x20 +(server) name type, otherwise it is ignored. + + +wins: +Query a name with the IP address listed in the +wins server parameter. If no +WINS server has been specified this method will be +ignored. + + +bcast: +Do a broadcast on each of the known local interfaces +listed in the interfaces +parameter. This is the least reliable of the name +resolution methods as it depends on the target host +being on a locally connected subnet. + + + +If this parameter is not set then the name resolve order +defined in the &smb.conf; file parameter +(name resolve order) will be used. + + +The default order is lmhosts, host, wins, bcast. Without +this parameter or any entry in the name resolve order parameter of the &smb.conf; file, the name +resolution methods will be attempted in this order. +'> + + +-n <primary NetBIOS name> +This option allows you to override +the NetBIOS name that Samba uses for itself. This is identical +to setting the netbios name parameter in the &smb.conf; file. +However, a command +line setting will take precedence over settings in +&smb.conf;. +'> + + +-i <scope> +This specifies a NetBIOS scope that +nmblookup will use to communicate with when +generating NetBIOS names. For details on the use of NetBIOS +scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are +very rarely used, only set this parameter +if you are the system administrator in charge of all the +NetBIOS systems you communicate with. +'> + + +-W|--workgroup=domain +Set the SMB domain of the username. This +overrides the default domain which is the domain defined in +smb.conf. If the domain specified is the same as the servers +NetBIOS name, it causes the client to log on using the servers local +SAM (as opposed to the Domain SAM). +'> + + +-O socket options +TCP socket options to set on the client +socket. See the socket options parameter in +the &smb.conf; manual page for the list of valid +options. + +'> + + + + +-N +If specified, this parameter suppresses the normal +password prompt from the client to the user. This is useful when +accessing a service that does not require a password. + +Unless a password is specified on the command line or +this parameter is specified, the client will request a +password. +'> + + + + +-U|--user=username[&pct;password] +Sets the SMB username or username and password. + +If &pct;password is not specified, the user will be prompted. The +client will first check the USER environment variable, then the +LOGNAME variable and if either exists, the +string is uppercased. If these environmental variables are not +found, the username GUEST is used. + +A third option is to use a credentials file which +contains the plaintext of the username and password. This +option is mainly provided for scripts where the admin does not +wish to pass the credentials on the command line or via environment +variables. If this method is used, make certain that the permissions +on the file restrict access from unwanted users. See the +-A for more details. + +Be cautious about including passwords in scripts. Also, on +many systems the command line of a running process may be seen +via the ps command. To be safe always allow +rpcclient to prompt for a password and type +it in directly. + +'> + + +-A|--authfile=filename +This option allows +you to specify a file from which to read the username and +password used in the connection. The format of the file is + + + +username = <value> +password = <value> +domain = <value> + + +Make certain that the permissions on the file restrict +access from unwanted users. +'> + + +-k + +Try to authenticate with kerberos. Only useful in +an Active Directory environment. + + +'> + + + +-h|--help +Print a summary of command line options. + +'> + + + + +smbd'> +nmbd'> +testparm'> +smb.conf'> +smbclient'> +winbindd'> +net'> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Currently NOT implemented."> +root# "> +$ "> +C:\> "> + + + + + + + + + +"> diff --git a/docs/entities/xinclude.dtd b/docs/entities/xinclude.dtd new file mode 100644 index 0000000000..1634275be0 --- /dev/null +++ b/docs/entities/xinclude.dtd @@ -0,0 +1,31 @@ + + + + + + + + + + + + + diff --git a/docs/global.ent b/docs/global.ent deleted file mode 100644 index 1efdd62528..0000000000 --- a/docs/global.ent +++ /dev/null @@ -1,565 +0,0 @@ - - - - - - - - - - - - - -JelmerR.VernooijR. - - The Samba Team -
jelmer@samba.org
-'> - -&person.jelmer;'> - -GeraldCarter(Jerry) - - Samba Team -
jerry@samba.org
-'> - -&person.jerry;'> - - - JeremyAllison - - Samba Team -
jra@samba.org
- -'> - -JohnTerpstraH. - - Samba Team -
jht@samba.org
-'> - -&person.jht;'> - -GuentherDeschner - - SuSE -
gd@suse.de
-'> - -&person.gd;'> - -KarlAuer - - Samba Team -
kauer@biplane.com.au
- -'> - -&person.kauer;'> - -DanShearer - - Samba Team -
dan@samba.org
- -'> - -&person.danshearer;'> - -TimPotter - - Samba Team -
tpot@samba.org
- -'> - -&person.tpot;'> - - - AndrewTridgell - - Samba Team -
tridge@samba.org
- -'> - -JimMcDonough - - IBM -
jmcd@us.ibm.com
- '> - -&person.jmcd;'> - - - VolkerLendecke - - Samba Team -
Volker.Lendecke@SerNet.DE
- -'> - - - DavidBannon - - Samba Team -
dbannon@samba.org
- -'> - - - RafalSzczesniak - - Samba Team -
mimir@samba.org
- -'> - - - DavidLechnyr - - Unofficial HOWTO -
david@lechnyr.com
- -'> - - - EricRoseme - - HP Oplocks Usage Recommendations Whitepaper -
eric.roseme@hp.com
- -'> - - - - - - - - - - - - - - - - - - - - - - - - - - - --d|--debug=debuglevel - -debuglevel is an integer -from 0 to 10. The default value if this parameter is -not specified is zero. - -The higher this value, the more detail will be -logged to the log files about the activities of the -server. At level 0, only critical errors and serious -warnings will be logged. Level 1 is a reasonable level for -day-to-day running - it generates a small amount of -information about operations carried out. - -Levels above 1 will generate considerable -amounts of log data, and should only be used when -investigating a problem. Levels above 3 are designed for -use only by developers and generate HUGE amounts of log -data, most of which is extremely cryptic. - -Note that specifying this parameter here will -override the log level parameter -in the &smb.conf; file. - -'> - - --s <configuration file> -The file specified contains the -configuration details required by the server. The -information in this file includes server-specific -information such as what printcap file to use, as well -as descriptions of all the services that the server is -to provide. See &smb.conf; for more information. -The default configuration file name is determined at -compile time. -'> - - --V -Prints the program version number. - -'> - - --l|--logfile=logdirectory -Base directory name for log/debug files. The extension -".progname" will be appended (e.g. log.smbclient, -log.smbd, etc...). The log file is never removed by the client. - -'> - - - - --R <name resolve order> -This option is used to determine what naming -services and in what order to resolve -host names to IP addresses. The option takes a space-separated -string of different name resolution options. - -The options are: "lmhosts", "host", "wins" and "bcast". -They cause names to be resolved as follows : - - -lmhosts: -Lookup an IP address in the Samba lmhosts file. If the -line in lmhosts has no name type attached to the -NetBIOS name -(see the lmhosts - 5 for details) -then any name type matches for lookup. - - -host: -Do a standard host name to IP address resolution, using -the system /etc/hosts, NIS, or DNS -lookups. This method of name resolution is operating -system dependent, for instance on IRIX or Solaris this -may be controlled by the /etc/nsswitch.conf - file). Note that this method is only used -if the NetBIOS name type being queried is the 0x20 -(server) name type, otherwise it is ignored. - - -wins: -Query a name with the IP address listed in the -wins server parameter. If no -WINS server has been specified this method will be -ignored. - - -bcast: -Do a broadcast on each of the known local interfaces -listed in the interfaces -parameter. This is the least reliable of the name -resolution methods as it depends on the target host -being on a locally connected subnet. - - - -If this parameter is not set then the name resolve order -defined in the &smb.conf; file parameter -(name resolve order) will be used. - - -The default order is lmhosts, host, wins, bcast. Without -this parameter or any entry in the name resolve order parameter of the &smb.conf; file, the name -resolution methods will be attempted in this order. -'> - - --n <primary NetBIOS name> -This option allows you to override -the NetBIOS name that Samba uses for itself. This is identical -to setting the netbios name parameter in the &smb.conf; file. -However, a command -line setting will take precedence over settings in -&smb.conf;. -'> - - --i <scope> -This specifies a NetBIOS scope that -nmblookup will use to communicate with when -generating NetBIOS names. For details on the use of NetBIOS -scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are -very rarely used, only set this parameter -if you are the system administrator in charge of all the -NetBIOS systems you communicate with. -'> - - --W|--workgroup=domain -Set the SMB domain of the username. This -overrides the default domain which is the domain defined in -smb.conf. If the domain specified is the same as the servers -NetBIOS name, it causes the client to log on using the servers local -SAM (as opposed to the Domain SAM). -'> - - --O socket options -TCP socket options to set on the client -socket. See the socket options parameter in -the &smb.conf; manual page for the list of valid -options. - -'> - - - - --N -If specified, this parameter suppresses the normal -password prompt from the client to the user. This is useful when -accessing a service that does not require a password. - -Unless a password is specified on the command line or -this parameter is specified, the client will request a -password. -'> - - - - --U|--user=username[&pct;password] -Sets the SMB username or username and password. - -If &pct;password is not specified, the user will be prompted. The -client will first check the USER environment variable, then the -LOGNAME variable and if either exists, the -string is uppercased. If these environmental variables are not -found, the username GUEST is used. - -A third option is to use a credentials file which -contains the plaintext of the username and password. This -option is mainly provided for scripts where the admin does not -wish to pass the credentials on the command line or via environment -variables. If this method is used, make certain that the permissions -on the file restrict access from unwanted users. See the --A for more details. - -Be cautious about including passwords in scripts. Also, on -many systems the command line of a running process may be seen -via the ps command. To be safe always allow -rpcclient to prompt for a password and type -it in directly. - -'> - - --A|--authfile=filename -This option allows -you to specify a file from which to read the username and -password used in the connection. The format of the file is - - - -username = <value> -password = <value> -domain = <value> - - -Make certain that the permissions on the file restrict -access from unwanted users. -'> - - --k - -Try to authenticate with kerberos. Only useful in -an Active Directory environment. - - -'> - - - --h|--help -Print a summary of command line options. - -'> - - - - -smbd'> -nmbd'> -testparm'> -smb.conf'> -smbclient'> -winbindd'> -net'> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Currently NOT implemented."> -root# "> -$ "> -C:\> "> - - - - - - - - - -"> diff --git a/docs/howto/index.xml b/docs/howto/index.xml index 410cbc010a..79d7c24617 100644 --- a/docs/howto/index.xml +++ b/docs/howto/index.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/editreg.1.xml b/docs/manpages/editreg.1.xml index 0a6b36bcf0..1022887edf 100644 --- a/docs/manpages/editreg.1.xml +++ b/docs/manpages/editreg.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/findsmb.1.xml b/docs/manpages/findsmb.1.xml index 8a89b2ce24..7159e41566 100644 --- a/docs/manpages/findsmb.1.xml +++ b/docs/manpages/findsmb.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/lmhosts.5.xml b/docs/manpages/lmhosts.5.xml index afee69bc96..246db3035d 100644 --- a/docs/manpages/lmhosts.5.xml +++ b/docs/manpages/lmhosts.5.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/log2pcap.1.xml b/docs/manpages/log2pcap.1.xml index e8c03c5dc1..bf40a2ef59 100644 --- a/docs/manpages/log2pcap.1.xml +++ b/docs/manpages/log2pcap.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/mount.cifs.8.xml b/docs/manpages/mount.cifs.8.xml index d674d03cac..b57480e02e 100644 --- a/docs/manpages/mount.cifs.8.xml +++ b/docs/manpages/mount.cifs.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/net.8.xml b/docs/manpages/net.8.xml index 21dc54d452..a6d4099045 100644 --- a/docs/manpages/net.8.xml +++ b/docs/manpages/net.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/nmbd.8.xml b/docs/manpages/nmbd.8.xml index db65c48919..31b1d123a3 100644 --- a/docs/manpages/nmbd.8.xml +++ b/docs/manpages/nmbd.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/nmblookup.1.xml b/docs/manpages/nmblookup.1.xml index 14df0066f5..46cfd7a926 100644 --- a/docs/manpages/nmblookup.1.xml +++ b/docs/manpages/nmblookup.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/ntlm_auth.1.xml b/docs/manpages/ntlm_auth.1.xml index f4478f7d41..fc5b34c3e4 100644 --- a/docs/manpages/ntlm_auth.1.xml +++ b/docs/manpages/ntlm_auth.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/pdbedit.8.xml b/docs/manpages/pdbedit.8.xml index e05c729572..06b53f1bcd 100644 --- a/docs/manpages/pdbedit.8.xml +++ b/docs/manpages/pdbedit.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/profiles.1.xml b/docs/manpages/profiles.1.xml index 3ae823f634..52cd9dfcfc 100644 --- a/docs/manpages/profiles.1.xml +++ b/docs/manpages/profiles.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/rpcclient.1.xml b/docs/manpages/rpcclient.1.xml index 3510458610..35c71ddd61 100644 --- a/docs/manpages/rpcclient.1.xml +++ b/docs/manpages/rpcclient.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/samba.7.xml b/docs/manpages/samba.7.xml index 7f31ab3bc5..bf791cf253 100644 --- a/docs/manpages/samba.7.xml +++ b/docs/manpages/samba.7.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbcacls.1.xml b/docs/manpages/smbcacls.1.xml index 78980a6aec..cfc5ddbd36 100644 --- a/docs/manpages/smbcacls.1.xml +++ b/docs/manpages/smbcacls.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbclient.1.xml b/docs/manpages/smbclient.1.xml index 78cc642e76..e268019fea 100644 --- a/docs/manpages/smbclient.1.xml +++ b/docs/manpages/smbclient.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbcontrol.1.xml b/docs/manpages/smbcontrol.1.xml index af6054de58..5315b25e7b 100644 --- a/docs/manpages/smbcontrol.1.xml +++ b/docs/manpages/smbcontrol.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbcquotas.1.xml b/docs/manpages/smbcquotas.1.xml index 280d1b6364..a1e2ad9b24 100644 --- a/docs/manpages/smbcquotas.1.xml +++ b/docs/manpages/smbcquotas.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbd.8.xml b/docs/manpages/smbd.8.xml index 4a3d3fdc0c..cf98be9fcb 100644 --- a/docs/manpages/smbd.8.xml +++ b/docs/manpages/smbd.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbget.1.xml b/docs/manpages/smbget.1.xml index 96b8cf10c8..6f899e04ad 100644 --- a/docs/manpages/smbget.1.xml +++ b/docs/manpages/smbget.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbmnt.8.xml b/docs/manpages/smbmnt.8.xml index 0495fa5be0..4f57234345 100644 --- a/docs/manpages/smbmnt.8.xml +++ b/docs/manpages/smbmnt.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbmount.8.xml b/docs/manpages/smbmount.8.xml index 0017c99cd5..ffcac0fbfa 100644 --- a/docs/manpages/smbmount.8.xml +++ b/docs/manpages/smbmount.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbpasswd.5.xml b/docs/manpages/smbpasswd.5.xml index cb6a6070bd..375d3e38eb 100644 --- a/docs/manpages/smbpasswd.5.xml +++ b/docs/manpages/smbpasswd.5.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbpasswd.8.xml b/docs/manpages/smbpasswd.8.xml index 3ee3a9e12e..0407027907 100644 --- a/docs/manpages/smbpasswd.8.xml +++ b/docs/manpages/smbpasswd.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbsh.1.xml b/docs/manpages/smbsh.1.xml index 36319085b8..ebd4d1d240 100644 --- a/docs/manpages/smbsh.1.xml +++ b/docs/manpages/smbsh.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbspool.8.xml b/docs/manpages/smbspool.8.xml index ec62a0d5df..72cea33f3e 100644 --- a/docs/manpages/smbspool.8.xml +++ b/docs/manpages/smbspool.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbstatus.1.xml b/docs/manpages/smbstatus.1.xml index 1e96b39263..5c0bad5219 100644 --- a/docs/manpages/smbstatus.1.xml +++ b/docs/manpages/smbstatus.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbtar.1.xml b/docs/manpages/smbtar.1.xml index c773937844..4843085565 100644 --- a/docs/manpages/smbtar.1.xml +++ b/docs/manpages/smbtar.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbtree.1.xml b/docs/manpages/smbtree.1.xml index f9661f4849..05c843614f 100644 --- a/docs/manpages/smbtree.1.xml +++ b/docs/manpages/smbtree.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbumount.8.xml b/docs/manpages/smbumount.8.xml index d8feb8e938..43178ea432 100644 --- a/docs/manpages/smbumount.8.xml +++ b/docs/manpages/smbumount.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/swat.8.xml b/docs/manpages/swat.8.xml index 902918d932..f10a3c7591 100644 --- a/docs/manpages/swat.8.xml +++ b/docs/manpages/swat.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/tdbbackup.8.xml b/docs/manpages/tdbbackup.8.xml index e5f060b101..321ec3f8f9 100644 --- a/docs/manpages/tdbbackup.8.xml +++ b/docs/manpages/tdbbackup.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/tdbdump.8.xml b/docs/manpages/tdbdump.8.xml index c31bef480b..38119678c6 100644 --- a/docs/manpages/tdbdump.8.xml +++ b/docs/manpages/tdbdump.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/testparm.1.xml b/docs/manpages/testparm.1.xml index 84ead17234..3b282e44ec 100644 --- a/docs/manpages/testparm.1.xml +++ b/docs/manpages/testparm.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/testprns.1.xml b/docs/manpages/testprns.1.xml index 50584f5a18..9f03910482 100644 --- a/docs/manpages/testprns.1.xml +++ b/docs/manpages/testprns.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/vfstest.1.xml b/docs/manpages/vfstest.1.xml index 7b68963fba..69f617c922 100644 --- a/docs/manpages/vfstest.1.xml +++ b/docs/manpages/vfstest.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/wbinfo.1.xml b/docs/manpages/wbinfo.1.xml index 728e4f166a..c9f3b3a252 100644 --- a/docs/manpages/wbinfo.1.xml +++ b/docs/manpages/wbinfo.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/winbindd.8.xml b/docs/manpages/winbindd.8.xml index 0986b10119..bfa3b4ff53 100644 --- a/docs/manpages/winbindd.8.xml +++ b/docs/manpages/winbindd.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index 2c9aa0a82a..d72725ab26 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -75,7 +75,7 @@ <!DOCTYPE PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ - <!ENTITY % globalentities SYSTEM 'global.ent'> %globalentities; + <!ENTITY % globalentities SYSTEM 'entities/global.entities'> %globalentities; ]> -- cgit