fold: Fix usage and manpage for -width

fold.1

@@ -1,4 +1,4 @@
-.Dd January 25, 2015
+.Dd March 5, 2015
 .Dt FOLD 1
 .Os sbase
 .Sh NAME
@@ -7,8 +7,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl bs
-.Op Fl w Ar width
-.Op Fl N
+.Op Fl w Ar width | Fl Ns Ar width
 .Op Ar file ...
 .Sh DESCRIPTION
 .Nm
@@ -27,11 +26,9 @@ Count bytes rather than characters.
 If a line contains spaces, break
 at the last space within
 .Ar width .
-.It Fl w Ar width | Fl N
+.It Fl w Ar width | Fl Ns Ar width
 Break at
 .Ar width
-|
-.Sy N
 characters. Default is 80.
 .El
 .Sh STANDARDS
@@ -41,6 +38,6 @@ utility is compliant with the
 .St -p1003.1-2008
 specification.
 .Pp
-The
-.Op Fl N
-flag is an extension to that specification.
+The obsolete
+.Op Fl Ns Ar width
+syntax is an extension to that specification.

fold.c

@@ -65,7 +65,7 @@ fold(FILE *fp, size_t width)
 static void
 usage(void)
 {
-	eprintf("usage: %s [-bs] [-w width] [-N] [FILE...]\n", argv0);
+	eprintf("usage: %s [-bs] [-w width | -width] [FILE...]\n", argv0);
 }
 
 int