diff options
| -rw-r--r-- | man2/gethostid.2 | 4 | ||||
| -rw-r--r-- | man2/gethostname.2 | 4 | ||||
| -rw-r--r-- | man3/getaddrinfo.3 | 4 | ||||
| -rw-r--r-- | man3/gethostbyname.3 | 2 | ||||
| -rw-r--r-- | man3/getipnodebyname.3 | 4 | ||||
| -rw-r--r-- | man3/getnameinfo.3 | 4 | ||||
| -rw-r--r-- | man3/resolver.3 | 2 | ||||
| -rw-r--r-- | man5/hosts.5 | 4 | ||||
| -rw-r--r-- | man5/resolv.conf.5 | 8 | ||||
| -rw-r--r-- | man7/hostname.7 | 3 |
10 files changed, 19 insertions, 20 deletions
diff --git a/man2/gethostid.2 b/man2/gethostid.2 index 07340948..785d3ffc 100644 --- a/man2/gethostid.2 +++ b/man2/gethostid.2 @@ -83,9 +83,9 @@ In the glibc implementation, if .BR gethostid () cannot open .IR /etc/hostid , -then it obtains the host name using +then it obtains the hostname using .BR gethostname (2), -passes that host name to +passes that hostname to .BR gethostbyname_r (3) in order to obtain the host's IPv4 address, and returns a value obtained by bit-twiddling the IPv4 address. diff --git a/man2/gethostname.2 b/man2/gethostname.2 index a0aac5c7..3b7313dd 100644 --- a/man2/gethostname.2 +++ b/man2/gethostname.2 @@ -30,7 +30,7 @@ .\" .TH GETHOSTNAME 2 2007-07-26 "Linux" "Linux Programmer's Manual" .SH NAME -gethostname, sethostname \- get/set host name +gethostname, sethostname \- get/set hostname .SH SYNOPSIS .B #include <unistd.h> .sp @@ -51,7 +51,7 @@ _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) .ad b .SH DESCRIPTION -These system calls are used to access or to change the host name of the +These system calls are used to access or to change the hostname of the current processor. The .BR gethostname () diff --git a/man3/getaddrinfo.3 b/man3/getaddrinfo.3 index dfc7a97d..455318c8 100644 --- a/man3/getaddrinfo.3 +++ b/man3/getaddrinfo.3 @@ -383,7 +383,7 @@ for the dynamically allocated linked list Starting with glibc 2.3.4, .BR getaddrinfo () has been extended to selectively allow the incoming and outgoing -host names to be transparently converted to and from the +hostnames to be transparently converted to and from the Internationalized Domain Name (IDN) format (see RFC 3490, .IR "Internationalizing Domain Names in Applications (IDNA)" ). Four new flags are defined: @@ -435,7 +435,7 @@ The resulting string is encoded using the current locale's encoding. Setting these flags will enable the IDNA_ALLOW_UNASSIGNED (allow unassigned Unicode code points) and IDNA_USE_STD3_ASCII_RULES (check output to make sure it is a STD3 -conforming host name) +conforming hostname) flags respectively to be used in the IDNA handling. .SH "RETURN VALUE" .\" FIXME glibc defines the following additional errors, some which diff --git a/man3/gethostbyname.3 b/man3/gethostbyname.3 index 513f44b6..0655fed7 100644 --- a/man3/gethostbyname.3 +++ b/man3/gethostbyname.3 @@ -114,7 +114,7 @@ for the given host .IR name . Here .I name -is either a host name, or an IPv4 address in standard dot notation (as for +is either a hostname, or an IPv4 address in standard dot notation (as for .BR inet_addr (3)), or an IPv6 address in colon (and possibly dot) notation. (See RFC\ 1884 for the description of IPv6 addresses.) diff --git a/man3/getipnodebyname.3 b/man3/getipnodebyname.3 index 05f1d38e..1420c059 100644 --- a/man3/getipnodebyname.3 +++ b/man3/getipnodebyname.3 @@ -24,7 +24,7 @@ .TH GETIPNODEBYNAME 3 2007-11-15 "Linux" "Linux Programmer's Manual" .SH NAME getipnodebyname, getipnodebyaddr, freehostent \- get network -host names and addresses +hostnames and addresses .SH SYNOPSIS .nf .B #include <sys/types.h> @@ -187,7 +187,7 @@ A null pointer is returned if an error occurred, and will contain an error code from the following list: .TP .B HOST_NOT_FOUND -The host name or network address was not found. +The hostname or network address was not found. .TP .B NO_ADDRESS The domain name server recognized the network address or name, diff --git a/man3/getnameinfo.3 b/man3/getnameinfo.3 index 7cef2e62..7f3ab090 100644 --- a/man3/getnameinfo.3 +++ b/man3/getnameinfo.3 @@ -106,7 +106,7 @@ cannot be determined.) Starting with glibc 2.3.4, .BR getnameinfo () has been extended to selectively allow -host names to be transparently converted to and from the +hostnames to be transparently converted to and from the Internationalized Domain Name (IDN) format (see RFC 3490, .IR "Internationalizing Domain Names in Applications (IDNA)" ). Three new flags are defined: @@ -121,7 +121,7 @@ makes this flag usable in existing programs and environments. Setting these flags will enable the IDNA_ALLOW_UNASSIGNED (allow unassigned Unicode code points) and IDNA_USE_STD3_ASCII_RULES (check output to make sure it is a STD3 -conforming host name) +conforming hostname) flags respectively to be used in the IDNA handling. .SH "RETURN VALUE" .\" FIXME glibc defines the following additional errors, some which diff --git a/man3/resolver.3 b/man3/resolver.3 index f0294d3d..bd9b3d20 100644 --- a/man3/resolver.3 +++ b/man3/resolver.3 @@ -227,7 +227,7 @@ to keep the TCP connection open between queries. .B RES_DNSRCH If set, .BR res_search () -will search for host names in the current +will search for hostnames in the current domain and in parent domains. This option is used by .BR gethostbyname (3). diff --git a/man5/hosts.5 b/man5/hosts.5 index 6311a232..cb9b2532 100644 --- a/man5/hosts.5 +++ b/man5/hosts.5 @@ -26,7 +26,7 @@ .\" .TH HOSTS 5 2002-06-16 "Linux" "Linux Programmer's Manual" .SH NAME -hosts \- The static table lookup for host names +hosts \- The static table lookup for hostnames .SH SYNOPSIS .B /etc/hosts .SH DESCRIPTION @@ -58,7 +58,7 @@ The Berkeley Internet Name Domain (BIND) Server implements the Internet name server for UNIX systems. It augments or replaces the .I /etc/hosts -file or host name lookup, and frees a host from relying on +file or hostname lookup, and frees a host from relying on .I /etc/hosts being up to date and complete. .PP diff --git a/man5/resolv.conf.5 b/man5/resolv.conf.5 index b2532eda..fb351f71 100644 --- a/man5/resolv.conf.5 +++ b/man5/resolv.conf.5 @@ -36,7 +36,7 @@ keywords with values that provide various types of resolver information. .LP On a normally configured system this file should not be necessary. The only name server to be queried will be on the local machine; -the domain name is determined from the host name +the domain name is determined from the hostname and the domain search path is constructed from the domain name. .LP The different configuration options are: @@ -61,10 +61,10 @@ until a maximum number of retries are made.) Most queries for names within this domain can use short names relative to the local domain. If no \fBdomain\fP entry is present, the domain is determined -from the local host name returned by +from the local hostname returned by .BR gethostname (2); the domain part is taken to be everything after the first \(aq.\(aq. -Finally, if the host name does not contain a domain part, the root +Finally, if the hostname does not contain a domain part, the root domain is assumed. .TP \fBsearch\fP Search list for host-name lookup. @@ -176,7 +176,7 @@ sets .BR RES_NOCHECKNAME in .IR _res.options , -which disables the modern BIND checking of incoming host names and +which disables the modern BIND checking of incoming hostnames and mail names for invalid characters such as underscore (_), non-ASCII, or control characters. .TP diff --git a/man7/hostname.7 b/man7/hostname.7 index 4db23665..9fc606c4 100644 --- a/man7/hostname.7 +++ b/man7/hostname.7 @@ -36,8 +36,7 @@ .\" .TH HOSTNAME 7 2008-06-11 "Linux" "Linux Programmer's Manual" .SH NAME -hostname \- host name resolution description -.fi +hostname \- hostname resolution description .SH DESCRIPTION Hostnames are domains, where a domain is a hierarchical, dot-separated list of subdomains; for example, the machine monet, in the Berkeley |