diff --git a/man1/intro.1 b/man1/intro.1 index 338600478..65b5d57ea 100644 --- a/man1/intro.1 +++ b/man1/intro.1 @@ -163,13 +163,13 @@ The command .I grep (from "g/re/p") finds occurrences of a string in one or more files. Here it finds Maja's telephone number. -.SS "Path names and the current directory" +.SS "Pathnames and the current directory" Files live in a large tree, the file hierarchy. Each has a -.I "path name" +.I "pathname" describing the path from the root of the tree (which is called /) -to the file. For example, such a full path name might be /home/aeb/tel. -Always using full path names would be inconvenient, and the name +to the file. For example, such a full pathname might be /home/aeb/tel. +Always using full pathnames would be inconvenient, and the name of a file in the current directory may be abbreviated by only giving the last component. That is why "/home/aeb/tel" can be abbreviated to "tel" when the current directory is "/home/aeb". diff --git a/man1/ln.1 b/man1/ln.1 index 18ba1f5ca..b0b5b6955 100644 --- a/man1/ln.1 +++ b/man1/ln.1 @@ -42,7 +42,7 @@ When accessed (with the or .BR stat (2) system calls), a reference to a symlink is replaced by the operating -system kernel with a reference to the file named by the path name. +system kernel with a reference to the file named by the pathname. (However, with .BR rm (1) and diff --git a/man1/time.1 b/man1/time.1 index fc908489a..1d39ea3d7 100644 --- a/man1/time.1 +++ b/man1/time.1 @@ -234,7 +234,7 @@ The environment variable TIME was badly chosen. It is not unusual for systems like autoconf or make to use environment variables with the name of a utility to override the utility to be used. Uses like MORE or TIME for options to programs -(instead of program path names) tend to lead to difficulties. +(instead of program pathnames) tend to lead to difficulties. .LP It seems unfortunate that \-o overwrites instead of appends. (That is, the \-a option should be the default.) diff --git a/man2/chroot.2 b/man2/chroot.2 index 21135e15c..4c2c08a19 100644 --- a/man2/chroot.2 +++ b/man2/chroot.2 @@ -41,7 +41,7 @@ chroot \- change root directory .BR chroot () changes the root directory to that specified in .IR path . -This directory will be used for path names beginning with /. The root +This directory will be used for pathnames beginning with /. The root directory is inherited by all children of the current process. Only a privileged process (Linux: one with the diff --git a/man2/statfs.2 b/man2/statfs.2 index 8abfa8be4..b8e876acf 100644 --- a/man2/statfs.2 +++ b/man2/statfs.2 @@ -37,7 +37,7 @@ The function .BR statfs () returns information about a mounted file system. .I path -is the path name of any file within the mounted filesystem. +is the pathname of any file within the mounted filesystem. .I buf is a pointer to a .I statfs diff --git a/man2/statvfs.2 b/man2/statvfs.2 index ea2203748..e188b8c13 100644 --- a/man2/statvfs.2 +++ b/man2/statvfs.2 @@ -39,7 +39,7 @@ The function .BR statvfs () returns information about a mounted file system. .I path -is the path name of any file within the mounted filesystem. +is the pathname of any file within the mounted filesystem. .I buf is a pointer to a .I statvfs diff --git a/man2/truncate.2 b/man2/truncate.2 index 170524f8c..51daec024 100644 --- a/man2/truncate.2 +++ b/man2/truncate.2 @@ -122,7 +122,7 @@ Too many symbolic links were encountered in translating the pathname. .TP .B ENAMETOOLONG A component of a pathname exceeded 255 characters, -or an entire path name exceeded 1023 characters. +or an entire pathname exceeded 1023 characters. .TP .B ENOENT The named file does not exist. diff --git a/man3/getcwd.3 b/man3/getcwd.3 index bae6c36cb..4d27b1e76 100644 --- a/man3/getcwd.3 +++ b/man3/getcwd.3 @@ -47,7 +47,7 @@ to the array pointed to by which is of length .IR size . .PP -If the current absolute path name would require a buffer longer than +If the current absolute pathname would require a buffer longer than .I size elements, NULL is returned, and .I errno diff --git a/man3/getdate.3 b/man3/getdate.3 index 09eff042c..6e27f9940 100644 --- a/man3/getdate.3 +++ b/man3/getdate.3 @@ -58,7 +58,7 @@ In contrast to argument), .BR getdate () uses the formats found in the file -of which the full path name is given in the environment variable +of which the full pathname is given in the environment variable .BR DATEMSK . The first line in the file that matches the given input string is used for the conversion. diff --git a/man3/realpath.3 b/man3/realpath.3 index 58790d5cc..2ec78aff8 100644 --- a/man3/realpath.3 +++ b/man3/realpath.3 @@ -82,9 +82,9 @@ An I/O error occurred while reading from the file system. Too many symbolic links were encountered in translating the pathname. .TP .B ENAMETOOLONG -A component of a path name exceeded +A component of a pathname exceeded .B NAME_MAX -characters, or an entire path name exceeded +characters, or an entire pathname exceeded .B PATH_MAX characters. .TP @@ -161,7 +161,7 @@ function. A typical source fragment would be (But see the BUGS section.) .LP The 4.4BSD, Linux and SUSv2 versions always return an absolute -path name. Solaris may return a relative path name when the +pathname. Solaris may return a relative pathname when the .I path argument is relative. The prototype of diff --git a/man3/tmpnam.3 b/man3/tmpnam.3 index 9268cd859..56398fcaf 100644 --- a/man3/tmpnam.3 +++ b/man3/tmpnam.3 @@ -53,7 +53,7 @@ and the value .I s is returned in case of success. .LP -The path name that is created, has a directory prefix +The pathname that is created, has a directory prefix .IR P_tmpdir . (Both .I L_tmpnam diff --git a/man5/elf.5 b/man5/elf.5 index 3a09599b2..500d4a04c 100644 --- a/man5/elf.5 +++ b/man5/elf.5 @@ -557,7 +557,7 @@ member. The array element specifies dynamic linking information. .It Dv PT_INTERP The array element specifies the location and size of a null-terminated -path name to invoke as an interpreter. +pathname to invoke as an interpreter. This segment type is meaningful only for executable files (though it may occur for shared objects). However it may not occur more than once in a file. diff --git a/man5/environ.5 b/man5/environ.5 index bfbf573d3..96de46193 100644 --- a/man5/environ.5 +++ b/man5/environ.5 @@ -77,7 +77,7 @@ by \fBLC_ALL\fP or more specific environment variables like .TP .B PATH The sequence of directory prefixes that \fBsh\fP(1) and many other -programs apply in searching for a file known by an incomplete path name. +programs apply in searching for a file known by an incomplete pathname. The prefixes are separated by `\fB:\fP'. (Similarly one has \fBCDPATH\fP used by some shells to find the target of a change directory command, \fBMANPATH\fP used by \fBman\fP(1) to diff --git a/man5/proc.5 b/man5/proc.5 index 28c8de0fb..9d565d97b 100644 --- a/man5/proc.5 +++ b/man5/proc.5 @@ -126,7 +126,7 @@ Thus, to print out the environment of process 1, you would do: .TP .I /proc/[number]/exe Under Linux 2.2 and later, this file is a symbolic link -containing the actual path name of the executed command. +containing the actual pathname of the executed command. This symbolic link can be dereferenced normally; attempting to open it will open the executable. You can even type .I /proc/[number]/exe