From e819214ed9550f4175e0786e42c17fe01f0f3f52 Mon Sep 17 00:00:00 2001
From: Hubert Tong <hstong@ca.ibm.com>
Date: Fri, 14 Jul 2017 11:08:29 -0400
Subject: [PATCH 1/2] [basic.def.odr] Remove changes to paragraph 1

The change to paragraph 1 is redundant with the change that makes all
concepts also be templates.
---
 src/basic.tex | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/basic.tex b/src/basic.tex
index f14b381..6ef96c3 100644
--- a/src/basic.tex
+++ b/src/basic.tex
@@ -15,18 +15,7 @@
 
 \rSec1[basic.def.odr]{One-definition rule}
 
-Modify paragraph 1.
-
-\begin{quote}
-\pnum
-No translation unit shall contain more than one definition of any
-variable, function, class type, enumeration type, 
-\removed{or} template\added{, or concept}.
-\end{quote}
-
-Modify paragraph 6. The full requirements allowing multiple definitions
-in different translation units are unchanged and therefore omitted in this
-text.
+Modify at the beginning of paragraph 6.
 
 \begin{quote}
 \setcounter{Paras}{5}

From 5e43a6bea551a85c366d27dbe208d22e1e9981fb Mon Sep 17 00:00:00 2001
From: Hubert Tong <hstong@ca.ibm.com>
Date: Fri, 14 Jul 2017 14:20:31 -0400
Subject: [PATCH 2/2] [gram.basic] Remove redundant changes to make concepts
 entities

Concepts are templates, which are entities.
---
 src/basic.tex | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/basic.tex b/src/basic.tex
index 6ef96c3..c77d70b 100644
--- a/src/basic.tex
+++ b/src/basic.tex
@@ -1,18 +1,6 @@
 %!TEX root = ts.tex
 \rSec0[basic]{Basic concepts}
 
-\rSec1[gram.basic]{Basic concepts}
-
-Add concepts to the list of entities.
-
-\begin{quote}
-\setcounter{Paras}{2}
-\pnum
-An \defn{entity} is a value, object, reference, function, enumerator, type,
-class member, bit-field, template, \added{concept,} template specialization, 
-namespace, or parameter pack.
-\end{quote}
-
 \rSec1[basic.def.odr]{One-definition rule}
 
 Modify at the beginning of paragraph 6.