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.riehem...@coremedia.com> Authored: Thu Nov 9 19:13:45 2017 +0100 Committer: Michael Riehemann <michael.riehem...@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 "template engine"; 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 @@ ot...@example.com, ot...@example.com, ot...@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 = <!-- 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> --> <!-- FreemarkerServlet settings: --> @@ -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 @@ jsm...@other.com, jsm...@other.com, jsm...@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>&#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/";
