[Checkins] SVN: zope2book/trunk/ Integrated corrections made by Jo (sent privately to mcdonc)

Hanno Schlichting plone at hannosch.info
Tue Feb 10 10:13:52 EST 2009


Log message for revision 96388:
  Integrated corrections made by Jo (sent privately to mcdonc)
  

Changed:
  U   zope2book/trunk/AdvDTML.stx
  U   zope2book/trunk/AppendixA.stx
  U   zope2book/trunk/AppendixD.stx
  U   zope2book/trunk/DTML.stx
  U   zope2book/trunk/InstallingZope.stx
  U   zope2book/trunk/ObjectOrientation.stx
  U   zope2book/trunk/SearchingZCatalog.stx
  U   zope2book/trunk/Security.stx
  U   zope2book/trunk/UsingZope.stx
  U   zope2book/trunk/XML.stx
  U   zope2book/trunk/ZEO.stx
  U   zope2book/trunk/ZopeServices.stx
  U   zope2book/trunk/source/Contributions.rst
  U   zope2book/trunk/source/IntroducingZope.rst
  U   zope2book/trunk/source/ZopeArchitecture.rst

-=-
Modified: zope2book/trunk/AdvDTML.stx
===================================================================
--- zope2book/trunk/AdvDTML.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/AdvDTML.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -696,7 +696,7 @@
     to be present in all Zope installations and perform the most
     common kinds of things. However, it is also possible to add new
     tags to a Zope installation. Instructions for doing this are
-    provided at the Zope.org web site, along with an interesting set
+    provided at the Zope.org website, along with an interesting set
     of contributed DTML tags.
 
     This section covers what could be referred to as Zope

Modified: zope2book/trunk/AppendixA.stx
===================================================================
--- zope2book/trunk/AppendixA.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/AppendixA.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -1580,7 +1580,7 @@
         structured-text -- Formats the variable as Structured Text. For
         more information on Structured Text see "Structured Text
         How-To":http://www.zope.org/Members/millejoh/structuredText on
-        the Zope.org web site.
+        the Zope.org website.
 
       null=string -- A default value to use if the variable is None.
 

Modified: zope2book/trunk/AppendixD.stx
===================================================================
--- zope2book/trunk/AppendixD.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/AppendixD.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -7,7 +7,7 @@
 
   Zope Web Sites
 
-    "Zope.org":http://www.zope.org is the official Zope web site. It
+    "Zope.org":http://www.zope.org is the official Zope website. It
     has downloads, documentation, news, and lots of community
     resources.
 
@@ -24,7 +24,7 @@
 
     "Zope Newbies":http://www.zopenewbies.net/ is a
     weblog that features Zope news and related information. Zope
-    Newbies is one of the oldest and best Zope web sites. Jeff Shelton
+    Newbies is one of the oldest and best Zope websites. Jeff Shelton
     started Zope Newbies, and the site is currently run by Luke
     Tymowski.
 
@@ -55,7 +55,7 @@
     contributed community documentation.
 
     "ZopeWiki - A wiki for the Zope community":http://zopewiki.org/ is a
-    community-run Zope documentation web site set up by Simon Michael, 
+    community-run Zope documentation website set up by Simon Michael, 
     author of the famus ZWiki wiki product for Zope.
 
     "Zope Developer's Guide":http://www.zope.org/DocProjects/DevGuide

Modified: zope2book/trunk/DTML.stx
===================================================================
--- zope2book/trunk/DTML.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/DTML.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -787,7 +787,7 @@
     'standard_html_footer', providing it with local content as well.
 
     Using this pattern you can quickly change the look and feel of
-    different parts of your web site. If you later decide that an area
+    different parts of your website. If you later decide that an area
     of the site needs a different header, just create one. You don't
     have to change the DTML in any of the web pages; they'll
     automatically find the closest header and use it.
@@ -826,7 +826,7 @@
     expression must be a combination of values, variables, and Python
     *operators*.  To find out more about Python's expression syntax,
     see the "Python Tutorial":http://www.python.org/doc/current/tut at
-    the Python.org web site.  For more information specifically about
+    the Python.org website.  For more information specifically about
     the differences between Python expressions and statements, see the
     "Variables, expressions, and
     statements"::http://www.ibiblio.org/obp/thinkCSpy/chap02.htm

