From 5c3ff8c2fc415d864384197c340640d6aba94c41 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 24 Aug 2008 18:39:13 +0000
Subject: [PATCH] git-svn-id: svn://ultimatepp.org/upp/trunk@365
 f0d560ea-af0d-0410-9eb7-867de7ffcac7

---
 reference/SqlExp/SqlExp.cpp            |  2 ++
 reference/Topic/app.tpp/main$en-us.tpp | 18 +++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/reference/SqlExp/SqlExp.cpp b/reference/SqlExp/SqlExp.cpp
index ee30c9506..e632c36cf 100644
--- a/reference/SqlExp/SqlExp.cpp
+++ b/reference/SqlExp/SqlExp.cpp
@@ -115,6 +115,8 @@ CONSOLE_APP_MAIN
 	EXP(Select(COLUMN).From(TABLE).Where(COLUMN == (Select(COLUMN1).From(TABLE1) & Select(COLUMN2).From(TABLE2))));
 	EXP(Select(COLUMN).From(TABLE).Where(COLUMN == (Select(COLUMN1).From(TABLE1) - Select(COLUMN2).From(TABLE2))));
 	EXP(Select(COLUMN).From(TABLE).Where(COLUMN == 0).GroupBy(COLUMN).Having(COLUMN == 0).OrderBy(Descending(COLUMN)));
+	EXP(Select(COLUMN, Count(Select(SqlAll()).From(TABLE))).From(TABLE).Where(COLUMN == 0).GroupBy(COLUMN)
+	    .Having(COLUMN == 0).OrderBy(Descending(COLUMN)));
 	EXP(Select(COLUMN).From(TABLE).Limit(100));
 	EXP(Select(COLUMN).From(TABLE).Limit(100, 10));
 	EXP(Select(COLUMN).From(TABLE).Offset(20));
diff --git a/reference/Topic/app.tpp/main$en-us.tpp b/reference/Topic/app.tpp/main$en-us.tpp
index ea0e4348f..51a8f1aed 100644
--- a/reference/Topic/app.tpp/main$en-us.tpp
+++ b/reference/Topic/app.tpp/main$en-us.tpp
@@ -1,11 +1,7 @@
-TITLE("This is Topic++ example page")
-COMPRESSED
-120,156,139,86,80,81,49,208,49,80,54,32,0,172,92,82,
-211,18,75,115,74,98,163,171,227,107,85,93,253,116,67,131,
-21,162,139,13,172,109,181,204,20,66,50,50,139,21,128,40,
-36,191,32,51,57,65,59,65,91,33,181,34,49,183,32,39,
-85,161,32,49,61,85,45,22,164,78,1,74,193,212,38,42,
-68,199,149,128,213,91,37,232,39,232,67,180,234,39,22,20,
-36,232,131,52,25,37,168,164,230,37,232,150,22,199,41,228,
-100,230,101,43,148,228,43,36,230,229,151,100,164,22,129,205,
-140,213,131,26,23,11,0,249,110,57,237,
\ No newline at end of file
+topic "This is Topic++ example page";[ $$0,0#00000000000000000000000000000000:Default]
+[{_}%EN-US 
+[s0;=*6 This is Topic`+`+ example page&]
+[s0; &]
+[s0; This is a [^topic`:`/`/Topic`/app`/page2`$en`-us^ link to another 
+page].&]
+[s0; ]
\ No newline at end of file