From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 27 Jul 2014 17:09:01 +0000 (+0200)
Subject: Merged branch 'master' of git://git.tokkee.org/sysdb.
X-Git-Tag: sysdb-0.3.0~28
X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=commitdiff_plain;h=812d8a3d3bb4d41ac66294ee1652708b19502eb2

Merged branch 'master' of git://git.tokkee.org/sysdb.

Conflicts:
	src/frontend/grammar.y
---

812d8a3d3bb4d41ac66294ee1652708b19502eb2
diff --cc src/frontend/grammar.y
index 74e28dd,a607ee0..e0d8e7e
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@@ -221,12 -221,12 +221,12 @@@ list_statement
  	;
  
  /*
-  * LOOKUP <type> MATCHING <expression>;
 - * LOOKUP <type> WHERE <condition>;
++ * LOOKUP <type> MATCHING <condition>;
   *
-  * Returns detailed information about <type> matching expression.
+  * Returns detailed information about <type> matching condition.
   */
  lookup_statement:
- 	LOOKUP IDENTIFIER MATCHING expression
 -	LOOKUP IDENTIFIER WHERE condition
++	LOOKUP IDENTIFIER MATCHING condition
  		{
  			/* TODO: support other types as well */
  			if (strcasecmp($2, "hosts")) {