docs: Merge both samba.8 manpages.
authorKarolin Seeger <kseeger@samba.org>
Fri, 30 Nov 2012 10:33:04 +0000 (11:33 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Mon, 3 Dec 2012 15:28:31 +0000 (16:28 +0100)
commitd913fb1304378bdc8aac2543144d39ffa486f862
treed94defc214d8401d3068e7ef564db10fd1477411
parent0e69a7ba114ed5e0ad94e4ed7bb41d7eb0294b16
docs: Merge both samba.8 manpages.

Remove source4/smbd/samba.8.xml and add the additional content to
docs-xml/samba.8.xml to be able to build this manpage with the autoconf build
also.

Karolin

Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Dec  3 16:28:32 CET 2012 on sn-devel-104
docs-xml/manpages/samba.8.xml
source4/smbd/samba.8.xml [deleted file]
source4/smbd/wscript_build