Modified: zope2book/trunk/InstallingZope.stx
===================================================================
--- zope2book/trunk/InstallingZope.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/InstallingZope.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -24,7 +24,7 @@
     As a general rule of thumb: if
     "Python":http://www.python.org is available for your
     operating system, and if you have a C compiler and associated
-    development utilities, then it id highly likely that you will be able to  compile Zope.
+    development utilities, then it is highly likely that you will be able to compile Zope.
     A notable exception is Mac OS between versions 7 through 9, as Zope does not run at all on these platforms.
     
     Various binary Zope packages exist that are not distributed
@@ -424,7 +424,7 @@
     
     Start a web browser on the same machine on which you installed
     Zope, and browse to the URL "http://localhost:8080/":http://localhost:8080/.
-    If your Zope instance has beens properly installed, and you're visiting the correct URL,
+    If your Zope instance has beens installed properly, and you're visiting the correct URL,
     you will be presented with the Zope "QuickStart" screen.
     
       "Zope QuickStart":img:2-8:Figures/quickstart.png
@@ -474,7 +474,7 @@
     Clicking *Restart* will cause Zope to shut down and
     then immediately start back up again.  It may take Zope a few
     seconds to come back up and start handling requests.  You
-    needn't shut your web browser down and restart it to resume
+    don't need to shut your web browser down and restart it to resume
     using Zope after pressing *Restart*, as the page refreshes automatically; 
     just wait for the Control Panel display to reappear.
     
@@ -489,7 +489,7 @@
     
   Controlling the Zope Process from the Command Line
   
-    To stop a manually-run Zope on Windows, press "Ctrl+C" while
+    To stop a manually-run Zope on Windows, press "Ctrl+C" while in
     the console window under which Zope is running is selected.
     To stop a Zope on Windows that was run as a service, find
     the service with the name you assigned to your Zope
@@ -630,7 +630,7 @@
         Let us assume that our HTTP Server's 'address' directive
         is set to 8080, as in our example above, and
         'port-base' is specified as 1000. The port on which the
-        HTTP server will listen be the 'address' value of 8080, plus the 
+        HTTP server will listen, will be the 'address' value of 8080, plus the 
         'port-base' offset value of 1000, or 9080.  Assuming the
         FTP server's 'address' directive is set to 8021, the FTP
         Server will then listen on port 9021, and so on.
@@ -661,9 +661,9 @@
       Switch the User the Zope process runs as: 'effective-user'
 
         This directive causes Zope to setuid(2) to the specified
-        user when run as root on a UNIX system.  This method boosts 
-        system security, as a compromised Zope instance would not lend itself to 
-        enable an attacked to easily damage an entire system.  One motivation 
+        user when run as root on a UNIX system.  This method boosts
+        system security, as a compromised Zope instance would not lend itself to
+        enable a compromised user to easily damage an entire system.  One motivation 
         for running Zope as root in the first place is to be able to
         bind to *privileged* ports, or ports with values below 1024.
         

Modified: zope2book/trunk/ObjectOrientation.stx
===================================================================
--- zope2book/trunk/ObjectOrientation.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/ObjectOrientation.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -70,7 +70,7 @@
 
     When a subclass inherits behavior from another class, it doesn't need to sit idly by and accept all the method definitions of its superclass if they don't suit its needs: if necessary, the subclass can *override* the method definitions of its superclass.  For instance, we may want our ContractedEmployee class to return a different "title" than instances of our Employee class.  In our ContractedEmployee class, we might cause the 'getTitle' method of the Employee class to be *overridden* by creating a method within ContractedEmployee with a different implementation.  For example, it may always return "Contractor" instead of a job-specific title.
 
-    Inheritance is used extensively in Zope objects.  For example, the Zope "Image" class inherits its behavior from the Zope "File" class, since images are really just another kind of file, and both classes share many behavior requirements.  But the "Image" class adds a bit of behavior that allows it to "render itself inline" by printing its content within HTML tag, instead of causing a file download.  It does this by *overriding* the 'index_html' method of the File class.
+    Inheritance is used extensively in Zope objects.  For example, the Zope "Image" class inherits its behavior from the Zope "File" class, since images are really just another kind of file, and both classes share many behavior requirements.  But the "Image" class adds a bit of behavior that allows it to "render itself inline" by printing its content within HTML tags, instead of causing a file download.  It does this by *overriding* the 'index_html' method of the File class.
 
   Object Lifetimes
 

