Commit 1abe65d9 authored by Steve Holme's avatar Steve Holme
Browse files

code/docs: Use Unix rather than UNIX to avoid use of the trademark 

Use Unix when generically writing about Unix based systems as UNIX is
the trademark and should only be used in a particular product's name.
parent b7f740f2

CHANGES.0

+1 −1
Original line number Diff line number Diff line
@@ -17598,7 +17598,7 @@ Version 4.8.4 
 - As Julian Romero Nieto reported, curl reported wrong version number.

 - As Teemu Yli-Elsila pointed out, the win32 version of 4.8 (and probably all

   other versions for win32) didn't work with binary files since I'm too used

   to the UNIX style fopen() where binary and text don't differ...

   to the Unix style fopen() where binary and text don't differ...

 - Ralph Beckmann brought me some changes that lets curl compile error and

   warning free with -Wall -pedantic with g++. I also took the opportunity to

   clean off some unused variables and similar.

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ if(CMAKE_USE_GSSAPI) 
  endif()

endif()



option(ENABLE_UNIX_SOCKETS "Define if you want UNIX domain sockets support" ON)

option(ENABLE_UNIX_SOCKETS "Define if you want Unix domain sockets support" ON)

if(ENABLE_UNIX_SOCKETS)

  include(CheckStructHasMember)

  check_struct_has_member("struct sockaddr_un" sun_path "sys/un.h" USE_UNIX_SOCKETS)

configure.ac

+7 −7
Original line number Diff line number Diff line
@@ -3275,12 +3275,12 @@ if test "$want_tls_srp" = "yes" && ( test "x$HAVE_GNUTLS_SRP" = "x1" || test "x$ 
fi



dnl ************************************************************

dnl disable UNIX domain sockets support

dnl disable Unix domain sockets support

dnl

AC_MSG_CHECKING([whether to enable UNIX domain sockets])

AC_MSG_CHECKING([whether to enable Unix domain sockets])

AC_ARG_ENABLE(unix-sockets,

AC_HELP_STRING([--enable-unix-sockets],[Enable UNIX domain sockets])

AC_HELP_STRING([--disable-unix-sockets],[Disable UNIX domain sockets]),

AC_HELP_STRING([--enable-unix-sockets],[Enable Unix domain sockets])

AC_HELP_STRING([--disable-unix-sockets],[Disable Unix domain sockets]),

[ case "$enableval" in

  no)  AC_MSG_RESULT(no)

       want_unix_sockets=no
@@ -3295,7 +3295,7 @@ AC_HELP_STRING([--disable-unix-sockets],[Disable UNIX domain sockets]), 
)

if test "x$want_unix_sockets" != "xno"; then

  AC_CHECK_MEMBER([struct sockaddr_un.sun_path], [

    AC_DEFINE(USE_UNIX_SOCKETS, 1, [Use UNIX domain sockets])

    AC_DEFINE(USE_UNIX_SOCKETS, 1, [Use Unix domain sockets])

    AC_SUBST(USE_UNIX_SOCKETS, [1])

    curl_unix_sockets_msg="enabled"

  ], [
@@ -3391,7 +3391,7 @@ if test "x$IPV6_ENABLED" = "x1"; then 
  SUPPORT_FEATURES="$SUPPORT_FEATURES IPv6"

fi

if test "x$USE_UNIX_SOCKETS" = "x1"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES UNIX-Sockets"

  SUPPORT_FEATURES="$SUPPORT_FEATURES UnixSockets"

fi

if test "x$HAVE_LIBZ" = "x1"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES libz"
@@ -3601,7 +3601,7 @@ AC_MSG_NOTICE([Configured to build curl/libcurl: 
  TLS-SRP support:  ${curl_tls_srp_msg}

  resolver:         ${curl_res_msg}

  ipv6 support:     ${curl_ipv6_msg}

  UNIX sockets support: ${curl_unix_sockets_msg}

  Unix sockets support: ${curl_unix_sockets_msg}

  IDN support:      ${curl_idn_msg}

  Build libcurl:    Shared=${enable_shared}, Static=${enable_static}

  Built-in manual:  ${curl_manual_msg}

docs/INSTALL

+2 −2
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ Building from git 
   If you get your code off a git repository, see the GIT-INFO file in the

   root directory for specific instructions on how to proceed.



UNIX

Unix

====



   A normal unix installation is made in three or four steps (after you've

   A normal Unix installation is made in three or four steps (after you've

   unpacked the source archive):



        ./configure

docs/KNOWN_BUGS

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ may have been fixed since this was written! 
  be to use a data structure other than a plain C string, one that can handle

  embedded NUL characters.  From a practical standpoint, most FTP servers

  would not meaningfully support NUL characters within RFC 959 <string>,

  anyway (e.g., UNIX pathnames may not contain NUL).

  anyway (e.g., Unix pathnames may not contain NUL).



14. Test case 165 might fail on a system which has libidn present, but with an

  old iconv version (2.1.3 is a known bad version), since it doesn't recognize