From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753638AbbBPRNt (ORCPT <rfc822;w@1wt.eu>);
	Mon, 16 Feb 2015 12:13:49 -0500
Received: from tex.lwn.net ([70.33.254.29]:40162 "EHLO vena.lwn.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753001AbbBPRNs (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 16 Feb 2015 12:13:48 -0500
Date: Mon, 16 Feb 2015 10:13:46 -0700
From: Jonathan Corbet <corbet@lwn.net>
To: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Ingo Molnar <mingo@elte.hu>, linux-doc@vger.kernel.org,
        linux-kernel@vger.kernel.org, Michael Kerrisk <mtk.manpages@gmail.com>
Subject: Re: [PATCH 1/1] Documentation/robust-futex-API: remove alternative
 language
Message-ID: <20150216101346.1495da8e@lwn.net>
In-Reply-To: <1424098577-5492-1-git-send-email-xypron.glpk@gmx.de>
References: <1424098577-5492-1-git-send-email-xypron.glpk@gmx.de>
Organization: LWN.net
X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-redhat-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 16 Feb 2015 15:56:17 +0100
Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:

> The man-pages as well as robust-futexes.txt use the word
> "contend" for a situation where two threads try to access
> the same futex at the same time.
> 
> To avoid confusion robust-futex-API.txt should not use
> "contest" as alternative language.

Seems sensible.  Applied to the docs tree, thanks.

jon