diff --git a/ChangeLog b/ChangeLog
index 65511504e150f9235e68c3ed55a00ec3421d40a1..fe1141b2f8d0a8076e497fb05b609b94953e574c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS code -
+GNU nano 1.3.3 - 2004.06.28
- General:
- Minor comment cleanups. (DLR)
- Convert more ints used as boolean values to use TRUE and
diff --git a/NEWS b/NEWS
index 505e839e47acd8f67d4bf960c5a399b8f429e833..bbe4ffb9bad92ea6e579cb89218bcd01ec2cf114 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+2004.06.28 - GNU nano 1.3.3 marches forth. There are several new
+ features in this release, including a restricted mode
+ that provides better security than just setting an
+ operating directory, the ability to justify the entire
+ file at once, support for a "smart" home key that can
+ leap from the beginning of text on a line to the true
+ beginning of the line (or the reverse) in one stroke,
+ support for specifying an alternative spell checker in
+ $SPELL, the ability to specify the characters used to
+ display spaces and tabs so that they can easily be told
+ apart, and the ability to specify the characters marking
+ the ends of sentences as used in justification. There
+ are also several bug fixes; among other things,
+ justification now keeps spaces at the ends of all but
+ the last line of a paragraph as Pico does, saving a
+ marked selection no longer changes the current filename
+ to the filename the selection was saved under, resizing
+ now works better and no longer corrupts the screen under
+ slang, and the movement functions now avoid doing
+ unnecessary redraws and hence work faster. In short,
+ there are a lot of new things to play with. Enjoy.
+
2004.03.31 - GNU nano 1.3.2 is prepared for the void. New features in
this release include the ability to spell-check only
marked text and the ability to save all backup files in
diff --git a/configure.ac b/configure.ac
index 0c774f88405f0e8af0c08460d204b0d03d725816..d8982ee6c1332b69503d0df930a313f09edbb2eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
#
# $Id$
-AC_INIT([GNU nano], [1.3.2-cvs], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [1.3.3], [nano-devel@gnu.org], [nano])
AC_CONFIG_SRCDIR([src/nano.c])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([config.h:config.h.in])
diff --git a/doc/faq.html b/doc/faq.html
index b3461772798aba4bca1a719e5ba7742c2a11abe6..886d7b5a5b830ca1e1e87d16dbd23e7ce5126ac3 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -78,7 +78,7 @@
<h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
<blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
<h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano *should* be 1.3.2. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano *should* be 1.3.3. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
<h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v1.2/nano.1.html">here</a>.</p></blockquote>
<hr width="100%">
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index cad8a159aed3824dfd2c0de89b0deaa4adb607ed..682eb379650ac78ecd6f39e1676945938bcf59c6 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -6,7 +6,7 @@
.\" Public License for copying conditions. There is NO warranty.
.\"
.\" $Id$
-.TH NANO 1 "version 1.3.2" "March 31, 2004"
+.TH NANO 1 "version 1.3.3" "June 28, 2004"
.\" Please adjust this date whenever revising the manpage.
.\"
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index dcbee33ee61efd7d2af2683cf6e344e482fd1129..2638c42c245b1a823a451123a716120967570443 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -5,7 +5,7 @@
.\" Public License for copying conditions. There is NO warranty.
.\"
.\" $Id$
-.TH NANORC 5 "version 1.3.2" "March 31, 2004"
+.TH NANORC 5 "version 1.3.3" "June 28, 2004"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index d1c1e7f08462549b8c9a03c05404411d908b1c15..1ca86a79c128e397ad580c50fdc8e4fecda335dd 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -8,8 +8,8 @@
@c Run `makeinfo' rather than `texinfo-format-buffer'.
@smallbook
@set EDITION 0.1
-@set VERSION 1.3.2
-@set UPDATED 31 Mar 2004
+@set VERSION 1.3.3
+@set UPDATED 28 Jun 2004
@dircategory Editors
@direntry
@@ -23,7 +23,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 1.3.2
+@subtitle version 1.3.3
@author Chris Allegretta
@page