gnustandards standards.texi

[Richard M. Stallman]

CVSROOT:        /sources/gnustandards
Module name:    gnustandards
Changes by:     Richard M. Stallman <rms>       17/09/24 14:29:22

Modified files:
        .              : standards.texi 

Log message:
        (Trademarks, System Portability): Don't duplicate the point about 
"Windows".
        Put the appropriate part in each node.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnustandards/standards.texi?cvsroot=gnustandards&r1=1.250&r2=1.251

Patches:
Index: standards.texi
===================================================================
RCS file: /sources/gnustandards/gnustandards/standards.texi,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -b -r1.250 -r1.251
--- standards.texi      24 Sep 2017 18:15:33 -0000      1.250
+++ standards.texi      24 Sep 2017 18:29:22 -0000      1.251
@@ -254,12 +254,10 @@
 
 Please don't use ``win'' as an abbreviation for Microsoft Windows in
 GNU software or documentation.  In hacker terminology, calling
-something a ``win'' is a form of praise.  If you wish to praise
-Microsoft Windows when speaking on your own, by all means do so, but
-not in GNU software.  Usually we write the name ``Windows'' in full,
-but when brevity is very important (as in file names and sometimes
-symbol names), we abbreviate it to ``w''.  For instance, the files and
-functions in Emacs that deal with Windows start with @samp{w32}.
+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 so in
+GNU packages.  Please write ``Windows'' in full, or abbreviate it to
+``w.''  @xref{System Portability}.
 
 @node Design Advice
 @chapter General Program Design
@@ -2894,14 +2892,15 @@
 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}.
+If you do support Windows, please do not abbreviate it as ``win''.
address@hidden
+
+Usually we write the name ``Windows'' in full, but when brevity is
+very important (as in file names and some symbol names), we abbreviate
+it to ``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}.  In principle there could
+also be @samp{w64}.
 
 It is a good idea to define the ``feature test macro''
 @code{_GNU_SOURCE} when compiling your C files.  When you compile on GNU