Combine multiple notes after an entry separated by hyphen ") (" -> " - "
Signed-off-by: Brian Inglis <brian.ing...@systematicsw.ab.ca>
---
winsup/doc/posix.xml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/winsup/doc/posix.xml b/winsup/doc/posix.xml
index ac05f6972ee7..0c9e492d62ad 100644
--- a/winsup/doc/posix.xml
+++ b/winsup/doc/posix.xml
@@ -1610,8 +1610,8 @@ ISO/IEC DIS 9945 Information technology
bcmp (POSIX.1-2001, SUSv3)
bcopy (SUSv3)
bzero (SUSv3)
- chroot (SUSv2) (see <xref
linkend="std-notes">chapter "Implementation Notes"</xref>)
- clock_setres (QNX, VxWorks) (see <xref
linkend="std-notes">chapter "Implementation Notes"</xref>)
+ chroot (SUSv2 - see <xref linkend="std-notes">chapter
"Implementation Notes"</xref>)
+ clock_setres (QNX, VxWorks - see <xref
linkend="std-notes">chapter "Implementation Notes"</xref>)
cuserid (POSIX.1-1988, SUSv2)
ecvt (SUSv3)
endutent (XPG2)
@@ -1676,7 +1676,7 @@ ISO/IEC DIS 9945 Information technology
usleep (SUSv3)
utime (SUSv4)
utmpname (XPG2)
- vfork (SUSv3) (see <xref
linkend="std-notes">chapter "Implementation Notes"</xref>)
+ vfork (SUSv3 - see <xref linkend="std-notes">chapter
"Implementation Notes"</xref>)
</screen>
</sect1>
@@ -1700,11 +1700,6 @@ ISO/IEC DIS 9945 Information technology
getresgid (not available in "(sys/)unistd.h" header)
getresuid (not available in "(sys/)unistd.h" header)
gettext_l (not available in external gettext "libintl"
library)
-<<<<<<< HEAD
- isastream
-=======
- kill_dependency (not available in "stdatomic.h" header)
->>>>>>> 5888275d7f48 (Cygwin: winsup/doc/posix.xml: SUS V5 POSIX 2024 move or
remove dropped entries)
mlockall
munlockall
ngettext_l (not available in external gettext "libintl"
library)
--
2.45.1