Modified: zope2book/trunk/SearchingZCatalog.stx
===================================================================
--- zope2book/trunk/SearchingZCatalog.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/SearchingZCatalog.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -1314,7 +1314,7 @@
     they also have specific properties that make them news items.
     Often these Items come in collections that have their own
     properties.  You want to build a News site that collects News
-    Items, reviews them, and posts them online to a web site where
+    Items, reviews them, and posts them online to a website where
     readers can read them.
 
     In this kind of system, you may want to create a new type of

Modified: zope2book/trunk/Security.stx
===================================================================
--- zope2book/trunk/Security.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/Security.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -43,7 +43,7 @@
     is not possible to control a user's resource consumption with any
     true measure of success within Zope), but it is possible to delegate
     these capabilities to "semi-trusted" users in order to decentralize
-    control of a web site, allowing it to grow faster and require less
+    control of a website, allowing it to grow faster and require less
     oversight from a central source.
 
     In this chapter we will look more closely at administering users,
@@ -412,7 +412,7 @@
       perhaps you want to use other tools to maintain your account
       information. Zope allows you to use alternate sources of data as
       user information repositories. You can find an ever-growing list
-      of alternate user folders at the "Zope web site Products
+      of alternate user folders at the "Zope website Products
       area":http://www.zope.org/Products/user_management. Some of the 
       more popular alternative user folders are available here.
 
@@ -1006,7 +1006,7 @@
       multi-level marketing sales. Then he can create a user folder in
       the multi-level marketing sales folder to delegate control of
       this folder to the multi-level marketing sales manager. And so
-      on. This allows you to create web sites managed by thousands of
+      on. This allows you to create websites managed by thousands of
       people without centralized control.  Higher level managers need
       not concern themselves too much with what their underlings
       do. If they choose they can pay close attention, but they can
@@ -1025,7 +1025,7 @@
       users and set security policies for them.
 
       Before creating new roles make sure that you really need
-      them. Suppose that you have a web site that publishes
+      them. Suppose that you have a website that publishes
       articles. The public reads articles and managers edit and publish
       articles, but there is a third class of user who can author
       articles, but not publish or edit them.

Modified: zope2book/trunk/UsingZope.stx
===================================================================
--- zope2book/trunk/UsingZope.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/UsingZope.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -84,7 +84,7 @@
 
       "The Workspace Frame":img:3-2:Figures/workspace.jpg
 
-    A series of tabs is displayed cross the top of the screen. The
+    A series of tabs is displayed across the top of the screen. The
     tab that is currently active is highlighted in a lighter color.  Each tab takes you
     to a different *view* of the current object, and each view lets you
     perform a different management function on that object.
@@ -180,7 +180,7 @@
     When you use Zope, you create new objects by following these
     steps:
 
-      1. Enter to the folder where you want to add a new object.
+      1. Enter the folder where you want to add a new object.
 
       2. Choose the type of object you want to add from the add list.
 
@@ -489,7 +489,7 @@
     *Products* installed.  If an import fails, it's likely that you
     don't have the same Products installed in your importing Zope as the
     Products installed in the Zope from whence the export file came.
-    Our example above works because we are exporting an Folder object, which
+    Our example above works because we are exporting a Folder object, which
     is a common, core object type for all Zopes. If you have trouble 
     importing any given exported Zope file, check with the distributor of the exported file to see what Products are necessary for proper import.
 
@@ -577,7 +577,7 @@
 
     The help system has an organization similar to the two primary
     panes of the Zope management interface: it has one frame for
-    navigation, and frame one for displaying the contents of the 
+    navigation, and one frame for displaying the contents of the 
     help system related to the current management screen.
 
   Browsing and Searching Help 

Modified: zope2book/trunk/XML.stx
===================================================================
--- zope2book/trunk/XML.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/XML.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -820,7 +820,7 @@
 
     This is an actual RSS file create using DTML on the
     *www.zope.org*
-    web site. It is built from a catalog query of news items. The main
+    website. It is built from a catalog query of news items. The main
     features of an RSS file are the *channel* and *item*
     elements. The *channel* element contains information about the
     news source and also contains the *items* elements. Each *item*

Modified: zope2book/trunk/ZEO.stx
===================================================================
--- zope2book/trunk/ZEO.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/ZEO.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -394,7 +394,7 @@
       is the *Linux Virtual Server* (LVS).  This is an extension to
       the free Linux operating system that lets you turn a Linux
       computer into a Layer 4 switch.  More information on the LVS can
-      be found on "its web site":http://www.linuxvirtualserver.org.
+      be found on "its website":http://www.linuxvirtualserver.org.
 
       There are also a number of hardware solutions that claim higher
       performance than software based solutions like LVS.  Cisco
@@ -629,6 +629,6 @@
 
     ZEO is not a "magic bullet" solution, and like other system
     designed to work with many computers, it adds another level of
-    complexity to your web site.  This complexity pays off however
+    complexity to your website.  This complexity pays off however
     when you need to serve up lots of dynamic content to your
     audience.

Modified: zope2book/trunk/ZopeServices.stx
===================================================================
--- zope2book/trunk/ZopeServices.stx	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/ZopeServices.stx	2009-02-10 15:13:52 UTC (rev 96388)
@@ -301,10 +301,10 @@
     done to show the cached copy of the page, many more users could
     see the main page.  If it takes, for example, 10 milliseconds to
     show a cached page, then this page is being served *50 times
-    faster* to your web site visitors.  The actual performance of the
+    faster* to your website visitors.  The actual performance of the
     cache and Zope depends a lot on your computer and your
     application, but this example gives you an idea of how caching can
-    speed up your web site quite a bit.  There are some disadvantages
+    speed up your website quite a bit.  There are some disadvantages
     to caching however:
 
       Cache lifetime -- If pages are cached for a long time, they may

Modified: zope2book/trunk/source/Contributions.rst
===================================================================
--- zope2book/trunk/source/Contributions.rst	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/source/Contributions.rst	2009-02-10 15:13:52 UTC (rev 96388)
@@ -55,6 +55,8 @@
 helped with the conversion of the text from ``Structured Text``
 to ``ReStructured Text``.
 
+Jo <jo at winfix dot it> has contributed a number of spelling corrections.
+
 Anyone who added a comment to the online BackTalk edition of the
 first online edition of this book contributed greatly.  Thank you!
 

Modified: zope2book/trunk/source/IntroducingZope.rst
===================================================================
--- zope2book/trunk/source/IntroducingZope.rst	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/source/IntroducingZope.rst	2009-02-10 15:13:52 UTC (rev 96388)
@@ -37,10 +37,9 @@
 The Static Web Site Dilemma
 ---------------------------
 
-When a company or organization goes through the process of
-developing and eventually deploying a website, one its most
-important goals is to present timely and
-up-to-date information to its website visitors.
+When a company or organization goes through the process of developing and
+eventually deploying a website, one of its most important goals is to
+present timely and up-to-date information to its website visitors.
 
 Let us consider two examples of such time-dependent sites:
 

Modified: zope2book/trunk/source/ZopeArchitecture.rst
===================================================================
--- zope2book/trunk/source/ZopeArchitecture.rst	2009-02-10 15:01:13 UTC (rev 96387)
+++ zope2book/trunk/source/ZopeArchitecture.rst	2009-02-10 15:13:52 UTC (rev 96388)
@@ -6,7 +6,7 @@
 =========================
 
 The Zope framework has several fundamental underlying concepts,
-each of which should be understand in order to make the most of your Zope
+each of which should be understood in order to make the most of your Zope
 experience.
 
 Zope Is a Framework
@@ -141,7 +141,7 @@
 ----------------------------
 
 One of the things that sets Zope apart from other application
-servers is that it was designed from the start to be tightly
+servers, is that it was designed from the start to be tightly
 coupled with not only the Web object model, but also the Web
 development model. Today's successful web applications require
 the participation of many people across an organization with



More information about the Checkins mailing list