diff --git a/man7/locale.7 b/man7/locale.7
index c07520f12..a5f3269f8 100644
--- a/man7/locale.7
+++ b/man7/locale.7
@@ -107,11 +107,14 @@ function.
 changes the behaviour of the
 .BR strftime ()
 function to display the current time in a locally acceptable form; for
-example, most of Europe uses a 24\-hour clock vs. the US' 12\-hour
-clock.
+example, most of Europe uses a 24\-hour clock versus the 
+12\-hour clock used in the United States.
 .TP
 .B LC_ALL
 All of the above.
+.\" FIXME glibc 2.2.2 added new non-standard locale categories:
+.\" LC_ADDRESS, LC_IDENTIFICATION, LC_MEASUREMENT, LC_NAME,
+.\" LC_PAPER, LC_TELEPHONE.  These need to be documented.
 .PP
 If the second argument to
 .BR setlocale ()
@@ -139,55 +142,56 @@ Values about local numeric formatting is made available in a
 returned by the
 .BR localeconv ()
 function, which has the following declaration:
+.in +0.25i
 .nf
-struct lconv
-{
-  /* Numeric (non-monetary) information.  */
 
-  char *decimal_point;		/* Decimal point character.  */
-  char *thousands_sep;		/* Thousands separator.  */
-  /* Each element is the number of digits in each group;
-     elements with higher indices are farther left.
-     An element with value CHAR_MAX means that no further grouping is done.
-     An element with value 0 means that the previous element is used
-     for all groups farther left.  */
-  char *grouping;
+struct lconv {
+  /* Numeric (non-monetary) information */
 
-  /* Monetary information.  */
+  char *decimal_point;      /* Decimal point character */
+  char *thousands_sep;      /* Thousands separator */
+  char *grouping;   /* Each element is the number of digits in each 
+                       group; elements with higher indices are 
+                       farther left.  An element with value CHAR_MAX 
+                       means that no further grouping is done.  An 
+                       element with value 0 means that the previous 
+                       element is used for all groups farther left. */
+
+  /* Monetary information */
 
   /* First three chars are a currency symbol from ISO 4217.
-     Fourth char is the separator.  Fifth char is '\0'.  */
+     Fourth char is the separator.  Fifth char is '\0'. */
   char *int_curr_symbol;
-  char *currency_symbol;	/* Local currency symbol.  */
-  char *mon_decimal_point;	/* Decimal point character.  */
-  char *mon_thousands_sep;	/* Thousands separator.  */
-  char *mon_grouping;		/* Like `grouping' element (above).  */
-  char *positive_sign;		/* Sign for positive values.  */
-  char *negative_sign;		/* Sign for negative values.  */
-  char int_frac_digits;		/* Int'l fractional digits.  */
-  char frac_digits;		/* Local fractional digits.  */
-  /* 1 if currency_symbol precedes a positive value, 0 if succeeds.  */
-  char p_cs_precedes;
-  /* 1 if a space separates currency_symbol from a positive value.  */
-  char p_sep_by_space;
-  /* 1 if currency_symbol precedes a negative value, 0 if succeeds.  */
-  char n_cs_precedes;
-  /* 1 if a space separates currency_symbol from a negative value.  */
-  char n_sep_by_space;
+  char *currency_symbol;    /* Local currency symbol */
+  char *mon_decimal_point;  /* Decimal point character */
+  char *mon_thousands_sep;  /* Thousands separator */
+  char *mon_grouping;       /* Like `grouping' element (above) */
+  char *positive_sign;      /* Sign for positive values */
+  char *negative_sign;      /* Sign for negative values */
+  char  int_frac_digits;    /* Int'l fractional digits */
+  char  frac_digits;        /* Local fractional digits */
+  char  p_cs_precedes;      /* 1 if currency_symbol precedes a 
+                               positive value, 0 if succeeds */
+  char  p_sep_by_space;     /* 1 if a space separates currency_symbol 
+                               from a positive value */
+  char  n_cs_precedes;      /* 1 if currency_symbol precedes a 
+                               negative value, 0 if succeeds */
+  char  n_sep_by_space;     /* 1 if a space separates currency_symbol
+                               from a negative value */
   /* Positive and negative sign positions:
      0 Parentheses surround the quantity and currency_symbol.
      1 The sign string precedes the quantity and currency_symbol.
      2 The sign string succeeds the quantity and currency_symbol.
      3 The sign string immediately precedes the currency_symbol.
-     4 The sign string immediately succeeds the currency_symbol.  */
-  char p_sign_posn;
-  char n_sign_posn;
+     4 The sign string immediately succeeds the currency_symbol. */
+  char  p_sign_posn;
+  char  n_sign_posn;
 };
 .fi
+.in +0.25i
 .SH "CONFORMS TO"
-.nf
 POSIX.1
-.fi
+
 The GNU gettext functions are specified in LI18NUX2000.
 .SH "SEE ALSO"
 .BR locale (1),