*** /home/calancha/soft/gnulib/doc/standards.texi	2016-04-26 21:36:52.048107214 +0900
--- /tmp/ediff4550QRT	2016-04-26 21:41:03.565000062 +0900
***************
*** 2905,2918 ****
  that will be useful on GNU and GNU/Linux, rather than on supporting
  other incompatible systems.
  
! If you do support Windows, please do not abbreviate it as ``win''.  In
! hacker terminology, calling something a ``win'' is a form of praise.
! You're free to praise Microsoft Windows on your own if you want, but
! please don't do this in GNU packages.  Instead of abbreviating
! ``Windows'' to ``win'', you can write it in full or abbreviate it to
! ``woe'' or ``w''.  In GNU Emacs, for instance, we use @samp{w32} in
! file names of Windows-specific files, but the macro for Windows
! conditionals is called @code{WINDOWSNT}.
  
  It is a good idea to define the ``feature test macro''
  @code{_GNU_SOURCE} when compiling your C files.  When you compile on GNU
--- 2905,2912 ----
  that will be useful on GNU and GNU/Linux, rather than on supporting
  other incompatible systems.
  
! If you do support Windows, please do not abbreviate it as ``win''; write
! the name ``Windows'' in full instead.  See section trademarks for more details.
  
  It is a good idea to define the ``feature test macro''
  @code{_GNU_SOURCE} when compiling your C files.  When you compile on GNU