Rev 948: Merge upstream. in file:///home/jelmer/samba-docs/dblatex/ At file:///home/jelmer/samba-docs/dblatex/

------------------------------------------------------------
revno: 948
revision-id: jelmer@samba.org-20070513131504-cromlkuerreude9p
parent: jelmer@samba.org-20070328020755-hg0jmfa5r3247an4
parent: svn-v2:1112@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
committer: Jelmer Vernooij 
branch nick: dblatex
timestamp: Sun 2007-05-13 15:15:04 +0200
message:
  Merge upstream.
removed:
  manpages-3/vfs_fam_notify.8.xml svn-v2:1048@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fvfs_fam_notify.8.xml
added:
  manpages-3/vfs_notify_fam.8.xml svn-v2:1110@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fvfs_notify_fam.8.xml
  manpages-3/vfs_readahead.8.xml svn-v2:1088@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fvfs_readahead.8.xml
modified:
  manpages-3/idmap_ad.8.xml      svn-v2:1077@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fidmap_ad.8.xml
  manpages-3/idmap_ldap.8.xml    svn-v2:1073@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fidmap_ldap.8.xml
  manpages-3/idmap_nss.8.xml     svn-v2:1076@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fidmap_nss.8.xml
  manpages-3/idmap_rid.8.xml     svn-v2:1077@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fidmap_rid.8.xml
  manpages-3/idmap_tdb.8.xml     svn-v2:1072@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fidmap_tdb.8.xml
  manpages-3/net.8.xml           svn-v2:526@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fnet.8.xml
  manpages-3/pam_winbind.7.xml   svn-v2:899@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fpam_winbind.7.xml
  manpages-3/smb.conf.5.xml      svn-v2:526@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fsmb.conf.5.xml
  manpages-3/smbd.8.xml          svn-v2:526@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fsmbd.8.xml
  manpages-3/smbmount.8.xml      svn-v2:526@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fsmbmount.8.xml
  manpages-3/smbumount.8.xml     svn-v2:526@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fsmbumount.8.xml
  manpages-3/vfs_recycle.8.xml   svn-v2:1048@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-manpages%2d3%2fvfs_recycle.8.xml
  smbdotconf/base/bindinterfacesonly.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fbase%2fbindinterfacesonly.xml
  smbdotconf/ldap/ldapssl.xml    svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fldap%2fldapssl.xml
  smbdotconf/ldap/ldapsuffix.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fldap%2fldapsuffix.xml
  smbdotconf/locking/sharemodes.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2flocking%2fsharemodes.xml
  smbdotconf/locking/strictlocking.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2flocking%2fstrictlocking.xml
  smbdotconf/logon/addmachinescript.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2flogon%2faddmachinescript.xml
  smbdotconf/logon/adduserscript.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2flogon%2fadduserscript.xml
  smbdotconf/logon/enableprivileges.xml svn-v2:333@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2flogon%2fenableprivileges.xml
  smbdotconf/logon/logonhome.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2flogon%2flogonhome.xml
  smbdotconf/logon/shutdownscript.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2flogon%2fshutdownscript.xml
  smbdotconf/misc/resetonzerovc.xml svn-v2:866@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fmisc%2fresetonzerovc.xml
  smbdotconf/misc/utmp.xml       svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fmisc%2futmp.xml
  smbdotconf/security/aclgroupcontrol.xml svn-v2:797@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fsecurity%2faclgroupcontrol.xml
  smbdotconf/security/allowtrusteddomains.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fsecurity%2fallowtrusteddomains.xml
  smbdotconf/security/inheritacls.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fsecurity%2finheritacls.xml
  smbdotconf/security/maptoguest.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fsecurity%2fmaptoguest.xml
  smbdotconf/security/security.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fsecurity%2fsecurity.xml
  smbdotconf/winbind/winbindenumusers.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fwinbind%2fwinbindenumusers.xml
  smbdotconf/winbind/winbindusedefaultdomain.xml svn-v2:3@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-smbdotconf%2fwinbind%2fwinbindusedefaultdomain.xml
    ------------------------------------------------------------
    revno: 942.1.24
    merged: svn-v2:1112@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1111@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: gd
    timestamp: Fri 2007-05-11 12:37:37 +0000
    message:
      Document debug_state option.
      
      Guenther
    ------------------------------------------------------------
    revno: 942.1.23
    merged: svn-v2:1111@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1110@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: kseeger
    timestamp: Fri 2007-05-11 09:01:52 +0000
    message:
      Add documentation for new net sam subcommand "unmapunixgroup".
    ------------------------------------------------------------
    revno: 942.1.22
    merged: svn-v2:1110@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1109@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: vlendec
    timestamp: Thu 2007-05-10 17:07:44 +0000
    message:
      Rename fam_notify to notify_fam.
      
      Thanks to Bjï¿½ï¿½ï¿½ï¿½rn for notifying us ;-)
    ------------------------------------------------------------
    revno: 942.1.21
    merged: svn-v2:1109@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1108@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: vlendec
    timestamp: Thu 2007-05-10 17:07:03 +0000
    message:
      Change contents from fam_notify to notify_fam
    ------------------------------------------------------------
    revno: 942.1.20
    merged: svn-v2:1108@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1107@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: kseeger
    timestamp: Mon 2007-05-07 10:40:00 +0000
    message:
      Clarify the description of "inherit acls" in smb.conf manpage (hopefully fixing bugs #1806 and #1809)
    ------------------------------------------------------------
    revno: 942.1.19
    merged: svn-v2:1107@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1106@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: kseeger
    timestamp: Wed 2007-05-02 07:59:48 +0000
    message:
      Add comment about umount.cifs to the manpage of smbumount (fix bug #4581)
    ------------------------------------------------------------
    revno: 942.1.18
    merged: svn-v2:1106@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1105@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: kseeger
    timestamp: Wed 2007-05-02 07:30:56 +0000
    message:
      Add comment about mount.cifs to the manpage of smbmount (fix bug #4581)
    ------------------------------------------------------------
    revno: 942.1.17
    merged: svn-v2:1105@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1102@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: jht
    timestamp: Thu 2007-04-26 23:44:45 +0000
    message:
      Fix for Bug#3182.
    ------------------------------------------------------------
    revno: 942.1.16
    merged: svn-v2:1102@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1101@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: herb
    timestamp: Fri 2007-04-20 19:11:33 +0000
    message:
      update manpage for profiling-level option
    ------------------------------------------------------------
    revno: 942.1.15
    merged: svn-v2:1101@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1100@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: kseeger
    timestamp: Fri 2007-04-20 10:33:56 +0000
    message:
      Add documentation for new net sam subcommand deletelocalgroup.
    ------------------------------------------------------------
    revno: 942.1.14
    merged: svn-v2:1100@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1099@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: jerry
    timestamp: Tue 2007-04-17 22:38:52 +0000
    message:
      fix a few typos pointed out by James
    ------------------------------------------------------------
    revno: 942.1.13
    merged: svn-v2:1099@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1098@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: jerry
    timestamp: Tue 2007-04-17 22:12:48 +0000
    message:
      add docs on idmap_ad:schema_mode
    ------------------------------------------------------------
    revno: 942.1.12
    merged: svn-v2:1098@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1097@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: kseeger
    timestamp: Mon 2007-04-16 07:47:27 +0000
    message:
      Add some missing whitespaces.
    ------------------------------------------------------------
    revno: 942.1.11
    merged: svn-v2:1097@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1096@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: kseeger
    timestamp: Thu 2007-04-12 11:20:15 +0000
    message:
      Fix typos in idmap_rid manpage.
    ------------------------------------------------------------
    revno: 942.1.10
    merged: svn-v2:1096@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1095@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: idra
    timestamp: Wed 2007-04-11 21:50:59 +0000
    message:
      
      Auth info for idmap_ldap
      net idmap 
    ------------------------------------------------------------
    revno: 942.1.9
    merged: svn-v2:1095@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1094@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: jra
    timestamp: Wed 2007-04-11 21:00:50 +0000
    message:
      Document the fact this doesn't work with "security=server".
      Fixes bug #4475.
      Jeremy.
    ------------------------------------------------------------
    revno: 942.1.8
    merged: svn-v2:1094@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1093@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: jerry
    timestamp: Wed 2007-04-11 14:18:13 +0000
    message:
      "reset on zero vc" is a global option.  Make docs 
      match code.
    ------------------------------------------------------------
    revno: 942.1.7
    merged: svn-v2:1093@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1091@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: vlendec
    timestamp: Wed 2007-04-11 11:26:52 +0000
    message:
      Fix idmap manpages. Thanks to Karolin Seeger! :-)
      
      Volker
    ------------------------------------------------------------
    revno: 942.1.6
    merged: svn-v2:1091@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1090@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: jerry
    timestamp: Mon 2007-04-09 17:43:13 +0000
    message:
      Jeremy says not to set the length.  Just use defaults
    ------------------------------------------------------------
    revno: 942.1.5
    merged: svn-v2:1090@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1089@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: idra
    timestamp: Sat 2007-04-07 14:09:17 +0000
    message:
      
      Document the net sam options
    ------------------------------------------------------------
    revno: 942.1.4
    merged: svn-v2:1089@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1088@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: abartlet
    timestamp: Sat 2007-04-07 05:28:53 +0000
    message:
      Clarify that you don't want to use %m in 'add machine script'.
      
      Andrew Bartlett
    ------------------------------------------------------------
    revno: 942.1.3
    merged: svn-v2:1088@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1087@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: jra
    timestamp: Fri 2007-04-06 21:11:48 +0000
    message:
      Add docs for readahead vfs module.
      Jeremy.
    ------------------------------------------------------------
    revno: 942.1.2
    merged: svn-v2:1087@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    parent: svn-v2:1086@b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
    committer: jra
    timestamp: Wed 2007-04-04 23:33:39 +0000
    message:
      Update docs for #4486.
      Jeremy.

Diff too large for email (1154 lines, the limit is 1000).

