freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [02/27] incubator-freemarker git commit: Fix freemarker site urls
Date Sat, 03 Feb 2018 21:16:45 GMT
Fix freemarker site urls

Change all freemarker.org to freemarker.apache.org in documentation
(including javadoc and notes).


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bc69b84c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bc69b84c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bc69b84c

Branch: refs/heads/2.3
Commit: bc69b84c9e7bf89798af816fa005055c54667ab4
Parents: 95671a5
Author: Michael Riehemann <michael.riehemann@coremedia.com>
Authored: Thu Nov 9 19:13:45 2017 +0100
Committer: Michael Riehemann <michael.riehemann@coremedia.com>
Committed: Thu Nov 9 19:13:45 2017 +0100

----------------------------------------------------------------------
 RELEASE-NOTES                                   |  2 +-
 build.xml                                       |  4 ++--
 ivy.xml                                         |  6 ++---
 src/dist/bin/documentation/index.html           |  4 ++--
 src/main/java/freemarker/core/BuiltIn.java      |  2 +-
 src/main/java/freemarker/ext/dom/package.html   |  2 +-
 .../java/freemarker/ext/servlet/package.html    |  2 +-
 src/main/java/freemarker/template/Template.java |  2 +-
 .../freemarker/template/TemplateNodeModel.java  |  2 +-
 src/main/java/freemarker/template/package.html  |  2 +-
 src/manual/en_US/book.xml                       | 24 ++++++++++----------
 src/manual/zh_CN/book.xml                       | 20 ++++++++--------
 src/manual/zh_CN/docgen.cjson                   | 16 ++++++-------
 13 files changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/RELEASE-NOTES
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b9fc1cf..3b9ddce 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,7 +1,7 @@
 Where to find the change log:
 
 - Online (for stable releases only):
-  http://freemarker.org/docs/app_versions.html
+  http://freemarker.apache.org/docs/app_versions.html
 
 - Offline:
   In the binary release, open documentation/index.html, click "Manual", then

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 28e29d4..9088b50 100644
--- a/build.xml
+++ b/build.xml
@@ -838,7 +838,7 @@
     Google App Engine compliant variation of FreeMarker.
     FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
   </description>
-  <url>http://freemarker.org/</url>
+  <url>http://freemarker.apache.org/</url>
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://apache.org</url>
@@ -1001,7 +1001,7 @@ Proceed? </input>
   >
     <echo>Getting dependencies...</echo>
     <echo>-------------------------------------------------------</echo>
-    <ivy:settings id="remote" url="http://freemarker.org/repos/ivy/ivysettings-remote.xml"
/>
+    <ivy:settings id="remote" url="http://freemarker.apache.org/repos/ivy/ivysettings-remote.xml"
/>
     <!-- Build an own repository that will serve us even offline: -->
     <ivy:retrieve settingsRef="remote" sync="true"
       ivypattern=".ivy.part/repo/[organisation]/[module]/ivy-[revision].xml"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index bcb1924..356b780 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -27,8 +27,8 @@
 ]>
 <ivy-module version="2.0">
   <info organisation="org.freemarker" module="freemarker">
-    <license name="Apache License, Version 2.0" url="http://freemarker.org/docs/app_license.html"
/>
-    <description homepage="http://freemarker.org/">
+    <license name="Apache License, Version 2.0" url="http://freemarker.apache.org/docs/app_license.html"
/>
+    <description homepage="http://freemarker.apache.org/">
       FreeMarker is a &quot;template engine&quot;; a generic tool to
       generate text output (anything from HTML to autogenerated source
       code) based on templates.
@@ -186,4 +186,4 @@
     <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" />
     
   </dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
index a482423..47e34dd 100644
--- a/src/dist/bin/documentation/index.html
+++ b/src/dist/bin/documentation/index.html
@@ -60,8 +60,8 @@
       <li><a href="_html/api/index.html">Java API</a></li>
     </ul>
     
-    <p><a href="http://freemarker.org/">Visit the FreeMarker home page</a>
(help, editor plugins, latest downloads, etc.)</p>
+    <p><a href="http://freemarker.apache.org/">Visit the FreeMarker home page</a>
(help, editor plugins, latest downloads, etc.)</p>
     
     <p><i><b>Disclaimer:</b> Apache FreeMarker is an effort undergoing
incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation
is required of all newly accepted projects until a further review indicates that the infrastructure,
communications, and decision making process have stabilized in a manner consistent with other
successful ASF projects. While incubation status is not necessarily a reflection of the completeness
or stability of the code, it does indicate that the project has yet to be fully endorsed by
the ASF.</i></p>
 </body>
-</html>
\ No newline at end of file
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/main/java/freemarker/core/BuiltIn.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltIn.java b/src/main/java/freemarker/core/BuiltIn.java
index 630f895..6d13412 100644
--- a/src/main/java/freemarker/core/BuiltIn.java
+++ b/src/main/java/freemarker/core/BuiltIn.java
@@ -324,7 +324,7 @@ abstract class BuiltIn extends Expression implements Cloneable {
             StringBuilder buf = new StringBuilder("Unknown built-in: ").append(StringUtil.jQuote(key)).append(".
");
             
             buf.append(
-                    "Help (latest version): http://freemarker.org/docs/ref_builtins.html;
"
+                    "Help (latest version): http://freemarker.apache.org/docs/ref_builtins.html;
"
                     + "you're using FreeMarker ").append(Configuration.getVersion()).append(".\n"

                     + "The alphabetical list of built-ins:");
             List names = new ArrayList(BUILT_INS_BY_NAME.keySet().size());

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/main/java/freemarker/ext/dom/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/package.html b/src/main/java/freemarker/ext/dom/package.html
index d9239e4..3ca6134 100644
--- a/src/main/java/freemarker/ext/dom/package.html
+++ b/src/main/java/freemarker/ext/dom/package.html
@@ -23,7 +23,7 @@
 <body>
 
 <p>Exposes DOM XML nodes to templates as easily traversable trees;
-see <a href="http://freemarker.org/docs/xgui.html" target="_blank">in the Manual</a>.
+see <a href="http://freemarker.apache.org/docs/xgui.html" target="_blank">in the Manual</a>.
 The {@link freemarker.template.DefaultObjectWrapper default object wrapper} of FreeMarker
 automatically wraps W3C nodes with this.
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/main/java/freemarker/ext/servlet/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/package.html b/src/main/java/freemarker/ext/servlet/package.html
index 99f7e24..48b8685 100644
--- a/src/main/java/freemarker/ext/servlet/package.html
+++ b/src/main/java/freemarker/ext/servlet/package.html
@@ -20,6 +20,6 @@
 <body>
 <p>Servlet for legacy "Model 2" frameworks that allows using FreeMarker
 templates instead of JSP as the MVC View
-(see <a href="http://freemarker.org/docs/pgui_misc_servlet.html" target="_blank">in
the Manual</a>).</p>
+(see <a href="http://freemarker.apache.org/docs/pgui_misc_servlet.html" target="_blank">in
the Manual</a>).</p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Template.java b/src/main/java/freemarker/template/Template.java
index 240e527..9422014 100644
--- a/src/main/java/freemarker/template/Template.java
+++ b/src/main/java/freemarker/template/Template.java
@@ -383,7 +383,7 @@ public class Template extends Configurable {
     /**
      * Like {@link #process(Object, Writer)}, but also sets a (XML-)node to be recursively
processed by the template.
      * That node is accessed in the template with <tt>.node</tt>, <tt>#recurse</tt>,
etc. See the
-     * <a href="http://freemarker.org/docs/xgui_declarative.html" target="_blank">Declarative
XML Processing</a> as a
+     * <a href="http://freemarker.apache.org/docs/xgui_declarative.html" target="_blank">Declarative
XML Processing</a> as a
      * typical example of recursive node processing.
      * 
      * @param rootNode The root node for recursive processing or {@code null}.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/main/java/freemarker/template/TemplateNodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateNodeModel.java b/src/main/java/freemarker/template/TemplateNodeModel.java
index 684cdc9..fb76006 100644
--- a/src/main/java/freemarker/template/TemplateNodeModel.java
+++ b/src/main/java/freemarker/template/TemplateNodeModel.java
@@ -28,7 +28,7 @@ package freemarker.template;
  * design pattern (or simply through being able to get the parent
  * and child nodes).
  * 
- * <p>See the <a href="http://freemarker.org/docs/xgui.html" target="_blank">XML
+ * <p>See the <a href="http://freemarker.apache.org/docs/xgui.html" target="_blank">XML
  * Processing Guide</a> for a concrete application.
  *
  * @since FreeMarker 2.3

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/main/java/freemarker/template/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/package.html b/src/main/java/freemarker/template/package.html
index 3f622ec..c876541 100644
--- a/src/main/java/freemarker/template/package.html
+++ b/src/main/java/freemarker/template/package.html
@@ -22,6 +22,6 @@
 <body>
 <p><b>The fundamental, most commonly used API-s of FreeMarker;</b>
 start with {@link freemarker.template.Configuration Configuration} (see also the
-<a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a>
in the Manual.)</p>
+<a href="http://freemarker.apache.org/docs/pgui_quickstart.html" target="_blank">Getting
Stared</a> in the Manual.)</p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 4e25ad3..0a7372e 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -5332,9 +5332,9 @@ other@example.com, other@example.com, other@example.com</programlisting>
           FreeMarker 2.3.25), which means that they are only done when the
           imported library is actually used in the template. See the Java API
           documentation for more details: <link
-          xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setAutoImports-java.util.Map-">Configuration.setAutoImports</link>,
+          xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setAutoImports-java.util.Map-">Configuration.setAutoImports</link>,
           <link
-          xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setLazyAutoImports-java.lang.Boolean-">Configuration.setLazyAutoImports</link>.</para>
+          xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setLazyAutoImports-java.lang.Boolean-">Configuration.setLazyAutoImports</link>.</para>
         </section>
       </section>
 
@@ -7698,7 +7698,7 @@ public class RepeatDirective implements TemplateDirectiveModel {
               <para><literal>DefaultObjectWrapper</literal> has an
               <literal>incompatibleImprovements</literal> property, that's
               highly recommended to set it to a high value (see the <link
-              xlink:href="http://freemarker.org/docs/api/freemarker/template/DefaultObjectWrapper.html#DefaultObjectWrapper-freemarker.template.Version-">API
+              xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/DefaultObjectWrapper.html#DefaultObjectWrapper-freemarker.template.Version-">API
               documentation</link> for the effects). How to set it:</para>
 
               <itemizedlist>
@@ -8069,7 +8069,7 @@ cfg.setSharedVariable("company", "Foo Inc.");</programlisting>
         <literal>default_encoding</literal>,
         <literal>template_exception_handler</literal>. The full list of
         settings can be found in the <link
-        xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">Java
+        xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">Java
         API documentation of
         <literal>Configuration.setSetting(...)</literal></link>.</para>
 
@@ -8208,7 +8208,7 @@ myCfg.setObjectWrapper(owb.build());</programlisting>
             <literal>Confguration.setSetting(String name, String
             value)</literal> method; see available setting names and the
             format of the values in the <link
-            xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">API
+            xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">API
             documentation of <literal>setSetting</literal></link>. Example
for
             Spring Framework:</para>
 
@@ -10040,7 +10040,7 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp");</programlisting>
           that you are actually using. In older projects it's also usually
           better to keep this high, however you better check the changes
           activated (find them in <link
-          xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#Configuration-freemarker.template.Version-">the
+          xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#Configuration-freemarker.template.Version-">the
           API JavaDoc of the <literal>Configuration(Version)</literal>
           constructor</link>), at least if not only the 3rd version number
           (the micro version) of <quote>incompatible improvements</quote>
@@ -11280,7 +11280,7 @@ TemplateHashModel roundingModeEnums =
 
   &lt;!--
     Init-param documentation:
-    <link xlink:href="http://freemarker.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html</link>
+    <link xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html</link>
   --&gt;
 
   &lt;!-- FreemarkerServlet settings: --&gt;
@@ -28333,7 +28333,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
             <listitem>
               <para>New <literal>FreemarkerServlet</literal> init-params
(see
               <link
-              xlink:href="http://freemarker.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">the
+              xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">the
               <literal>FreemarkerSerlvet</literal> API documentation</link>
               for details):</para>
 
@@ -29515,7 +29515,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
                   <literal>ClasspathTlds</literal>
                   <literal>FreemarkerServlet</literal> init-params (see the
                   <link
-                  xlink:href="http://freemarker.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">Java
+                  xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">Java
                   API documentation of
                   <literal>FreemarkerServlet</literal></link> for the
                   description of these). For example, if you run your
@@ -29543,7 +29543,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
                   respectively. Thus one can adjust these in the Eclipse run
                   configuration without modifying the
                   <literal>web.xml</literal>. (See the <link
-                  xlink:href="http://freemarker.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">Java
+                  xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">Java
                   API documentation of
                   <literal>FreemarkerServlet</literal></link> for
                   more.)</para>
@@ -29913,7 +29913,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
                   of <literal>..</literal> after special steps like
                   <literal>.</literal> or <literal>*</literal>. See
the full
                   list of differences in the <link
-                  xlink:href="http://freemarker.org/docs/api/freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0">Java
+                  xlink:href="http://freemarker.apache.org/docs/api/freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0">Java
                   API documentation of
                   <literal>TemplateNameFormat.DEFAULT_2_4_0</literal></link>.</para>
                 </listitem>
@@ -31821,7 +31821,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
             <listitem>
               <para>If you set the
               <literal>incompatible_improvements</literal> setting (see <link
-              xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setIncompatibleImprovements%28freemarker.core.Version%29">here</link>)
+              xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setIncompatibleImprovements%28freemarker.core.Version%29">here</link>)
               to <literal>2.3.20</literal> or higher, <literal>?html</literal>
               will escape apostrophe-quotes just like
               <literal>?xhtml</literal> does. Utilizing this is highly

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/manual/zh_CN/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/zh_CN/book.xml b/src/manual/zh_CN/book.xml
index 59b19d4..405f4fd 100644
--- a/src/manual/zh_CN/book.xml
+++ b/src/manual/zh_CN/book.xml
@@ -4527,7 +4527,7 @@ jsmith@other.com, jsmith@other.com, jsmith@other.com</programlisting>
 
           <para>如果你已经为其他人员编写一个有用的,高质量的库,你也许想把它放在网络上
           (就像 <link 
-		  xlink:href="http://freemarker.org/libraries.html">http://freemarker.org/libraries.html</link>)。
+		  xlink:href="http://freemarker.apache.org/libraries.html">http://freemarker.apache.org/libraries.html</link>)。
 		  为了防止和其他作者使用库的命名相冲突,而且引入其他库时要书写简单,
 		  这有一个事实上的标准,那就是指定库路径的格式。这个标准是:
 		  库的路径必须对模板和其他库可用(可引用),就像这样:</para>
@@ -6068,7 +6068,7 @@ public class RepeatDirective implements TemplateDirectiveModel {
               <para><literal>DefaultObjectWrapper</literal> 有
               <literal>incompatibleImprovements</literal> 属性,
 			  这在 2.3.22 或更高版本中是极力推荐的(参看该效果的 <link
-              xlink:href="http://freemarker.org/docs/api/freemarker/template/DefaultObjectWrapper.html#DefaultObjectWrapper-freemarker.template.Version-">API文档</link>)。如何来设置:</para>
+              xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/DefaultObjectWrapper.html#DefaultObjectWrapper-freemarker.template.Version-">API文档</link>)。如何来设置:</para>
 
               <itemizedlist>
                 <listitem>
@@ -6408,7 +6408,7 @@ cfg.setSharedVariable("company", "Foo Inc.");</programlisting>
 		例如:<literal>locale</literal>,<literal>number_format</literal>,
 		<literal>default_encoding</literal>,
         <literal>template_exception_handler</literal>。可以参考 <link
-        xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">
+        xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">
 		<literal>Configuration.setSetting(...)</literal>的Java API 文档</link>
 		来查看配置设置的完整列表。</para>
 
@@ -6531,7 +6531,7 @@ myCfg.setDefaultEncoding("UTF-8");</programlisting>
 			在这种情况下,框架的作者大多数使用 <literal>Configuration</literal>

 			对象的 <literal>setSetting(String name, String value) </literal>方法。
 			这可以参考<link
-            xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-"><literal>setSetting</literal>的API文档</link>
+            xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-"><literal>setSetting</literal>的API文档</link>
 			部分来获取可用的设置名和参数的格式的信息。
 			而在Spring框架中,我们可以这样进行:</para>
 
@@ -7139,7 +7139,7 @@ c</programlisting>
 
           <para>在新项目中,应该将它设置为实际使用的FreeMarker版本号。
 		  而在老项目中,那么最好也将它设置的高一些,最好检查一下哪些修改是激活状态(可以在
<link
-          xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><literal>Configuration(Version)</literal>
+          xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><literal>Configuration(Version)</literal>
           构造方法的API JavaDoc文档</link> 中找到它们),至少不仅仅是

 		  <quote>不兼容改进</quote> 第三版本号(小版本)设置提高。通常来讲,
 		  只要为该设置增加最后的版本号,那么这些修改的风险就会小很多。</para>
@@ -9976,7 +9976,7 @@ Green Mouse</programlisting>
             <listitem>
               <para>如果程序员设置了FreeMarker(将 <literal>incompatible_improvements</literal>

 			  设置为 <literal>2.3.20</literal> 或更高;更多内容请参考 <link
-              xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setIncompatibleImprovements%28freemarker.core.Version%29">这里</link>),那么
+              xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setIncompatibleImprovements%28freemarker.core.Version%29">这里</link>),那么
 			  <literal>'</literal> 被替换为
               <literal>&amp;#39;</literal>。</para>
             </listitem>
@@ -21579,7 +21579,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
 				  <literal>MetaInfTldSources</literal> 和/或
                   <literal>ClasspathTlds</literal> (参考该内容描述的

                   <link
-                  xlink:href="http://freemarker.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">
+                  xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">
                   <literal>FreemarkerServlet</literal> Java API 文档 </link>
)。
 				  比如,如果从 Eclipse 中使用内嵌的 Servlet 容器来运行应用程序,
 				  那么标签库的jar文件不在标准的路径下,但是在和其它依赖一样的类路径下,
@@ -21601,7 +21601,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
                   <literal>org.freemarker.jsp.classpathTlds</literal> 上,
 				  或者被它们的值所替换。因此可以在 Eclipse 运行配置中来调整它们而不需要修改

 				  <literal>web.xml</literal>。(参考 <link
-                  xlink:href="http://freemarker.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">
+                  xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">
                   <literal>FreemarkerServlet</literal> 的 Java API 文档</link>
来获得更多内容)</para>
                 </listitem>
 
@@ -21906,7 +21906,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
                   <literal>classpath:foo/bar.ftl</literal> 中。它修复了很多遗留问题
                   (bugs),大多数都是和翻译特殊步骤之后的 <literal>..</literal>
相关,
 				  比如 <literal>.</literal> 或 <literal>*</literal>。请在
<link
-                  xlink:href="http://freemarker.org/docs/api/freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0">

+                  xlink:href="http://freemarker.apache.org/docs/api/freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0">
                   <literal>TemplateNameFormat.DEFAULT_2_4_0</literal>的 Java
API 文档</link> 
 				  中参考各种相异之处。</para>
                 </listitem>
@@ -23749,7 +23749,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
             <listitem>
               <para>If you set the
               <literal>incompatible_improvements</literal> setting (see <link
-              xlink:href="http://freemarker.org/docs/api/freemarker/template/Configuration.html#setIncompatibleImprovements%28freemarker.core.Version%29">here</link>)
+              xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setIncompatibleImprovements%28freemarker.core.Version%29">here</link>)
               to <literal>2.3.20</literal> or higher, <literal>?html</literal>
               will escape apostrophe-quotes just like
               <literal>?xhtml</literal> does. Utilizing this is highly

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc69b84c/src/manual/zh_CN/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/manual/zh_CN/docgen.cjson b/src/manual/zh_CN/docgen.cjson
index ecff859..9963f45 100644
--- a/src/manual/zh_CN/docgen.cjson
+++ b/src/manual/zh_CN/docgen.cjson
@@ -17,7 +17,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-deployUrl: "http://freemarker.org/docs/"
+deployUrl: "http://freemarker.apache.org/docs/"
 onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
 searchKey: "014728049242975963158:8awjt03uofm"
 validation: {
@@ -47,21 +47,21 @@ seoMeta: {
 }
 
 logo: {
-  href: "http://freemarker.org"
+  href: "http://freemarker.apache.org"
   src: logo.png,
   alt: "FreeMarker"
 }
 
 olinks: {
-  homepage: "http://freemarker.org/"
+  homepage: "http://freemarker.apache.org/"
   api: "api/index.html"
   
   // Homepage links:
-  freemarkerdownload: "http://freemarker.org/freemarkerdownload.html"
-  contribute: "http://freemarker.org/contribute.html"
-  history: "http://freemarker.org/history.html"
-  what-is-freemarker: "http://freemarker.org/"
-  mailing-lists: "http://freemarker.org/mailing-lists.html"
+  freemarkerdownload: "http://freemarker.apache.org/freemarkerdownload.html"
+  contribute: "http://freemarker.apache.org/contribute.html"
+  history: "http://freemarker.apache.org/history.html"
+  what-is-freemarker: "http://freemarker.apache.org/"
+  mailing-lists: "http://freemarker.apache.org/mailing-lists.html"
   
   // External URL-s:
   onlineTemplateTester: "http://freemarker-online.kenshoo.com/"


Mime
View raw message