Merge from emacs--rel--22

[gnu-emacs] / admin / nt / README-ftp-server

diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 1b93a4ceba40372941eaf590fa39524b05f1fa26..9410419c60588321c22eadbe0a181b47403ef72f 100644 (file)
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -162,6 +162,11 @@ See the end of the file for license conditions.
 
     % unzip some.zip
 
+  The precompiled binaries can be unpacked using unzip.exe from info-zip.org
+  if you do not already have other tools to do this.
+
+    % unzip some.zip
+
   Once you have unpacked a precompiled distribution of Emacs, it should
   have the following subdirectories:
 
@@ -260,10 +265,10 @@ See the end of the file for license conditions.
 \f
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -271,6 +276,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.