Merge branch 'master' of ssh://github.com/collective/collective.devel…

…opermanual
spanktar · Mar 19, 2012 · cd27872 · cd27872
2 parents a58b345 + 0d0c60a
commit cd27872
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/source/components/grok.txt b/source/components/grok.txt
@@ -66,7 +66,9 @@ Example::
        xmlns:i18n="http://namespaces.zope.org/i18n"
        xmlns:grok="http://namespaces.zope.org/grok"
        i18n_domain="plonetheme.xxx">
-
+
+     <include package="five.grok" />
+
      <five:registerPackage package="." initialize=".initialize" />
 
      <!-- Grok the package to initialise schema interfaces and content classes -->

diff --git a/source/misc/commandline.txt b/source/misc/commandline.txt
@@ -279,7 +279,7 @@ and portal_skins skin layers::
             return makerequest(app)
 
         # Enable Faux HTTP request object
-        app= spoofRequest(app)
+        app = spoofRequest(app)
 
         # Get Plone site object from Zope application server root 
         site = app.unrestrictedTraverse("yoursiteid")

diff --git a/source/misc/email.txt b/source/misc/email.txt
@@ -75,3 +75,11 @@ modules (particularly ``Products.remember.tools.registration``).
     If you don't need to have third parties to override your email templates
     it might be cleaned to use Python string templates, as XML based TAL
     templates are not designed for plain text templating.
+
+Graceful failing
+--------------------
+
+In the case SMTP server rejects the connection. etc. don't abort the current transaction (which is 
+the default behavior)
+
+* http://stackoverflow.com/questions/9013009/ploneformgen-and-fail-safe-email-send
diff --git a/source/serving/traversing.txt b/source/serving/traversing.txt
@@ -145,6 +145,10 @@ Use getPhysicalPath(). Example::
 Getting virtual path
 ====================
 
+For content items you can use ``absolute_url_path()`` from `Traversable <http://svn.zope.org/Zope/trunk/src/OFS/Traversable.py?rev=122638&view=auto>`_::
+
+    path = context.absolute_url_path()
+
 Map physical path to virtual path using HTTP request object physicalPathToVirtualPath(). Example::
 
     request = self.request # HTTPRequest object
@@ -294,10 +298,14 @@ Example::
     portal_url = getToolByName(context, "portal_url")
     portal = portal_url.getPortalObject()
 
-You can also do shortcut using acquisition (not recommended if you can avoid this)::
+You can also do shortcut using acquisition::
 
     portal = context.portal_url.getPortalObject()
 
+.. note :: 
+
+        Application code should use the getToolByName method, rather than simply
+        acquiring the tool by name, to ease forward migration (e.g., to Zope3).
 
 Using getSite()
 ==================== 

diff --git a/source/templates_css_and_javascripts/javascript.txt b/source/templates_css_and_javascripts/javascript.txt
@@ -485,6 +485,24 @@ Conditional comments (IE)
 
 * http://plone.org/products/plone/roadmap/232a
 
+Upgrading jQuery
+------------------
+
+``jquery.js`` lives in *Products.CMFPlone* ``portal_skins/plone_3rdparty/jquery.js``.
+Plone 4.1 ships with compressed jQuery 1.4.4.
+
+Here are instructions to change jQuery version. Please note that this may
+break Plone core functionality (tabs, overlays).
+
+These instructions also apply if you want to enable debug version (non-compressed)
+jQuery on your site.
+
+* Download new jQuery from http://docs.jquery.com/Downloading_jQuery and save it to your local disk
+
+* In ZMI, go to plone_3rdparty, customize jquery.js
+
+* Upload new jQuery from your hard disk
+
 Having multiple jQuery versions (noConflict)
 -----------------------------------------------