Updates to chapters 1 & 2 - mostly factual, a little style #10

Merged
merged 18 commits into from Oct 26, 2012

Conversation

Projects
None yet
4 participants
Contributor

mpdaugherty commented Oct 25, 2012

I went through chapters 1 and 2 looking for factual updates (e.g. version numbers, etc.)

In Chapter 2, I also found a few places where the transition from SVN to Git required rephrasing a few sentences.

The other large change in Chapter 2 had to do with SQLite; since Django now requires Python 2.5 or higher, I took out instructions on how to get SQLite working with Python 2.4.

mpdaugherty added some commits Oct 24, 2012

@mpdaugherty mpdaugherty Update Django version number in Chpt 1. We will eventually completely…
… update the book to version 1.4
80b07fb
@mpdaugherty mpdaugherty Remove whitespace at end of lines, wrap lines at 80 characters. 039ceb7
@mpdaugherty mpdaugherty Update note about python 3.0 to say that Django 1.5 will support it. …
…No longer encourage new python developers to ignore 3.0.
0eb88e3
@mpdaugherty mpdaugherty Update example to reference python 2.7, not 2.4 af89ea2
@mpdaugherty mpdaugherty Update another 2.4=>2.7. Remove sentence that does not make sense wit…
…h git; revision numbers no longer increase monotomically like they did with SVN.
b3b4bd3
@mpdaugherty mpdaugherty Remove references to "trunk" and replace them with "development versi…
…on" as started by Guruprasad
961fcf7
@mpdaugherty mpdaugherty Django is now at 1.4.2 3955a30
@mpdaugherty mpdaugherty This paragraph sounded like it was still talking about SVN, so I used…
… the term "commit" instead of "changeset". Also, new developers may not know what it means to "find your HEAD commit," so I modified the sentence to be more clear.
9d1ad69
@mpdaugherty mpdaugherty Recommend python 2.7 42dcb3a
@mpdaugherty mpdaugherty Django now only works with Python 2.5+, so no need to specify that th…
…ey must use 2.5 to use SQLite.
1dc1c8b
@mpdaugherty mpdaugherty Again, Django does not support python 2.4, so we can assume users are…
… using python 2.5 or higher
96c783b
@mpdaugherty mpdaugherty Add a note that 5.0.1 of the oracle driver is ok (https://docs.django… 8f08dac
@mpdaugherty mpdaugherty Five files; cannot forget manage.py 47edd0d
@mpdaugherty mpdaugherty More updates to django 1.4.2 f0734a3
@mpdaugherty mpdaugherty Merge with upstream b05113a
@mpdaugherty mpdaugherty Rewrap paragraphs at 80 characters. 1e083b6
Contributor

mpdaugherty commented Oct 25, 2012

@jacobian Do we have a style guideline for the .rst files? I automatically removed whitespace at the end of the lines and wrapped paragraphs at 80 characters, but I'm afraid that this may make the diffs hard to read. Let me know if it's appropriate or not. Thanks!

Contributor

jacobian commented Oct 25, 2012

@mpdaugherty generally, I do exactly what you said - reformat and re-wrap as needed. It does make diffs slightly harder to read, but it makes the source easier to read so that's a tradeoff I'm OK with.

Thanks for the changes, I'll try to review and merge or let you know if there's anything that needs fixing.

@jacobian jacobian and 1 other commented on an outdated diff Oct 25, 2012

chapter01.rst
starts with "1."
Once Django hits 2.0, though, your applications might need to be rewritten --
but version 2.0 is a long way away. As a point of reference, it took more than
three years to release version 1.0. (This is very similar to the compatibility
policy taken by the Python language itself: code that was written for Python
-2.0 works on Python 2.6, but not necessarily with Python 3.0.)
+2.0 works on Python 2.7, but not necessarily with Python 3.0.)
@jacobian

jacobian Oct 25, 2012

Contributor

This actually doesn't match the our current thinking about Django's release policy any more -- the plan is to always be backwards-compatible, at least as much as possible. So let's nix this whole paragraph.

@mpdaugherty

mpdaugherty Oct 25, 2012

Contributor

Great; will do

@jacobian jacobian and 1 other commented on an outdated diff Oct 25, 2012

chapter02.rst
backwards-incompatible changes to the language itself, and, as a result,
- we expect most major Python libraries and frameworks, including Django,
- will take a few years to catch up.
-
- If you're new to Python and are wondering whether to learn Python 2.x or
- Python 3.x, our advice is to stick with Python 2.x.
+ many major Python libraries and frameworks, including Django, had not yet
+ caught up. Python 3.0 support is expected in Django version 1.5 at the
+ earliest.
@jacobian

jacobian Oct 25, 2012

Contributor

"at the earliest" is actually wrong - we made it happen, and 1.5 will support 3.2 and above. This should reflect that.

@mpdaugherty

mpdaugherty Oct 25, 2012

Contributor

Ah, I wasn't sure and didn't find a good source while googling. Will update.

Contributor

jacobian commented Oct 26, 2012

Awesome, thanks!

jacobian merged commit 4f89bb1 into jacobian-archive:master Oct 26, 2012

Perhaps this caveat should be posted instead:

Django 1.5 is also the first release with Python 3 support! We’re labeling this support “experimental” because we don’t yet consider it production-ready, but everything’s in place for you to start porting your apps to Python 3. Our next release, Django 1.6, will support Python 3 without reservations.

Source: https://docs.djangoproject.com/en/dev/releases/1.5-alpha-1/

Contributor

mpdaugherty replied Oct 27, 2012

这个东西真的不错

无序列表:

  • 这是项目1
  • 这是项目2
  • 项目标记有:“-”,“*”或“+”。
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment