diff --git a/documentation/manual/old/ko-KR/src/main/docbook/content/query_hql.xml b/documentation/manual/old/ko-KR/src/main/docbook/content/query_hql.xml
index fd5d6e9255..53f8ebf3f5 100644
--- a/documentation/manual/old/ko-KR/src/main/docbook/content/query_hql.xml
+++ b/documentation/manual/old/ko-KR/src/main/docbook/content/query_hql.xml
@@ -1114,22 +1114,22 @@ Collection counts = s.filter( collection, "select this.type, count(this) group b
             <literal>select</literal> 절 내에 나타날 수 있다. 
         </para>
 
-        <programlisting><![CDATA[select p.name from from Person p]]></programlisting>
-        <programlisting><![CDATA[select p.name.first from from Person p]]></programlisting>
+        <programlisting><![CDATA[select p.name from Person p]]></programlisting>
+        <programlisting><![CDATA[select p.name.first from Person p]]></programlisting>
 
         <para>
             여기서 Person의 name 속성은 컴포넌트이다. 컴포넌트들은 또한 <literal>where</literal> 절 내에 사용될 수 있다: 
         </para>
 
-        <programlisting><![CDATA[from from Person p where p.name = :name]]></programlisting>
-        <programlisting><![CDATA[from from Person p where p.name.first = :firstName]]></programlisting>
+        <programlisting><![CDATA[from Person p where p.name = :name]]></programlisting>
+        <programlisting><![CDATA[from Person p where p.name.first = :firstName]]></programlisting>
 
         <para>
             컴포넌트들은 또한 <literal>order by</literal> 절 내에 사용될 수 있다:
         </para>
 
-        <programlisting><![CDATA[from from Person p order by p.name]]></programlisting>
-        <programlisting><![CDATA[from from Person p order by p.name.first]]></programlisting>
+        <programlisting><![CDATA[from Person p order by p.name]]></programlisting>
+        <programlisting><![CDATA[from Person p order by p.name.first]]></programlisting>
 
         <para>
             컴포넌트들에 대한 또 다른 공통적인 사용은 <xref linkend="queryhql-tuple">row value constructors</xref>에 있다.
@@ -1158,7 +1158,7 @@ Collection counts = s.filter( collection, "select this.type, count(this) group b
             <literal>select</literal>절 내에 이것을 지정하는 것이 또한 유용할 수 있다:
         </para>
 
-        <programlisting><![CDATA[select p.name from from Person p]]></programlisting>
+        <programlisting><![CDATA[select p.name from Person p]]></programlisting>
 
         <para>
             <literal>row value constructor</literal> 구문을 사용하는 또 다른 경우는 다중 값들에 대해 비교할 필요가 있는 
diff --git a/documentation/manual/src/main/docbook/en-US/content/query_hql.xml b/documentation/manual/src/main/docbook/en-US/content/query_hql.xml
index 7f0c950561..18646f927f 100644
--- a/documentation/manual/src/main/docbook/en-US/content/query_hql.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/query_hql.xml
@@ -1168,23 +1168,23 @@ Collection counts = s.filter( collection, "select this.type, count(this) group b
             queries.  They can appear in the <literal>select</literal> clause:
         </para>
 
-        <programlisting><![CDATA[select p.name from from Person p]]></programlisting>
-        <programlisting><![CDATA[select p.name.first from from Person p]]></programlisting>
+        <programlisting><![CDATA[select p.name from Person p]]></programlisting>
+        <programlisting><![CDATA[select p.name.first from Person p]]></programlisting>
 
         <para>
             where the Person's name property is a component.  Components can also be used
             in the <literal>where</literal> clause:
         </para>
 
-        <programlisting><![CDATA[from from Person p where p.name = :name]]></programlisting>
-        <programlisting><![CDATA[from from Person p where p.name.first = :firstName]]></programlisting>
+        <programlisting><![CDATA[from Person p where p.name = :name]]></programlisting>
+        <programlisting><![CDATA[from Person p where p.name.first = :firstName]]></programlisting>
 
         <para>
             Components can also be used in the <literal>order by</literal> clause:
         </para>
 
-        <programlisting><![CDATA[from from Person p order by p.name]]></programlisting>
-        <programlisting><![CDATA[from from Person p order by p.name.first]]></programlisting>
+        <programlisting><![CDATA[from Person p order by p.name]]></programlisting>
+        <programlisting><![CDATA[from Person p order by p.name.first]]></programlisting>
 
         <para>
             Another common use of components is in <link linkend="queryhql-tuple">row value constructors</link>.
@@ -1214,7 +1214,7 @@ Collection counts = s.filter( collection, "select this.type, count(this) group b
             It can also be useful to specify this in the <literal>select</literal> clause:
         </para>
 
-        <programlisting><![CDATA[select p.name from from Person p]]></programlisting>
+        <programlisting><![CDATA[select p.name from Person p]]></programlisting>
 
         <para>
             Another time using <literal>row value constructor</literal> syntax can be beneficial
diff --git a/documentation/manual/src/main/docbook/es-ES/content/query_hql.po b/documentation/manual/src/main/docbook/es-ES/content/query_hql.po
index f280a89a11..c2834eabba 100644
--- a/documentation/manual/src/main/docbook/es-ES/content/query_hql.po
+++ b/documentation/manual/src/main/docbook/es-ES/content/query_hql.po
@@ -2099,12 +2099,12 @@ msgstr ""
 "clause:"
 
 #: index.docbook:992, index.docbook:1038
-msgid "<![CDATA[select p.name from from Person p]]>"
-msgstr "<![CDATA[select p.name from from Person p]]>"
+msgid "<![CDATA[select p.name from Person p]]>"
+msgstr "<![CDATA[select p.name from Person p]]>"
 
 #: index.docbook:993
-msgid "<![CDATA[select p.name.first from from Person p]]>"
-msgstr "<![CDATA[select p.name.first from from Person p]]>"
+msgid "<![CDATA[select p.name.first from Person p]]>"
+msgstr "<![CDATA[select p.name.first from Person p]]>"
 
 #: index.docbook:995
 msgid ""
@@ -2115,24 +2115,24 @@ msgstr ""
 "in the <literal>where</literal> clause:"
 
 #: index.docbook:1000
-msgid "<![CDATA[from from Person p where p.name = :name]]>"
-msgstr "<![CDATA[from from Person p where p.name = :name]]>"
+msgid "<![CDATA[from Person p where p.name = :name]]>"
+msgstr "<![CDATA[from Person p where p.name = :name]]>"
 
 #: index.docbook:1001
-msgid "<![CDATA[from from Person p where p.name.first = :firstName]]>"
-msgstr "<![CDATA[from from Person p where p.name.first = :firstName]]>"
+msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
+msgstr "<![CDATA[from Person p where p.name.first = :firstName]]>"
 
 #: index.docbook:1003
 msgid "Components can also be used in the <literal>order by</literal> clause:"
 msgstr "Components can also be used in the <literal>order by</literal> clause:"
 
 #: index.docbook:1007
-msgid "<![CDATA[from from Person p order by p.name]]>"
-msgstr "<![CDATA[from from Person p order by p.name]]>"
+msgid "<![CDATA[from Person p order by p.name]]>"
+msgstr "<![CDATA[from Person p order by p.name]]>"
 
 #: index.docbook:1008
-msgid "<![CDATA[from from Person p order by p.name.first]]>"
-msgstr "<![CDATA[from from Person p order by p.name.first]]>"
+msgid "<![CDATA[from Person p order by p.name.first]]>"
+msgstr "<![CDATA[from Person p order by p.name.first]]>"
 
 #: index.docbook:1010
 msgid ""
diff --git a/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po b/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po
index d83632d593..13230d9aa5 100644
--- a/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po
+++ b/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po
@@ -2320,13 +2320,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:992 query_hql.xml:1038
 #, no-c-format
-msgid "<![CDATA[select p.name from from Person p]]>"
+msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:993
 #, no-c-format
-msgid "<![CDATA[select p.name.first from from Person p]]>"
+msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
@@ -2340,13 +2340,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1000
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name = :name]]>"
+msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1001
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name.first = :firstName]]>"
+msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
@@ -2358,13 +2358,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1007
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name]]>"
+msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1008
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name.first]]>"
+msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/ja-JP/content/query_hql.po b/documentation/manual/src/main/docbook/ja-JP/content/query_hql.po
index f0756193e2..96c754a35b 100644
--- a/documentation/manual/src/main/docbook/ja-JP/content/query_hql.po
+++ b/documentation/manual/src/main/docbook/ja-JP/content/query_hql.po
@@ -2268,13 +2268,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:992 query_hql.xml:1038
 #, no-c-format
-msgid "<![CDATA[select p.name from from Person p]]>"
+msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:993
 #, no-c-format
-msgid "<![CDATA[select p.name.first from from Person p]]>"
+msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
@@ -2288,13 +2288,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1000
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name = :name]]>"
+msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1001
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name.first = :firstName]]>"
+msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
@@ -2306,13 +2306,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1007
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name]]>"
+msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1008
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name.first]]>"
+msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/ko-KR/content/query_hql.po b/documentation/manual/src/main/docbook/ko-KR/content/query_hql.po
index 5a9aedd706..e699041b96 100644
--- a/documentation/manual/src/main/docbook/ko-KR/content/query_hql.po
+++ b/documentation/manual/src/main/docbook/ko-KR/content/query_hql.po
@@ -2284,13 +2284,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:992 query_hql.xml:1038
 #, no-c-format
-msgid "<![CDATA[select p.name from from Person p]]>"
+msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:993
 #, no-c-format
-msgid "<![CDATA[select p.name.first from from Person p]]>"
+msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
@@ -2306,13 +2306,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1000
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name = :name]]>"
+msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1001
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name.first = :firstName]]>"
+msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
@@ -2324,13 +2324,13 @@ msgstr "컴포넌트들은 또한 <literal>order by</literal> 절 내에 사용
 #. Tag: programlisting
 #: query_hql.xml:1007
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name]]>"
+msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1008
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name.first]]>"
+msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/pt-BR/content/query_hql.po b/documentation/manual/src/main/docbook/pt-BR/content/query_hql.po
index f767f47abd..7c3f268ba4 100644
--- a/documentation/manual/src/main/docbook/pt-BR/content/query_hql.po
+++ b/documentation/manual/src/main/docbook/pt-BR/content/query_hql.po
@@ -2306,13 +2306,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:992 query_hql.xml:1038
 #, no-c-format
-msgid "<![CDATA[select p.name from from Person p]]>"
+msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:993
 #, no-c-format
-msgid "<![CDATA[select p.name.first from from Person p]]>"
+msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
@@ -2326,13 +2326,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1000
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name = :name]]>"
+msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1001
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name.first = :firstName]]>"
+msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
@@ -2344,13 +2344,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1007
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name]]>"
+msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1008
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name.first]]>"
+msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po b/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po
index 9aed70bcad..e3f2da488d 100644
--- a/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po
+++ b/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po
@@ -2216,13 +2216,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:992 query_hql.xml:1038
 #, no-c-format
-msgid "<![CDATA[select p.name from from Person p]]>"
+msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:993
 #, no-c-format
-msgid "<![CDATA[select p.name.first from from Person p]]>"
+msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
@@ -2236,13 +2236,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1000
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name = :name]]>"
+msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1001
 #, no-c-format
-msgid "<![CDATA[from from Person p where p.name.first = :firstName]]>"
+msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
@@ -2254,13 +2254,13 @@ msgstr ""
 #. Tag: programlisting
 #: query_hql.xml:1007
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name]]>"
+msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
 #: query_hql.xml:1008
 #, no-c-format
-msgid "<![CDATA[from from Person p order by p.name.first]]>"
+msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para