diff --git a/ChangeLog b/ChangeLog
index 90c9fd11e39cc814cc721156ffbd673951f50300..ee9de4faf90f390eaacadd2141e16911e4ae2200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS code -
+GNU nano 1.3.4 - 2004.08.17
- General:
- More minor comment cleanups. (DLR)
- Convert more ints and functions using 0 and 1 to bools using
diff --git a/NEWS b/NEWS
index bbe4ffb9bad92ea6e579cb89218bcd01ec2cf114..73953905969fc2e4c53ccca3a71bdbb2c95743ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+2004.08.17 - GNU nano 1.3.4 marches forth after a false start. This
+ release mainly features fixes for the bugs that crept
+ into the last release. Among other things, nano now
+ compiles again with certain options, quoted justify now
+ works properly on systems without regex.h, full justify
+ no longer segfaults when used on a file with no
+ paragraphs, previous paragraph searching works properly
+ again, tab completion is properly disabled when needed
+ in restricted mode, Ctrl-C is no longer disabled after
+ using the alternate spell checker, the permissions of a
+ newly created file now match those of nano 1.2.x again,
+ and replacing all text in a file now properly updates
+ the screen in all cases. New features include sample
+ regexes for patch files, improvements to the sample
+ regexes for C files, and support for strings
+ greater than 1023 characters and/or containing nulls in
+ .nano_history. Additionally, the full justify keystroke
+ has been changed to match current Pico, and whitespace
+ display mode is now turned off by default. Enjoy.
+
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
diff --git a/configure.ac b/configure.ac
index 3e3d87926f3cde136d7e43c74fb5d9dfdbc76f96..22b5528f0b6d0bae91f12fa52da4bce10dd2cc59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
#
# $Id$
-AC_INIT([GNU nano], [1.3.3-cvs], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [1.3.4], [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 886d7b5a5b830ca1e1e87d16dbd23e7ce5126ac3..0e5465c08422eb664fc8e5dd3bd7dd1daf709330 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.3. 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.4. 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 682eb379650ac78ecd6f39e1676945938bcf59c6..7536675f130d41dc5850401f51c3e5c5d9dec2f1 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.3" "June 28, 2004"
+.TH NANO 1 "version 1.3.4" "August 17, 2004"
.\" Please adjust this date whenever revising the manpage.
.\"
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 2638c42c245b1a823a451123a716120967570443..a4fed3d9aafe47e3954837f0225e5452494e8d91 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.3" "June 28, 2004"
+.TH NANORC 5 "version 1.3.4" "August 17, 2004"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 1ca86a79c128e397ad580c50fdc8e4fecda335dd..5699b8a67a238f81ed42f8afdbfbd70197c0f006 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.3
-@set UPDATED 28 Jun 2004
+@set VERSION 1.3.4
+@set UPDATED 17 Aug 2004
@dircategory Editors
@direntry
@@ -23,7 +23,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 1.3.3
+@subtitle version 1.3.4
@author Chris Allegretta
@page