This patch integrates the contents of users/chapter.xml

into basics/chapter.xml.

Approved by:	hrs (mentor)

en_US.ISO8859-1/books/handbook/Makefile

@@ -275,7 +275,6 @@ SRCS+= preface/preface.xml
 SRCS+= printing/chapter.xml
 SRCS+= security/chapter.xml
 SRCS+= serialcomms/chapter.xml
-SRCS+= users/chapter.xml
 SRCS+= virtualization/chapter.xml
 SRCS+= x11/chapter.xml
 

en_US.ISO8859-1/books/handbook/book.xml

@@ -225,7 +225,6 @@
 
     &chap.config;
     &chap.boot;
-    &chap.users;
     &chap.security;
     &chap.jails;
     &chap.mac;

en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml

@@ -2291,7 +2291,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	installation.</para>
 
       <para>For more information on adding users and user management,
-	see <xref linkend="users"/>.</para>
+	see <xref linkend="users-synopsis"/>.</para>
     </sect2>
 
     <sect2 id="bsdinstall-final-conf">

en_US.ISO8859-1/books/handbook/chapters.ent

@@ -31,7 +31,6 @@
 <!-- Part Three -->
   <!ENTITY chap.config		SYSTEM "config/chapter.xml">
   <!ENTITY chap.boot		SYSTEM "boot/chapter.xml">
-  <!ENTITY chap.users		SYSTEM "users/chapter.xml">
   <!ENTITY chap.security	SYSTEM "security/chapter.xml">
   <!ENTITY chap.jails		SYSTEM "jails/chapter.xml">
   <!ENTITY chap.mac		SYSTEM "mac/chapter.xml">

en_US.ISO8859-1/books/handbook/preface/preface.xml

@@ -415,15 +415,6 @@
 	  options.</para>
       </listitem>
     </varlistentry>
-    <varlistentry>
-      <term><emphasis><xref linkend="users"/>, Users and Basic Account
-      Management</emphasis></term>
-      <listitem>
-	<para>Describes the creation and manipulation of user
-	  accounts.  Also discusses resource limitations that can be
-	  set on users and other account management tasks.</para>
-      </listitem>
-    </varlistentry>
     <varlistentry>
       <term><emphasis><xref linkend="security"/>,
 	Security</emphasis></term>

en_US.ISO8859-1/books/handbook/users/Makefile

@@ -1,15 +0,0 @@
-#
-# Build the Handbook with just the content from this chapter.
-#
-# $FreeBSD$
-#
-
-CHAPTERS= 	users/chapter.xml
-
-VPATH=		..
-
-MASTERDOC=	${.CURDIR}/../${DOC}.${DOCBOOKSUFFIX}
-
-DOC_PREFIX?= 	${.CURDIR}/../../../..
-
-.include "../Makefile"