From owner-svn-soc-all@FreeBSD.ORG  Wed May 28 17:01:52 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 26C1581F
 for <svn-soc-all@FreeBSD.org>; Wed, 28 May 2014 17:01:52 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 13DA72CE3
 for <svn-soc-all@FreeBSD.org>; Wed, 28 May 2014 17:01:52 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SH1pn4005552
 for <svn-soc-all@FreeBSD.org>; Wed, 28 May 2014 17:01:51 GMT
 (envelope-from zkorchev@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s4SH1plc005536
 for svn-soc-all@FreeBSD.org; Wed, 28 May 2014 17:01:51 GMT
 (envelope-from zkorchev@FreeBSD.org)
Date: Wed, 28 May 2014 17:01:51 GMT
Message-Id: <201405281701.s4SH1plc005536@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 zkorchev@FreeBSD.org using -f
From: zkorchev@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r268777 - soc2014/zkorchev/freebsd_head/bin/ls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 May 2014 17:01:52 -0000

Author: zkorchev
Date: Wed May 28 17:01:51 2014
New Revision: 268777
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268777

Log:
  Updated ls manual page

Modified:
  soc2014/zkorchev/freebsd_head/bin/ls/ls.1

Modified: soc2014/zkorchev/freebsd_head/bin/ls/ls.1
==============================================================================
--- soc2014/zkorchev/freebsd_head/bin/ls/ls.1	Wed May 28 16:57:17 2014	(r268776)
+++ soc2014/zkorchev/freebsd_head/bin/ls/ls.1	Wed May 28 17:01:51 2014	(r268777)
@@ -158,6 +158,8 @@
 This option cancels the
 .Fl P
 option.
+.It Fl O
+Output the results in JSON format.
 .It Fl P
 If argument is a symbolic link, list the link itself rather than the
 object the link references.