You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by mx...@apache.org on 2019/01/05 18:32:39 UTC
[tcl-rivet] branch master updated: fix broken links in manual pages
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
The following commit(s) were added to refs/heads/master by this push:
new 724be29 fix broken links in manual pages
724be29 is described below
commit 724be29b146b76e17c83a820cebbba2978d1f482
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Sat Jan 5 19:32:28 2019 +0100
fix broken links in manual pages
---
ChangeLog | 4 ++++
doc/rivet.xml.in | 45 ++++++++++++++++++++++++---------------------
doc/xml/installation.xml | 16 ++++++++--------
doc/xml/intro.xml | 23 +++++++++++------------
4 files changed, 47 insertions(+), 41 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 16e90c8..d76c670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-05 Massimo Manghi <mx...@apache.org>
+ * doc/: merging from 3.1 fixes to various broken docbook elements
+ and new entities to external resources' URLs
+
2018-12-24 Georgios Petasis <pe...@apache.org>
* README.md: Added badges also for the GitHub fork at:
https://github.com/petasis/tcl-rivet.
diff --git a/doc/rivet.xml.in b/doc/rivet.xml.in
index df066b6..2772fab 100644
--- a/doc/rivet.xml.in
+++ b/doc/rivet.xml.in
@@ -35,40 +35,43 @@
<!ENTITY asciiglyphs.xml SYSTEM "xml/asciiglyphs.xml" >
<!ENTITY lazybridge.xml SYSTEM "xml/lazybridge.xml" >
<!ENTITY formbroker.xml SYSTEM "xml/formbroker.xml" >
- <!ENTITY version "@INIT_VERSION@" >
+ <!ENTITY version "@INIT_VERSION@" >
<!ENTITY fullversion "@PACKAGE_VERSION@" >
- <!ENTITY version2-series "2.0,2.1,2.2,2.3" >
- <!ENTITY version2-generic "2.x" >
- <!ENTITY version30 "3.0" >
- <!ENTITY version31 "3.1" >
+ <!ENTITY version2-series "2.0,2.1,2.2,2.3" >
+ <!ENTITY version2-generic "2.x" >
+ <!ENTITY version30 "3.0" >
+ <!ENTITY version31 "3.1" >
<!ENTITY tcltk-url "http://www.tcl.tk/" >
<!ENTITY apache-url "http://httpd.apache.org" >
+ <!ENTITY apache-apr "http://apr.apache.org/" >
+ <!ENTITY apache-apreq "http://httpd.apache.org/apreq/" >
+ <!ENTITY rivet-download "http://tcl.apache.org/rivet/html/download.html" >
<!ENTITY apachedoc-vhost "https://httpd.apache.org/docs/2.4/vhosts" >
- <!ENTITY apachedoc-mpm "https://httpd.apache.org/docs/2.4/mpm.html" >
- <!ENTITY apachedoc-prefork "https://httpd.apache.org/docs/2.4/mod/prefork.html" >
- <!ENTITY apachedoc-worker "https://httpd.apache.org/docs/2.4/mod/worker.html" >
- <!ENTITY apachedoc-event "https://httpd.apache.org/docs/2.4/mod/event.html" >
- <!ENTITY apachedoc-winnt "https://httpd.apache.org/docs/2.4/mod/mpm_winnt.html" >
+ <!ENTITY apachedoc-mpm "https://httpd.apache.org/docs/2.4/mpm.html" >
+ <!ENTITY apachedoc-prefork "https://httpd.apache.org/docs/2.4/mod/prefork.html" >
+ <!ENTITY apachedoc-worker "https://httpd.apache.org/docs/2.4/mod/worker.html" >
+ <!ENTITY apachedoc-event "https://httpd.apache.org/docs/2.4/mod/event.html" >
+ <!ENTITY apachedoc-winnt "https://httpd.apache.org/docs/2.4/mod/mpm_winnt.html" >
<!ENTITY apachedoc-docroot "https://httpd.apache.org/docs/2.4/mod/core.html#documentroot" >
- <!ENTITY apachedoc-alias "https://httpd.apache.org/docs/2.4/mod/mod_alias.html" >
+ <!ENTITY apachedoc-alias "https://httpd.apache.org/docs/2.4/mod/mod_alias.html" >
<!ENTITY apachedoc-rewrite "https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html" >
<!ENTITY apachedoc-perftuning "https://httpd.apache.org/docs/2.4/misc/perf-tuning.html" >
]>
<!--
- Copyright 2002-2005 The Apache Software Foundation
+ Copyright 2002-2019 The Apache Tcl Team
- Licensed under the Apache License, Version 2.0 (the "License"); you
- may not use this file except in compliance with the License. You
- may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<article>
diff --git a/doc/xml/installation.xml b/doc/xml/installation.xml
index 08503af..861a2a5 100644
--- a/doc/xml/installation.xml
+++ b/doc/xml/installation.xml
@@ -11,7 +11,7 @@
</para>
<para>
Rivet &version2-generic; was restricted to work with the
- <ulink url="http://httpd.apache.org/docs/2.4/mod/prefork.html">prefork</ulink> MPM
+ <ulink url="&apachedoc-prefork;">prefork</ulink> MPM
of the Apache HTTP webserver. MPM modules are fundamental components of the
webserver architecture. They provide multiple implementations of multiprocessing
in order to better suit specific OS features and scalability requirements.
@@ -21,13 +21,13 @@
system call. This model has several limitations but also some advantages. The
solution we adopted tries to attain the best from any MPM as much as possible
and Rivet &version; is now able to run with the
- <ulink url="http://httpd.apache.org/docs/2.4/mod/worker.html">worker</ulink>
+ <ulink url="&apachedoc-worker;">worker</ulink>
and the
- <ulink url="http://httpd.apache.org/docs/2.4/mod/event.html">event</ulink>
+ <ulink url="&apachedoc-event;">event</ulink>
MPMs. Rivet &version; has not been ported to OS of the Windows family
but we feel that the current design would fit just fine with the Windows specific
MPMs such as
- <ulink url="http://httpd.apache.org/docs/2.4/mod/mpm_winnt.html">winnt</ulink>.
+ <ulink url="&apachedoc-winnt;">winnt</ulink>.
</para>
<para>
@@ -57,11 +57,11 @@
</para>
<para>
The
- <ulink url="http://httpd.apache.org/">Apache HTTP Webserver</ulink> development
+ <ulink url="&apache-url;">Apache HTTP Webserver</ulink> development
files and libraries are required along with the
- <ulink url="http://apr.apache.org/">Apache Portable Runtime</ulink>
+ <ulink url="&apache-apr;">Apache Portable Runtime</ulink>
and the
- <ulink url="http://httpd.apache.org/apreq/">libapreq</ulink> library.
+ <ulink url="&apache-apreq;">libapreq</ulink> library.
</para>
</step>
@@ -88,7 +88,7 @@
<step>
<title>Uncompress Sources</title>
<para>
- Download the sources at <ulink url="http://tcl.apache.org/rivet/html/download.html"/>.
+ Download the sources at <ulink url="&rivet-download;"/>.
</para>
<para>
diff --git a/doc/xml/intro.xml b/doc/xml/intro.xml
index 447c144..b1cdc4d 100644
--- a/doc/xml/intro.xml
+++ b/doc/xml/intro.xml
@@ -1,4 +1,4 @@
- <section id="introduction">
+<section id="introduction">
<title>Introduction to Apache Rivet version &version;</title>
<para>
Apache Rivet is a system for creating dynamic web content by
@@ -18,27 +18,26 @@
architecture to create different styles of web site.
</para>
<para>
- This documentation is focused on the current version of Rivet, but
- still a work in progress, and, like everything
- else about Apache Rivet, it is Free Software. If you see
- something that needs improving, and have ideas or suggestions,
- don't hesitate to let us know. If you want to contribute
- directly, better yet!
+ This documentation is focused on the current version of Rivet, but
+ still a work in progress, and, like everything
+ else about Apache Rivet, it is Free Software. If you see
+ something that needs improving, and have ideas or suggestions,
+ don't hesitate to let us know. If you want to contribute
+ directly, better yet!
</para>
-
<simplesect>
- <!-- title>Introduction</title -->
<title>Apache MPM and Rivet Bridge Modules</title>
<para>
Rivet &version; is a successor to Rivet &version30;, a major rewriting of mod_rivet,
the Apache HTTP Websever module at the core of Rivet. Unlike in &version2-generic; of
- mod_rivet, which only supported the <ulink href="&apachedoc-prefork;">prefork MPM</ulink>
- (<ulink href="&apachedoc-mpm;">Multiprocessing Module</ulink>),
+ mod_rivet, which only supported the
+ <ulink url="&apachedoc-prefork;">prefork MPM</ulink>
+ (<ulink url="&apachedoc-mpm;">Multiprocessing Module</ulink>),
starting with &version30; we attained full support of different MPM for
the Apache framework.
</para>
<para>
- Threaded <ulink href="&apachedoc-mpm;">MPM</ulink>
+ Threaded <ulink url="&apachedoc-mpm;">MPM</ulink>
integration was achieved by making mod_rivet multithreaded and
modular itself, introducing the MPM-module bridge concept.
We developed a set of loadable modules which are supposed not only to overcome
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org