From eb87ee3d8a3c442aa14152ad481916478c4cceb8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 10 Jul 2004 18:10:36 +0000 Subject: [PATCH] Fix image support. If images are missing, this will now also cause the docs build to break. Only images that are actually used are copied. (This used to be commit 9b7099c94588916af6b3c4ebb7883e36d9bf2e6b) --- docs/Makefile.in | 37 ++++++++------------- .../Samba-Guide/Chap01-WindowsNetworkingPrimer.xml | 28 ++++++++-------- docs/Samba-Guide/Chap02-SimpleOfficeServer.xml | 8 ++--- docs/Samba-Guide/Chap03-TheSmallOffice.xml | 4 +-- docs/Samba-Guide/Chap04-SecureOfficeServer.xml | 4 +-- docs/Samba-Guide/Chap05-500UserNetwork.xml | 4 +-- docs/Samba-Guide/Chap06-MakingHappyUsers.xml | 12 +++---- docs/Samba-Guide/Chap07-2000UserNetwork.xml | 28 ++++++++-------- docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml | 8 ++--- docs/Samba-Guide/Chap09-AddingUNIXClients.xml | 12 +++---- docs/Samba-Guide/Chap12-Appendix.xml | 24 ++++++------- docs/Samba-HOWTO-Collection/Group-Mapping.xml | 31 ++++++----------- docs/Samba-HOWTO-Collection/PDC.xml | 10 ++---- docs/Samba-HOWTO-Collection/Winbind.xml | 9 ++--- .../{imagefiles => images}/.cvsignore | 0 .../{imagefiles => images}/10small.png | Bin .../{imagefiles => images}/11small.png | Bin .../{imagefiles => images}/12small.png | Bin .../{imagefiles => images}/13small.png | Bin .../{imagefiles => images}/14small.png | Bin .../{imagefiles => images}/1small.png | Bin .../{imagefiles => images}/2small.png | Bin .../{imagefiles => images}/3small.png | Bin .../{imagefiles => images}/4small.png | Bin .../{imagefiles => images}/5small.png | Bin .../{imagefiles => images}/6small.png | Bin .../{imagefiles => images}/7small.png | Bin .../{imagefiles => images}/8small.png | Bin .../{imagefiles => images}/9small.png | Bin .../{imagefiles => images}/WME001.png | Bin .../{imagefiles => images}/WME002.png | Bin .../{imagefiles => images}/WME003.png | Bin .../{imagefiles => images}/WME004.png | Bin .../{imagefiles => images}/WME005.png | Bin .../{imagefiles => images}/WME006.png | Bin .../{imagefiles => images}/WME007.png | Bin .../{imagefiles => images}/WME008.png | Bin .../{imagefiles => images}/WME009.png | Bin .../{imagefiles => images}/WME010.png | Bin .../{imagefiles => images}/WME011.png | Bin .../{imagefiles => images}/WME012.png | Bin .../{imagefiles => images}/WME013.png | Bin .../{imagefiles => images}/WME014.png | Bin .../{imagefiles => images}/WXPP002.png | Bin .../{imagefiles => images}/WXPP003.png | Bin .../{imagefiles => images}/WXPP005.png | Bin .../{imagefiles => images}/WXPP009.png | Bin .../{imagefiles => images}/WXPP014.png | Bin .../{imagefiles => images}/a_small.png | Bin .../{imagefiles => images}/access1.dia | Bin .../{imagefiles => images}/access1.png | Bin .../{imagefiles => images}/browsing1 | Bin .../{imagefiles => images}/browsing1.png | Bin .../{imagefiles => images}/cups1.dia | Bin .../{imagefiles => images}/cups1.png | Bin .../{imagefiles => images}/cups2.dia | Bin .../{imagefiles => images}/cups2.png | Bin .../{imagefiles => images}/domain.dia | Bin .../{imagefiles => images}/domain.png | Bin .../{imagefiles => images}/ethereal1.png | Bin .../{imagefiles => images}/ethereal2.png | Bin .../{imagefiles => images}/idmap-gid2sid.dia | Bin .../{imagefiles => images}/idmap-gid2sid.png | Bin .../{imagefiles => images}/idmap-groups.dia | Bin .../{imagefiles => images}/idmap-groups.png | Bin .../{imagefiles => images}/idmap-sid2gid.dia | Bin .../{imagefiles => images}/idmap-sid2gid.png | Bin .../{imagefiles => images}/idmap-sid2uid.dia | Bin .../{imagefiles => images}/idmap-sid2uid.png | Bin .../{imagefiles => images}/idmap-store-gid2sid.dia | Bin .../{imagefiles => images}/idmap-store-gid2sid.png | Bin .../{imagefiles => images}/idmap-uid2sid.dia | Bin .../{imagefiles => images}/idmap-uid2sid.png | Bin .../{imagefiles => images}/idmap.dia | Bin .../{imagefiles => images}/idmap.png | Bin .../idmap_winbind_no_loop.png | Bin .../{imagefiles => images}/pdftoepsonusb.dia | Bin .../{imagefiles => images}/pdftoepsonusb.png | Bin .../{imagefiles => images}/pdftosocket.dia | Bin .../{imagefiles => images}/pdftosocket.png | Bin .../{imagefiles => images}/trusts1.dia | Bin .../{imagefiles => images}/trusts1.png | Bin .../{imagefiles => images}/w2kp001.png | Bin .../{imagefiles => images}/w2kp002.png | Bin .../{imagefiles => images}/w2kp003.png | Bin .../{imagefiles => images}/w2kp004.png | Bin .../{imagefiles => images}/w2kp005.png | Bin .../{imagefiles => images}/w2kp006.png | Bin .../{imagefiles => images}/wxpp001.png | Bin .../{imagefiles => images}/wxpp004.png | Bin .../{imagefiles => images}/wxpp006.png | Bin .../{imagefiles => images}/wxpp007.png | Bin .../{imagefiles => images}/wxpp008.png | Bin .../{imagefiles => images}/wxpp010.png | Bin .../{imagefiles => images}/wxpp011.png | Bin .../{imagefiles => images}/wxpp012.png | Bin .../{imagefiles => images}/wxpp013.png | Bin .../{imagefiles => images}/wxpp015.png | Bin docs/scripts/copy-images.sh | 11 ++++++ docs/xslt/expand-sambadoc.xsl | 2 +- docs/xslt/find-image-dependencies.xsl | 20 +++++++++++ 101 files changed, 129 insertions(+), 123 deletions(-) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/.cvsignore (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/10small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/11small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/12small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/13small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/14small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/1small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/2small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/3small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/4small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/5small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/6small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/7small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/8small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/9small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME001.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME002.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME003.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME004.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME005.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME006.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME007.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME008.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME009.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME010.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME011.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME012.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME013.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WME014.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WXPP002.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WXPP003.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WXPP005.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WXPP009.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/WXPP014.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/a_small.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/access1.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/access1.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/browsing1 (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/browsing1.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/cups1.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/cups1.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/cups2.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/cups2.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/domain.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/domain.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/ethereal1.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/ethereal2.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-gid2sid.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-gid2sid.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-groups.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-groups.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-sid2gid.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-sid2gid.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-sid2uid.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-sid2uid.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-store-gid2sid.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-store-gid2sid.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-uid2sid.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap-uid2sid.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/idmap_winbind_no_loop.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/pdftoepsonusb.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/pdftoepsonusb.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/pdftosocket.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/pdftosocket.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/trusts1.dia (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/trusts1.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/w2kp001.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/w2kp002.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/w2kp003.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/w2kp004.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/w2kp005.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/w2kp006.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp001.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp004.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp006.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp007.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp008.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp010.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp011.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp012.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp013.png (100%) rename docs/Samba-HOWTO-Collection/{imagefiles => images}/wxpp015.png (100%) create mode 100755 docs/scripts/copy-images.sh create mode 100644 docs/xslt/find-image-dependencies.xsl diff --git a/docs/Makefile.in b/docs/Makefile.in index f041a8c2495..c391031c4ff 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -16,6 +16,7 @@ PNMTOPNG = @PNMTOPNG@ PNMTOPS = @PNMTOPS@ HTML2TEXT = @HTML2TEXT@ PLUCKERBUILD = @PLUCKERBUILD@ +COPY_IMAGES = ./scripts/copy-images.sh THUMBPDF = @THUMBPDF@ PDFLATEX = TEXINPUTS=xslt/latex:.: @PDFLATEX@ --file-line-error-style LATEX = TEXINPUTS=xslt/latex:.: @LATEX@ --file-line-error-style @@ -55,15 +56,6 @@ MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml) LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES_SOURCES)) -Samba_HOWTO_Collection_IMAGES_PNG = $(wildcard Samba-HOWTO-Collection/imagefiles/*.png) -Samba_Guide_IMAGES_PNG = $(wildcard Samba-Guide/images/*.png) - -Samba_HOWTO_Collection_IMAGEDIR = Samba-HOWTO-Collection/imagefiles -Samba_Guide_IMAGEDIR = Samba-Guide/images - -Samba_HOWTO_Collection_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_HOWTO_Collection_IMAGES_PNG)) -Samba_Guide_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_Guide_IMAGES_PNG)) - help: @echo "Supported make targets:" @echo " release - Build the docs needed for a Samba release" @@ -106,11 +98,11 @@ htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS)) $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl mkdir -p $(@D) - $(XSLTPROC) --stringparam noreference 1 --stringparam imagedir "$($(subst -,_,$*)_IMAGEDIR)/" --xinclude --output $@ xslt/expand-sambadoc.xsl $< + $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $< $(DOCBOOKDIR)/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl mkdir -p $(@D) - $(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $< + $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $< $(DOCBOOKDIR)/manpages.xml: $(MANPAGES_SOURCES) xslt/manpage-summary.xsl mkdir -p $(@D) @@ -127,15 +119,17 @@ $(HTMLDIR)/index.html: htmldocs.html $(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl mkdir -p $(@D) $(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $< - -mkdir $(HTMLDIR)/$*/images + -mkdir $(@D)/images + $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D) # Single large HTML files $(OUTPUTDIR)/%/samba.css: xslt/html/samba.css mkdir -p $(@D) cp $< $@ -$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css $(patsubst %.png,$(HTMLDIR)/images/%.png,$(%_IMAGES_PNG)) xslt/html.xsl - mkdir -p $(@D) +$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl + mkdir -p $(@D)/images + $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D) $(XSLTPROC) --output $@ xslt/html.xsl $< %-attributions.xml: @@ -169,7 +163,7 @@ $(PDFDIR)/%.pdf: %.pdf cp $< $@ # Adobe PDF files -%.pdf: %.tex latexfigures gpl.tex $(%_IMAGES_PNG) +%.pdf: %.tex latexfigures gpl.tex -$(PDFLATEX) $< -$(PDFLATEX) $< $(MAKEINDEX) $* @@ -181,7 +175,8 @@ $(DVIDIR)/%.dvi: %.dvi mkdir -p $(@D) cp $< $@ -%.dvi: %.tex %.idx gpl.tex $(%_IMAGES_EPS) +%.dvi: %.tex %.idx gpl.tex + $(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".eps" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml) -$(LATEX) $< -$(LATEX) $< $(MAKEINDEX) $* @@ -203,13 +198,9 @@ $(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml mkdir -p $(@D) $(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< -# HTML Help -$(HTMLHELPDIR)/%/images/%.png: $(%_IMAGEDIR)/%.png - mkdir -p $(@D) - cp $< $@ - -$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml #$(patsubst $(%_IMAGEDIR)/%.png,$(HTMLHELPDIR)/%/images/%.png,$(%_IMAGEDIR)/*.png) - -mkdir $@ +$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml + -mkdir -p $@/images + $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $@ $(XSLTPROC) --stringparam htmlhelp.chm $*.chm --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $< # Plucker docs diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml index d677e4cba36..6058411b354 100644 --- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml +++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml @@ -289,13 +289,13 @@ - WINREPRESSME-Capture.png - Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes + WINREPRESSME-Capture + Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes - Windows Me &smbmdash; Later Broadcast Sample - WINREPRESSME-Capture2.png + Windows Me &smbmdash; Later Broadcast Sample + WINREPRESSME-Capture2 @@ -601,8 +601,8 @@ - Typical Windows 9x/Me Host Announcement - HostAnnouncment.png + Typical Windows 9x/Me Host Announcement + HostAnnouncment @@ -725,9 +725,9 @@ - Typical Windows 9x/Me NULL SessionSetUp AndX Request + Typical Windows 9x/Me NULL SessionSetUp AndX Request - NullConnect.png + NullConnect @@ -743,8 +743,8 @@ - Typical Windows 9x/Me User SessionSetUp AndX Request - UserConnect.png + Typical Windows 9x/Me User SessionSetUp AndX Request + UserConnect @@ -898,13 +898,13 @@ - Typical Windows XP NULL Session Setup AndX Request - WindowsXP-NullConnection.png + Typical Windows XP NULL Session Setup AndX Request + WindowsXP-NullConnection - Typical Windows XP User Session Setup AndX Request - WindowsXP-UserConnection.png + Typical Windows XP User Session Setup AndX Request + WindowsXP-UserConnection diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml index 4e42b520394..8a0d359cf9a 100644 --- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml +++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml @@ -497,8 +497,8 @@ - Charity Administration Office Network - Charity-Network.png + Charity Administration Office Network + Charity-Network @@ -986,8 +986,8 @@ C:\WINDOWS: regedit ME-dpwc.reg - Accounting Office Network Topology - AccountingNetwork.png + Accounting Office Network Topology + AccountingNetwork diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml index f874a8b6788..8a4e1ef2b24 100644 --- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml +++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml @@ -303,8 +303,8 @@ - Abmas Accounting &smbmdash; 52 User Network Topology - acct2net.png + Abmas Accounting &smbmdash; 52 User Network Topology + acct2net diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml index 5ec4ab2166f..7f8366c08a1 100644 --- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml +++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml @@ -163,8 +163,8 @@
- Abmas Network Topology &smbmdash; 130 Users - chap4-net.png + Abmas Network Topology &smbmdash; 130 Users + chap4-net diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml index 3c679c1b095..5375eb99a31 100644 --- a/docs/Samba-Guide/Chap05-500UserNetwork.xml +++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml @@ -326,8 +326,8 @@ - Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend. - chap5-net.png + Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend. + chap5-net diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml index c8a547ac679..75acc22f3d6 100644 --- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml +++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml @@ -575,8 +575,8 @@ - The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts - UNIX-Samba-and-LDAP.png + The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts + UNIX-Samba-and-LDAP @@ -959,8 +959,8 @@ - Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend. - chap6-net.png + Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend. + chap6-net @@ -3131,8 +3131,8 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\ - Windows XP Professional &smbmdash; User Shared Folders - XP-screen001.png + Windows XP Professional &smbmdash; User Shared Folders + XP-screen001 diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml index 73134cf1085..6ad6c6e8bf3 100644 --- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml +++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml @@ -709,13 +709,13 @@ inconsistent directory information can be exceedingly difficult. - Network Topology &smbmdash; 2000 User Complex Design A - chap7-net-Ar.png + Network Topology &smbmdash; 2000 User Complex Design A + chap7-net-Ar - Network Topology &smbmdash; 2000 User Complex Design B - chap7-net2-Br.png + Network Topology &smbmdash; 2000 User Complex Design B + chap7-net2-Br @@ -759,8 +759,8 @@ - Samba and Authentication Backend Search Pathways - chap7-idresol.png + Samba and Authentication Backend Search Pathways + chap7-idresol @@ -800,8 +800,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz This configuration tells Samba to use a single LDAP server as shown in . - Samba Configuration to Use a Single LDAP Server - ch7-singleLDAP.png + Samba Configuration to Use a Single LDAP Server + ch7-singleLDAP LDAP @@ -822,8 +822,8 @@ passdb backend = ldapsam:"ldap://master.abmas.biz \ This configuration tells Samba to use a master LDAP server, with fail-over to a slave server if necessary, as shown in . - Samba Configuration to Use a Dual (Fail-over) LDAP Server - ch7-fail-overLDAP.png + Samba Configuration to Use a Dual (Fail-over) LDAP Server + ch7-fail-overLDAP @@ -847,8 +847,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz \ - Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use! - ch7-dual-additive-LDAP.png + Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use! + ch7-dual-additive-LDAP @@ -859,8 +859,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz \ - Samba Configuration to Use Two LDAP Databases - The result is additive. - ch7-dual-additive-LDAP-Ok.png + Samba Configuration to Use Two LDAP Databases - The result is additive. + ch7-dual-additive-LDAP-Ok diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml index a6b196f3651..e8f55b8611d 100644 --- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml +++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml @@ -183,8 +183,8 @@ - Schematic Explaining the net rpc vampire Process - ch8-migration.png + Schematic Explaining the net rpc vampire Process + ch8-migration @@ -297,8 +297,8 @@ - View of Accounts in NT4 Domain User Manager - UserMgrNT4.png + View of Accounts in NT4 Domain User Manager + UserMgrNT4 diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml index e46fc22396f..2efdde65398 100644 --- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml +++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml @@ -29,8 +29,8 @@ - Open Magazine Samba Survey - openmag.png + Open Magazine Samba Survey + openmag @@ -516,8 +516,8 @@ - Samba Domain: Samba Member Server - chap9-SambaDC.png + Samba Domain: Samba Member Server + chap9-SambaDC @@ -1098,8 +1098,8 @@ aliases: files - Active Directory Domain: Samba Member Server - chap9-ADSDC.png + Active Directory Domain: Samba Member Server + chap9-ADSDC diff --git a/docs/Samba-Guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml index c3b244c405d..0d1546d949a 100644 --- a/docs/Samba-Guide/Chap12-Appendix.xml +++ b/docs/Samba-Guide/Chap12-Appendix.xml @@ -1195,8 +1195,8 @@ example: - The LDAP Account Manager Login Screen - lam-login.png + The LDAP Account Manager Login Screen + lam-login @@ -1214,8 +1214,8 @@ example: - The LDAP Account Manager Configuration Screen - lam-config.png + The LDAP Account Manager Configuration Screen + lam-config @@ -1241,8 +1241,8 @@ example: - The LDAP Account Manager User Edit Screen - lam-users.png + The LDAP Account Manager User Edit Screen + lam-users @@ -1253,13 +1253,13 @@ example: - The LDAP Account Manager Group Edit Screen - lam-groups.png + The LDAP Account Manager Group Edit Screen + lam-groups - The LDAP Account Manager Group Membership Edit Screen - lam-group-members.png + The LDAP Account Manager Group Membership Edit Screen + lam-group-members @@ -1273,8 +1273,8 @@ example: - The LDAP Account Manager Host Edit Screen - lam-hosts.png + The LDAP Account Manager Host Edit Screen + lam-hosts diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml index 7197b12a21d..bad2cfe9d7a 100644 --- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml +++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml @@ -63,19 +63,14 @@ parameters in the &smb.conf; file. -
IDMAP: group SID to GID resolution. - - - - -
- -
IDMAP: GID resolution to matching SID. - - - - -
+ + IDMAP: group SID to GID resolution. + idmap-sid2gid + + + IDMAP: GID resolution to matching SID. + idmap-gid2sid + In both cases, when winbindd is not running, only locally resolvable groups can be recognized. Please refer to @@ -84,13 +79,9 @@ used to establish UNIX group to NT SID mappings as shown in IDMAP: storing group mappings. -
IDMAP storing group mappings. - - - - -
- + IDMAP storing group mappings. + idmap-store-gid2sid + groupadd diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml index 4504c480b82..8a839973471 100644 --- a/docs/Samba-HOWTO-Collection/PDC.xml +++ b/docs/Samba-HOWTO-Collection/PDC.xml @@ -41,13 +41,9 @@ network environment. Workstations A, B and C are representative of many physical network clients. -
An Example Domain. - - - - -
- +An Example Domain. +domain + diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml index 2f3018f8943..ae8450c7721 100644 --- a/docs/Samba-HOWTO-Collection/Winbind.xml +++ b/docs/Samba-HOWTO-Collection/Winbind.xml @@ -95,12 +95,9 @@ - + + idmap_winbind_no_loop + diff --git a/docs/Samba-HOWTO-Collection/imagefiles/.cvsignore b/docs/Samba-HOWTO-Collection/images/.cvsignore similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/.cvsignore rename to docs/Samba-HOWTO-Collection/images/.cvsignore diff --git a/docs/Samba-HOWTO-Collection/imagefiles/10small.png b/docs/Samba-HOWTO-Collection/images/10small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/10small.png rename to docs/Samba-HOWTO-Collection/images/10small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/11small.png b/docs/Samba-HOWTO-Collection/images/11small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/11small.png rename to docs/Samba-HOWTO-Collection/images/11small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/12small.png b/docs/Samba-HOWTO-Collection/images/12small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/12small.png rename to docs/Samba-HOWTO-Collection/images/12small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/13small.png b/docs/Samba-HOWTO-Collection/images/13small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/13small.png rename to docs/Samba-HOWTO-Collection/images/13small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/14small.png b/docs/Samba-HOWTO-Collection/images/14small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/14small.png rename to docs/Samba-HOWTO-Collection/images/14small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/1small.png b/docs/Samba-HOWTO-Collection/images/1small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/1small.png rename to docs/Samba-HOWTO-Collection/images/1small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/2small.png b/docs/Samba-HOWTO-Collection/images/2small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/2small.png rename to docs/Samba-HOWTO-Collection/images/2small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/3small.png b/docs/Samba-HOWTO-Collection/images/3small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/3small.png rename to docs/Samba-HOWTO-Collection/images/3small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/4small.png b/docs/Samba-HOWTO-Collection/images/4small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/4small.png rename to docs/Samba-HOWTO-Collection/images/4small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/5small.png b/docs/Samba-HOWTO-Collection/images/5small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/5small.png rename to docs/Samba-HOWTO-Collection/images/5small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/6small.png b/docs/Samba-HOWTO-Collection/images/6small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/6small.png rename to docs/Samba-HOWTO-Collection/images/6small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/7small.png b/docs/Samba-HOWTO-Collection/images/7small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/7small.png rename to docs/Samba-HOWTO-Collection/images/7small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/8small.png b/docs/Samba-HOWTO-Collection/images/8small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/8small.png rename to docs/Samba-HOWTO-Collection/images/8small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/9small.png b/docs/Samba-HOWTO-Collection/images/9small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/9small.png rename to docs/Samba-HOWTO-Collection/images/9small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME001.png b/docs/Samba-HOWTO-Collection/images/WME001.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME001.png rename to docs/Samba-HOWTO-Collection/images/WME001.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME002.png b/docs/Samba-HOWTO-Collection/images/WME002.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME002.png rename to docs/Samba-HOWTO-Collection/images/WME002.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME003.png b/docs/Samba-HOWTO-Collection/images/WME003.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME003.png rename to docs/Samba-HOWTO-Collection/images/WME003.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME004.png b/docs/Samba-HOWTO-Collection/images/WME004.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME004.png rename to docs/Samba-HOWTO-Collection/images/WME004.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME005.png b/docs/Samba-HOWTO-Collection/images/WME005.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME005.png rename to docs/Samba-HOWTO-Collection/images/WME005.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME006.png b/docs/Samba-HOWTO-Collection/images/WME006.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME006.png rename to docs/Samba-HOWTO-Collection/images/WME006.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME007.png b/docs/Samba-HOWTO-Collection/images/WME007.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME007.png rename to docs/Samba-HOWTO-Collection/images/WME007.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME008.png b/docs/Samba-HOWTO-Collection/images/WME008.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME008.png rename to docs/Samba-HOWTO-Collection/images/WME008.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME009.png b/docs/Samba-HOWTO-Collection/images/WME009.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME009.png rename to docs/Samba-HOWTO-Collection/images/WME009.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME010.png b/docs/Samba-HOWTO-Collection/images/WME010.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME010.png rename to docs/Samba-HOWTO-Collection/images/WME010.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME011.png b/docs/Samba-HOWTO-Collection/images/WME011.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME011.png rename to docs/Samba-HOWTO-Collection/images/WME011.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME012.png b/docs/Samba-HOWTO-Collection/images/WME012.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME012.png rename to docs/Samba-HOWTO-Collection/images/WME012.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME013.png b/docs/Samba-HOWTO-Collection/images/WME013.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME013.png rename to docs/Samba-HOWTO-Collection/images/WME013.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME014.png b/docs/Samba-HOWTO-Collection/images/WME014.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WME014.png rename to docs/Samba-HOWTO-Collection/images/WME014.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png b/docs/Samba-HOWTO-Collection/images/WXPP002.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png rename to docs/Samba-HOWTO-Collection/images/WXPP002.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png b/docs/Samba-HOWTO-Collection/images/WXPP003.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png rename to docs/Samba-HOWTO-Collection/images/WXPP003.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png b/docs/Samba-HOWTO-Collection/images/WXPP005.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png rename to docs/Samba-HOWTO-Collection/images/WXPP005.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png b/docs/Samba-HOWTO-Collection/images/WXPP009.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png rename to docs/Samba-HOWTO-Collection/images/WXPP009.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png b/docs/Samba-HOWTO-Collection/images/WXPP014.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png rename to docs/Samba-HOWTO-Collection/images/WXPP014.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/a_small.png b/docs/Samba-HOWTO-Collection/images/a_small.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/a_small.png rename to docs/Samba-HOWTO-Collection/images/a_small.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/access1.dia b/docs/Samba-HOWTO-Collection/images/access1.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/access1.dia rename to docs/Samba-HOWTO-Collection/images/access1.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/access1.png b/docs/Samba-HOWTO-Collection/images/access1.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/access1.png rename to docs/Samba-HOWTO-Collection/images/access1.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/browsing1 b/docs/Samba-HOWTO-Collection/images/browsing1 similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/browsing1 rename to docs/Samba-HOWTO-Collection/images/browsing1 diff --git a/docs/Samba-HOWTO-Collection/imagefiles/browsing1.png b/docs/Samba-HOWTO-Collection/images/browsing1.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/browsing1.png rename to docs/Samba-HOWTO-Collection/images/browsing1.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups1.dia b/docs/Samba-HOWTO-Collection/images/cups1.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/cups1.dia rename to docs/Samba-HOWTO-Collection/images/cups1.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups1.png b/docs/Samba-HOWTO-Collection/images/cups1.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/cups1.png rename to docs/Samba-HOWTO-Collection/images/cups1.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups2.dia b/docs/Samba-HOWTO-Collection/images/cups2.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/cups2.dia rename to docs/Samba-HOWTO-Collection/images/cups2.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups2.png b/docs/Samba-HOWTO-Collection/images/cups2.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/cups2.png rename to docs/Samba-HOWTO-Collection/images/cups2.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/domain.dia b/docs/Samba-HOWTO-Collection/images/domain.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/domain.dia rename to docs/Samba-HOWTO-Collection/images/domain.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/domain.png b/docs/Samba-HOWTO-Collection/images/domain.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/domain.png rename to docs/Samba-HOWTO-Collection/images/domain.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png b/docs/Samba-HOWTO-Collection/images/ethereal1.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png rename to docs/Samba-HOWTO-Collection/images/ethereal1.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png b/docs/Samba-HOWTO-Collection/images/ethereal2.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png rename to docs/Samba-HOWTO-Collection/images/ethereal2.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia rename to docs/Samba-HOWTO-Collection/images/idmap-gid2sid.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png rename to docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia b/docs/Samba-HOWTO-Collection/images/idmap-groups.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia rename to docs/Samba-HOWTO-Collection/images/idmap-groups.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png b/docs/Samba-HOWTO-Collection/images/idmap-groups.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png rename to docs/Samba-HOWTO-Collection/images/idmap-groups.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia rename to docs/Samba-HOWTO-Collection/images/idmap-sid2gid.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png rename to docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia rename to docs/Samba-HOWTO-Collection/images/idmap-sid2uid.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png rename to docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia rename to docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png rename to docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia rename to docs/Samba-HOWTO-Collection/images/idmap-uid2sid.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png rename to docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap.dia b/docs/Samba-HOWTO-Collection/images/idmap.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap.dia rename to docs/Samba-HOWTO-Collection/images/idmap.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap.png b/docs/Samba-HOWTO-Collection/images/idmap.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap.png rename to docs/Samba-HOWTO-Collection/images/idmap.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png b/docs/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png rename to docs/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia rename to docs/Samba-HOWTO-Collection/images/pdftoepsonusb.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png rename to docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia b/docs/Samba-HOWTO-Collection/images/pdftosocket.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia rename to docs/Samba-HOWTO-Collection/images/pdftosocket.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png b/docs/Samba-HOWTO-Collection/images/pdftosocket.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png rename to docs/Samba-HOWTO-Collection/images/pdftosocket.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia b/docs/Samba-HOWTO-Collection/images/trusts1.dia similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia rename to docs/Samba-HOWTO-Collection/images/trusts1.dia diff --git a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.png b/docs/Samba-HOWTO-Collection/images/trusts1.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/trusts1.png rename to docs/Samba-HOWTO-Collection/images/trusts1.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png b/docs/Samba-HOWTO-Collection/images/w2kp001.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png rename to docs/Samba-HOWTO-Collection/images/w2kp001.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png b/docs/Samba-HOWTO-Collection/images/w2kp002.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png rename to docs/Samba-HOWTO-Collection/images/w2kp002.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png b/docs/Samba-HOWTO-Collection/images/w2kp003.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png rename to docs/Samba-HOWTO-Collection/images/w2kp003.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png b/docs/Samba-HOWTO-Collection/images/w2kp004.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png rename to docs/Samba-HOWTO-Collection/images/w2kp004.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png b/docs/Samba-HOWTO-Collection/images/w2kp005.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png rename to docs/Samba-HOWTO-Collection/images/w2kp005.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png b/docs/Samba-HOWTO-Collection/images/w2kp006.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png rename to docs/Samba-HOWTO-Collection/images/w2kp006.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png b/docs/Samba-HOWTO-Collection/images/wxpp001.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png rename to docs/Samba-HOWTO-Collection/images/wxpp001.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png b/docs/Samba-HOWTO-Collection/images/wxpp004.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png rename to docs/Samba-HOWTO-Collection/images/wxpp004.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png b/docs/Samba-HOWTO-Collection/images/wxpp006.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png rename to docs/Samba-HOWTO-Collection/images/wxpp006.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png b/docs/Samba-HOWTO-Collection/images/wxpp007.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png rename to docs/Samba-HOWTO-Collection/images/wxpp007.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png b/docs/Samba-HOWTO-Collection/images/wxpp008.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png rename to docs/Samba-HOWTO-Collection/images/wxpp008.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png b/docs/Samba-HOWTO-Collection/images/wxpp010.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png rename to docs/Samba-HOWTO-Collection/images/wxpp010.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png b/docs/Samba-HOWTO-Collection/images/wxpp011.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png rename to docs/Samba-HOWTO-Collection/images/wxpp011.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png b/docs/Samba-HOWTO-Collection/images/wxpp012.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png rename to docs/Samba-HOWTO-Collection/images/wxpp012.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png b/docs/Samba-HOWTO-Collection/images/wxpp013.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png rename to docs/Samba-HOWTO-Collection/images/wxpp013.png diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png b/docs/Samba-HOWTO-Collection/images/wxpp015.png similarity index 100% rename from docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png rename to docs/Samba-HOWTO-Collection/images/wxpp015.png diff --git a/docs/scripts/copy-images.sh b/docs/scripts/copy-images.sh new file mode 100755 index 00000000000..9f654a34ae5 --- /dev/null +++ b/docs/scripts/copy-images.sh @@ -0,0 +1,11 @@ +#!/bin/sh +ROLE="$1" +XMLFILE="$2" +FROM="$3" +TO="$4" + +for x in `xsltproc --stringparam prepend "" --stringparam append "" --stringparam role "$ROLE" xslt/find-image-dependencies.xsl "$XMLFILE"` +do + cp -u $FROM/$x $TO/$x || exit 1 +done +exit diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index 8d132a99359..cd91bff8a12 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -239,7 +239,7 @@ latex - + images/ diff --git a/docs/xslt/find-image-dependencies.xsl b/docs/xslt/find-image-dependencies.xsl new file mode 100644 index 00000000000..f658369145f --- /dev/null +++ b/docs/xslt/find-image-dependencies.xsl @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + -- 2.11.4.GIT