diff options
author | Michael Kerrisk <mtk.manpages@gmail.com> | 2010-10-12 06:45:38 +0200 |
---|---|---|
committer | Michael Kerrisk <mtk.manpages@gmail.com> | 2010-10-12 06:49:17 +0200 |
commit | 008f1ecc4351f2874f14cc5d1b75fae73ed82f17 (patch) | |
tree | ad0553833645320cc53764ca76db212ca242ff33 /man1 | |
parent | 1f409d5d0be79dbd4919b117035a1d91f1c30a3b (diff) |
intro.1, time.1, accept.2, bind.2, connect.2, execve.2, flock.2, getdents.2, getpriority.2, getuid.2, intro.2, ioctl.2, mincore.2, mknod.2, personality.2, ptrace.2, read.2, recv.2, select_tut.2, send.2, sendfile.2, shmctl.2, sigaction.2, signal.2, stat.2, times.2, truncate.2, umask.2, wait.2, MB_CUR_MAX.3, MB_LEN_MAX.3, argz_add.3, btowc.3, clearenv.3, clock.3, cmsg.3, end.3, endian.3, errno.3, exit.3, fgetwc.3, fgetws.3, fopen.3, fputwc.3, fputws.3, fseek.3, fwide.3, getfsent.3, getgrnam.3, gethostid.3, getipnodebyname.3, getmntent.3, getpwnam.3, getwchar.3, grantpt.3, iconv.3, iconv_close.3, iconv_open.3, insque.3, intro.3, iswalnum.3, iswalpha.3, iswblank.3, iswcntrl.3, iswctype.3, iswdigit.3, iswgraph.3, iswlower.3, iswprint.3, iswpunct.3, iswspace.3, iswupper.3, iswxdigit.3, malloc.3, mblen.3, mbrlen.3, mbrtowc.3, mbsinit.3, mbsnrtowcs.3, mbsrtowcs.3, mbstowcs.3, mbtowc.3, mkstemp.3, mktemp.3, nl_langinfo.3, openpty.3, posix_openpt.3, printf.3, ptsname.3, putwchar.3, qecvt.3, rcmd.3, readdir.3, rexec.3, rpc.3, setnetgrent.3, shm_open.3, sigpause.3, stdin.3, stpcpy.3, strftime.3, strptime.3, syslog.3, towctrans.3, towlower.3, towupper.3, ttyslot.3, ungetwc.3, unlocked_stdio.3, wcpcpy.3, wcpncpy.3, wcrtomb.3, wcscasecmp.3, wcscat.3, wcschr.3, wcscmp.3, wcscpy.3, wcscspn.3, wcsdup.3, wcslen.3, wcsncasecmp.3, wcsncat.3, wcsncmp.3, wcsncpy.3, wcsnlen.3, wcsnrtombs.3, wcspbrk.3, wcsrchr.3, wcsrtombs.3, wcsspn.3, wcsstr.3, wcstok.3, wcstombs.3, wcswidth.3, wctob.3, wctomb.3, wctrans.3, wctype.3, wcwidth.3, wmemchr.3, wmemcmp.3, wmemcpy.3, wmemmove.3, wmemset.3, wprintf.3, console_ioctl.4, pts.4, elf.5, filesystems.5, hosts.5, proc.5, ttytype.5, boot.7, capabilities.7, credentials.7, epoll.7, glob.7, koi8-r.7, path_resolution.7, pty.7, signal.7, suffixes.7, time.7, unicode.7, unix.7, uri.7, utf-8.7: global fix: s/Unix/UNIX/
The man pages were rather inconsistent in the use of "Unix"
versus "UNIX". Let's go with the trademark usage.
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Diffstat (limited to 'man1')
-rw-r--r-- | man1/intro.1 | 10 | ||||
-rw-r--r-- | man1/time.1 | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/man1/intro.1 b/man1/intro.1 index 33191e57..dd27fc37 100644 --- a/man1/intro.1 +++ b/man1/intro.1 @@ -44,14 +44,14 @@ A nonzero exit status can be in the range 1 to 255, and some commands use different nonzero status values to indicate the reason why the command failed. .SH NOTES -Linux is a flavor of Unix, and as a first approximation -all user commands under Unix work precisely the same under -Linux (and FreeBSD and lots of other Unix-like systems). +Linux is a flavor of UNIX, and as a first approximation +all user commands under UNIX work precisely the same under +Linux (and FreeBSD and lots of other UNIX-like systems). .LP Under Linux there are GUIs (graphical user interfaces), where you can point and click and drag, and hopefully get work done without first reading lots of documentation. -The traditional Unix environment +The traditional UNIX environment is a CLI (command line interface), where you type commands to tell the computer what to do. That is faster and more powerful, @@ -247,7 +247,7 @@ The command .I df will tell you how much of your disk is still free. .SS "Processes" -On a Unix system many user and system processes run simultaneously. +On a UNIX system many user and system processes run simultaneously. The one you are talking to runs in the .IR foreground , the others in the diff --git a/man1/time.1 b/man1/time.1 index 662c696e..000062a8 100644 --- a/man1/time.1 +++ b/man1/time.1 @@ -247,7 +247,7 @@ Print version information on standard output, then exit successfully. .B "\-\-" Terminate option list. .SH BUGS -Not all resources are measured by all versions of Unix, +Not all resources are measured by all versions of UNIX, so some of the values might be reported as zero. The present selection was mostly inspired by the data provided by 4.2 or 4.3BSD. |