Author: russellm Date: 2009-03-24 06:57:36 -0500 (Tue, 24 Mar 2009) New Revision: 10155
Modified: django/branches/releases/1.0.X/ django/branches/releases/1.0.X/docs/howto/jython.txt Log: [1.0.X] Fixed #10591 -- Corrected link to Jython in docs. Thanks to framos. Merge of r10146 from trunk. Property changes on: django/branches/releases/1.0.X ___________________________________________________________________ Name: svnmerge-integrated - /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9780,9782-9784,9789-9790,9793-9798,9801-9802,9806-9807,9809-9813,9821-9837,9842-9843,9847-9859,9861,9863-9875,9877-9881,9883-9887,9899-9903,9906-9909,9912,9914,9916-9917,9919-9920,9922-9927,9929,9931-9937,9939,9942-9943,9945-9950,9953-9954,9956-9962,9966-9977,9979-9984,9986-9988,9990,9992,9994,9996-9998,10003,10009,10013,10015,10017,10022,10024,10031,10036-10037,10040,10049,10051,10054,10056-10058,10071,10073-10074,10125,10143,10145 + /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9780,9782-9784,9789-9790,9793-9798,9801-9802,9806-9807,9809-9813,9821-9837,9842-9843,9847-9859,9861,9863-9875,9877-9881,9883-9887,9899-9903,9906-9909,9912,9914,9916-9917,9919-9920,9922-9927,9929,9931-9937,9939,9942-9943,9945-9950,9953-9954,9956-9962,9966-9977,9979-9984,9986-9988,9990,9992,9994,9996-9998,10003,10009,10013,10015,10017,10022,10024,10031,10036-10037,10040,10049,10051,10054,10056-10058,10071,10073-10074,10125,10143,10145-10146 Modified: django/branches/releases/1.0.X/docs/howto/jython.txt =================================================================== --- django/branches/releases/1.0.X/docs/howto/jython.txt 2009-03-24 11:53:30 UTC (rev 10154) +++ django/branches/releases/1.0.X/docs/howto/jython.txt 2009-03-24 11:57:36 UTC (rev 10155) @@ -12,23 +12,23 @@ This document will get you up and running with Django on top of Jython. -.. _jython: http://jython.org/ +.. _jython: http://www.jython.org/ Installing Jython ================= -Django works with Jython versions 2.5 and higher. +Django works with Jython versions 2.5 and higher. .. warning:: As of the writing of this document, a version of Jython compatible with Django has not yet been released. The forthcoming 2.5a2+ release will be be - the first in which Django will work out of the box. - + the first in which Django will work out of the box. + In the meantime, you'll need to use the latest development version of Jython obtained from Jython's SVN repository. -Download Jython at http://jython.org/. +Download Jython at http://www.jython.org/. Creating a servlet container ============================ @@ -80,6 +80,6 @@ documentation uses ``python`` for consistancy, but if you're using Jython you'll want to mentally replace ``python`` with ``jython`` every time it occurs. - + * Similarly, you'll need to use the ``JYTHONPATH`` environment variable instead of ``PYTHONPATH``. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---
