[Checkins] SVN: zope2docs/trunk/zope2book/ - Fix broken figure markup
Jens Vagelpohl
jens at dataflake.org
Sun May 16 08:06:01 EDT 2010
Log message for revision 112346:
- Fix broken figure markup
(https://bugs.launchpad.net/zope2/+bug/435129)
Changed:
U zope2docs/trunk/zope2book/BasicScripting.rst
U zope2docs/trunk/zope2book/ExternalTools.rst
U zope2docs/trunk/zope2book/Figures/zoo.png
U zope2docs/trunk/zope2book/MaintainingZope.rst
U zope2docs/trunk/zope2book/ZEO.rst
-=-
Modified: zope2docs/trunk/zope2book/BasicScripting.rst
===================================================================
--- zope2docs/trunk/zope2book/BasicScripting.rst 2010-05-16 08:10:20 UTC (rev 112345)
+++ zope2docs/trunk/zope2book/BasicScripting.rst 2010-05-16 12:06:01 UTC (rev 112346)
@@ -99,8 +99,10 @@
For example, suppose you have a collection of objects and methods, as shown in
the figure below.
-`A collection of objects and methods <img:9-1:Figures/zoo.png>`_
+.. figure:: Figures/zoo.png
+ A collection of objects and methods
+
To call the *feed* method on the *hippo* object, you would visit the URL::
Zoo/LargeAnimals/hippo/feed
@@ -249,13 +251,17 @@
The script should return a result similar to the following image:
-`Script editing view <img:9-2:Figures/8-5.png>`_
+.. figure:: Figures/8-5.png
+ Script editing view
+
You can now test the script by going to the *Test* tab, as shown in the
following figure.
-`Testing a Script <img:9-3:Figures/8-6.png>`_
+.. figure:: Figures/8-6.png
+ Testing a script
+
Leave the *name* field blank, and click the *Run Script* button. Zope should
return "Hello World." Now go back and try entering your name in the *Value*
field, and clicking the *Run Script* button. Zope should now say "hello" to
@@ -552,8 +558,10 @@
actions that can be called on Zope objects. You can examine the Zope API in the
help system, as shown in the figure below.
-`Zope API Documentation <img:9-4:Figures/8-4.png>`_
+.. figure:: Figures/8-4.png
+ Zope API Documentation
+
Suppose you would like a script that takes a file you upload from a form, and
creates a Zope File object in a Folder. To do this, you'd need to know a number
of Zope API actions. It's easy enough to read files in Python, but once you
Modified: zope2docs/trunk/zope2book/ExternalTools.rst
===================================================================
--- zope2docs/trunk/zope2book/ExternalTools.rst 2010-05-16 08:10:20 UTC (rev 112345)
+++ zope2docs/trunk/zope2book/ExternalTools.rst 2010-05-16 12:06:01 UTC (rev 112346)
@@ -163,8 +163,10 @@
correspond exactly to what your root Zope folder looks like through the web, as
shown in the figure below.
-`Viewing the Zope object hierarchy through FTP <img:5-1:Figures/3-3.png>`_
+.. figure:: Figures/3-3.png
+ Viewing the Zope object hierarchy through FTP
+
Transferring files to and from Zope is straightforward when using WS_FTP. On
the left-hand side of the WS_FTP window is a file selection box that represents
files on your local machine.
@@ -197,8 +199,10 @@
or Midnight Commander (a popular menu based file manager), as shown in the
figure below.
-`Viewing the Zope object hierarchy with Konqueror <img:5-2:Figures/konq.png>`_
+.. figure:: Figures/konq.png
+ Viewing the Zope object hierarchy with Konqueror
+
We can also edit, create or delete some known Zope objects like folder or ZPT.
For instance, to edit a file-like object, right click > Open With > Choose
Application > Kate. You can start editing away. Kate will do the necessary when
@@ -219,8 +223,10 @@
You can then create new Folders and transfer files between Zope and your
desktop, as shown in the figure below.
-`Viewing the Zope object hierarchy with IE <img:5-3:Figures/ie.png>`_
+.. figure:: Figures/ie.png
+ Viewing the Zope object hierarchy with IE
+
Remote Editing with FTP/DAV-Aware Editors
+++++++++++++++++++++++++++++++++++++++++
@@ -258,8 +264,10 @@
directory contents of the root folder will look a little like the picture
below:
-`Viewing the Zope Root Folder via ange-ftp <img:5-2:Figures/emacsftp.png>`_
+.. figure:: Figures/emacsftp.png
+ Viewing the Zope Root Folder via ange-ftp
+
You can visit any of these "files" (which are really Zope objects) by selecting
them in the usual Emacs way: enter to select, modify the file, Ctrl-X S to
save, etc. You can even create new "files" by visiting a file via "Ctrl-X
@@ -305,8 +313,10 @@
Once selected, you can edit to your heart's content, and click "File" > "Save"
when done. Kate will save your edit to your zope server.
-`Viewing the Zope Root Folder via Kate/KDE desktop <img:5-2:Figures/kateftp.png>`_
+.. figure:: Figures/kateftp.png
+ Viewing the Zope Root Folder via Kate/KDE desktop
+
With KDE, you can also mount zope onto your dialog box. To do that:
- click "File" > "Open".
@@ -323,9 +333,11 @@
Now, you can edit zope objects in a single click.
-`Zope root exposed to KDE desktop <img:5-2:Figures/kdeopen.png>`_
+.. figure:: Figures/kdeopen.png
+ Zope root exposed to KDE desktop
+
Editing Zope Objects with WebDAV
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -448,9 +460,11 @@
- start editing when konqueror presents the Zope workspace.
-`Viewing the Zope object hierarchy with konquerorWebDAV <img:Figures/webdavkonq.png>`_
+.. figure:: Figures/webdavkonq.png
+ Viewing the Zope object hierarchy with konquerorWebDAV
+
Using Kate:
- Open Kate
@@ -465,9 +479,11 @@
- Browse for your file or start editing.
-`Kate Open File dialog box WebDAV <img:Figures/webdavkate.png>`_
+.. figure:: Figures/webdavkate.png
+ Kate Open File dialog box WebDAV
+
Other Integration Facilities
============================
Modified: zope2docs/trunk/zope2book/Figures/zoo.png
===================================================================
(Binary files differ)
Modified: zope2docs/trunk/zope2book/MaintainingZope.rst
===================================================================
--- zope2docs/trunk/zope2book/MaintainingZope.rst 2010-05-16 08:10:20 UTC (rev 112345)
+++ zope2docs/trunk/zope2book/MaintainingZope.rst 2010-05-16 12:06:01 UTC (rev 112346)
@@ -336,8 +336,7 @@
++++++++++++++
The most important is the database cache setting. To adjust these settings,
-visit the Control Panel and click on the *Database* link.`Database Cache
-settings <img:23-1:Figures/dbcache.png>`_
+visit the Control Panel and click on the *Database* link.
There are usually seven database connections to the internal Zope database (see
*Database Connections* below for information about how to change the number of
Modified: zope2docs/trunk/zope2book/ZEO.rst
===================================================================
--- zope2docs/trunk/zope2book/ZEO.rst 2010-05-16 08:10:20 UTC (rev 112345)
+++ zope2docs/trunk/zope2book/ZEO.rst 2010-05-16 12:06:01 UTC (rev 112346)
@@ -59,8 +59,10 @@
computers in the diagram below) are the *ZEO Clients*. All of the clients
connect to one, central *ZEO Storage Server*, as shown in the image below.
-`Simple ZEO illustration <img:20-1:Figures/11-1.png>`_
+.. figure:: Figures/11-1.png
+ Simple ZEO illustration
+
The terminology may be a bit confusing. Typically, you may think of Zope as a
server, not a client. But when using ZEO, your Zope processes act as both
servers (for web requests) and clients (for data from the ZEO server).
@@ -262,8 +264,10 @@
"mirror". On each line of this property, put the URL to your various ZEO
clients, as shown in the figure below.
-`Figure of property with URLs to mirrors <img:20-2:Figures/11-2.png>`_
+.. figure:: Figures/11-2.png
+ Figure of property with URLs to mirrors
+
Now, add some simple TAL code to your site to display a list of your mirrors::
<h2>Please choose from the following mirrors:
@@ -320,8 +324,10 @@
The simplest method for load-balancing is to use round-robin DNS, as
illustrated in the figure below.
-`Load balancing with round-robin DNS. <img:20-3:Figures/11-3.png>`_
+.. figure:: Figures/11-3.png
+ Load balancing with round-robin DNS
+
When *www.zopezoo.org* gets resolved, DNS answers with the address of either
*zeoclient1*, *zeoclient2*, or *zeoclient3* - but in a rotated order every
time. For example, one user may resolve *www.zopezoo.org* and get the address
@@ -366,8 +372,10 @@
chooses from a group of ZEO clients whenever a request comes in, as shown in
the figure below.
-`Illustration of Layer 4 switching <img:20-4:Figures/11-4.png>`_
+.. figure:: Figures/11-4.png
+ Illustration of Layer 4 switching
+
There are hardware and software Layer 4 switches. There are a number of
software solutions, but one in general that stands out is the *Linux Virtual
Server* (LVS). This is an extension to the free Linux operating system that
@@ -457,8 +465,10 @@
For example, a plain, stand-alone Zope system can be illustrated in the figure
below.
-`Zope connected to a filestorage <img:20-5:Figures/11-5.png>`_
+.. figure:: Figures/11-5.png
+ Zope connected to a filestorage
+
You can see there is one Zope application which plugs into a *FileStorage*.
This storage, as its name implies, saves all of its information to a file on
the computer's filesystem.
@@ -466,8 +476,10 @@
When using ZEO, you simple replace the FileStorage with a *ClientStorage*, as
illustrated in the figure below.
-`Zope with a Client Storage and Storage server <img:20-6:Figures/11-6.png>`_
+.. figure:: Figures/11-6.png
+ Zope with a Client Storage and Storage server
+
Instead of saving objects to a file, a ClientStorage sends objects over a
network connection to a *Storage Server*. As you can see in the illustration,
the Storage Server uses a FileStorage to save that information to a file on the
More information about the checkins
mailing list