[ckan-changes] [okfn/ckan] fef2b2: [#969] Add instructions for package patch upgrades

[GitHub]

  Branch: refs/heads/release-v2.0.1
  Home:   https://github.com/okfn/ckan
  Commit: fef2b240c0772f63c550420803a6f0f5c8952701
      https://github.com/okfn/ckan/commit/fef2b240c0772f63c550420803a6f0f5c8952701
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    A doc/upgrading-a-package-install.rst

  Log Message:
  -----------
  [#969] Add instructions for package patch upgrades

Conflicts:

	doc/upgrading-a-package-install.rst


  Commit: a0eb5eabfdcc466f412ee7a0fbfa90798eedd352
      https://github.com/okfn/ckan/commit/a0eb5eabfdcc466f412ee7a0fbfa90798eedd352
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/conf.py
    M doc/upgrading-a-package-install.rst

  Log Message:
  -----------
  [#969] Edit the upgrading to a patch release docs

- Group the *Upgrading to a patch version* and *Upgrading a 1.X Package
  Install to CKAN 2.0* section headings under a top-level *Upgrading a
  package install* heading (this is just so that only one *Upgrading a
  package install* heading appears in the table of contents)

- Edit the first couple of paragraphs of *Upgrading to a patch version*
  a little

- Say CKAN config file not ini file

- Use |apache| and |nginx| to get correct capitalisation of those names

Conflicts:

	doc/conf.py


Compare: https://github.com/okfn/ckan/compare/a4e4589f45da...a0eb5eabfdcc