Return-Path: 
 <commits-return-23181-apmail-subversion-commits-archive=subversion.apache.org@subversion.apache.org>
X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org
Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0E48EDE92
	for <apmail-subversion-commits-archive@minotaur.apache.org>;
 Tue, 18 Sep 2012 13:49:17 +0000 (UTC)
Received: (qmail 48634 invoked by uid 500); 18 Sep 2012 13:49:16 -0000
Delivered-To: apmail-subversion-commits-archive@subversion.apache.org
Received: (qmail 48606 invoked by uid 500); 18 Sep 2012 13:49:16 -0000
Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@subversion.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@subversion.apache.org>
List-Post: <mailto:commits@subversion.apache.org>
List-Id: <commits.subversion.apache.org>
Reply-To: dev@subversion.apache.org
Delivered-To: mailing list commits@subversion.apache.org
Received: (qmail 48599 invoked by uid 99); 18 Sep 2012 13:49:16 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2012 13:49:16 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2012 13:49:14 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D820823889D7;
	Tue, 18 Sep 2012 13:48:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1387160 -
 /subversion/site/publish/docs/release-notes/1.8.html
Date: Tue, 18 Sep 2012 13:48:30 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120918134830.D820823889D7@eris.apache.org>

Author: stsp
Date: Tue Sep 18 13:48:30 2012
New Revision: 1387160

URL: http://svn.apache.org/viewvc?rev=1387160&view=rev
Log:
* publish/docs/release-notes/1.8.html: "automatic merges" -> "automatic merging"

Modified:
    subversion/site/publish/docs/release-notes/1.8.html

Modified: subversion/site/publish/docs/release-notes/1.8.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.8.html?rev=1387160&r1=1387159&r2=1387160&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Tue Sep 18 13:48:30 2012
@@ -381,7 +381,7 @@ directories specially. Behavioural chang
 </div>  <!-- moves -->
 
 <div class="h3" id="auto-merge">
-<h3>Improved support for automatic merges (--reintegrate option deprecated)
+<h3>Improved support for automatic merging (--reintegrate option deprecated)
   <a class="sectionlink" href="#auto-merge"
     title="Link to this section">&para;</a>
 </h3>