diff --git a/man2/statx.2 b/man2/statx.2
index 18d0db5ae..9eb13afea 100644
--- a/man2/statx.2
+++ b/man2/statx.2
@@ -67,17 +67,17 @@ The buffer is filled in according to the following type:
 .in +4n
 .nf
 struct statx {
-    __u32 stx_mask;          /* Mask of bits indicating
-                                filled fields */
-    __u32 stx_blksize;       /* Block size for filesystem I/O */
-    __u64 stx_attributes;    /* Extra file attribute indicators */
-    __u32 stx_nlink;         /* Number of hard links */
-    __u32 stx_uid;           /* User ID of owner */
-    __u32 stx_gid;           /* Group ID of owner */
-    __u16 stx_mode;          /* File type and mode */
-    __u64 stx_ino;           /* Inode number */
-    __u64 stx_size;          /* Total size in bytes */
-    __u64 stx_blocks;        /* Number of 512B blocks allocated */
+    __u32 stx_mask;        /* Mask of bits indicating
+                              filled fields */
+    __u32 stx_blksize;     /* Block size for filesystem I/O */
+    __u64 stx_attributes;  /* Extra file attribute indicators */
+    __u32 stx_nlink;       /* Number of hard links */
+    __u32 stx_uid;         /* User ID of owner */
+    __u32 stx_gid;         /* Group ID of owner */
+    __u16 stx_mode;        /* File type and mode */
+    __u64 stx_ino;         /* Inode number */
+    __u64 stx_size;        /* Total size in bytes */
+    __u64 stx_blocks;      /* Number of 512B blocks allocated */
 
     /* The following fields are file timestamps */
     struct statx_timestamp stx_atime;  /* Last access */
@@ -87,13 +87,13 @@ struct statx {
 
     /* If this file represents device, then the next two feilds
        contain the ID of the device */
-    __u32 stx_rdev_major;    /* Major ID */
-    __u32 stx_rdev_minor;    /* Minor ID */
+    __u32 stx_rdev_major;  /* Major ID */
+    __u32 stx_rdev_minor;  /* Minor ID */
 
     /* The next two fields contain the ID of the device
        contain the filesystem where the file resides */
-    __u32 stx_dev_major;      /* Major ID */
-    __u32 stx_dev_minor;      /* Minor ID */
+    __u32 stx_dev_major;   /* Major ID */
+    __u32 stx_dev_minor;   /* Minor ID */
 };
 .fi
 .in
@@ -154,7 +154,9 @@ The file is looked up by name, starting from the directory specified by
 .IR dirfd .
 .TP
 [*] By file descriptor.
-.IR pathname " is " NULL " and " dirfd
+.IR pathname
+is NULL and
+.I dirfd
 indicates a file descriptor.
 The file attached to the file descriptor is queried directly.
 The file descriptor may point to any type of file, not just
@@ -330,7 +332,9 @@ or the old
 together with the new
 .IR stx_mode .
 .PP
-Apart from stx_mask (which is described above), the fields in the
+Apart from
+.I stx_mask
+(which is described above), the fields in the
 .I statx
 structure are:
 .TP
@@ -440,30 +444,30 @@ The
 field contains a set of OR'ed flags that indicate additional attributes
 of the file:
 .TP
-STATX_ATTR_COMPRESSED
+.B STATX_ATTR_COMPRESSED
 The file is compressed by the fs and may take extra resources to access.
 .TP
-STATX_ATTR_IMMUTABLE
+.B STATX_ATTR_IMMUTABLE
 The file cannot be modified: it cannot be deleted or renamed,
 no hard links can be created to this file and no data can be written to it.
 See
 .BR chattr (1).
 .TP
-STATX_ATTR_APPEND
+.B STATX_ATTR_APPEND
 The file can only be opened in append mode for writing.
 Random access writing
 is not permitted.
 See
 .BR chattr (1).
 .TP
-STATX_ATTR_NODUMP
+.B STATX_ATTR_NODUMP
 File is not a candidate for backup when a backup program such as
 .BR dump (8)
 is run.
 See
 .BR chattr (1).
 .TP
-STATX_ATTR_ENCRYPTED
+.B STATX_ATTR_ENCRYPTED
 A key is required for the file to be encrypted by the filesystem.
 .SS File type and mode
 .PP