From 210bc57dde316e5ed1d947a687131c6f21bdaa23 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 9 Mar 2013 19:52:22 +0000
Subject: [PATCH] Update the new-account page to not ask for a master.passwd
 line.  We don't use that anymore.  Mention UTF-8 with a caution.

---
 en_US.ISO8859-1/htdocs/internal/new-account.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/internal/new-account.xml b/en_US.ISO8859-1/htdocs/internal/new-account.xml
index a6e03b72ef..7ce7ada5c8 100644
--- a/en_US.ISO8859-1/htdocs/internal/new-account.xml
+++ b/en_US.ISO8859-1/htdocs/internal/new-account.xml
@@ -73,11 +73,18 @@
     and send the following information to accounts@:</p>
 
   <ul>
-    <li><p><tt>master.passwd</tt> line containing preferred username,
-      shell, and GECOS info (no password is needed)</p></li>
+    <li><p>username (lowercase a-z and 0-9)<p></li>
+    <li><p>Full Name (as would go in a GECOS field)<p></li>
+    <li><p>optional additional GECOS information (phone, location etc)<p></li>
+    <li><p>shell (sh, csh/tcsh, bash, zsh are available)<p></li>
     <li><p>ssh V2 public key (<strong>version 2 ONLY</strong>)</p></li>
   </ul>
 
+  <p>Any non-ASCII characters for the <em>Full Name</em> field should be encoded
+    in UTF-8.  Be aware that we have very limited support for this and caution
+    that they are likely to be frequently corrupted.  The number of characters
+    should kept to a minimum.</p>
+
   <p>The mentor is responsible for obtaining this information from the
     new committer in a secure fashion, and providing it to accounts@ in
     a secure fashion.  PGP-signed email, with the mentor's public key