Updated attributions and URLs for consistency.

diff --git a/README b/README
index 6e47860..f1ef32e 100644 (file)
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ Prerequisites:
        * (Optional) recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>
        * (Optional) south 0.7.2+ <http://south.aeracode.org/>
 
        * (Optional) recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>
        * (Optional) south 0.7.2+ <http://south.aeracode.org/>
 

-To contribute, please visit the project website <http://philo.ithinksw.org/>. Feel free to join us on IRC at irc://irc.oftc.net/#philo.
+To contribute, please visit the project website <http://philocms.org/>. Feel free to join us on IRC at irc://irc.oftc.net/#philo.

 
 ====
 Using philo
 
 ====
 Using philo

diff --git a/README.markdown b/README.markdown
index 349a727..b85cb50 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -9,7 +9,7 @@ Prerequisites:
  * (Optional) [south 0.7.2+ <http://south.aeracode.org/)](http://south.aeracode.org/)
  * (Optional) [recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>](http://code.google.com/p/recaptcha-django/)
 
  * (Optional) [south 0.7.2+ <http://south.aeracode.org/)](http://south.aeracode.org/)
  * (Optional) [recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>](http://code.google.com/p/recaptcha-django/)
 

-To contribute, please visit the [project website](http://philo.ithinksw.org/). Feel free to join us on IRC at [irc://irc.oftc.net/#philo](irc://irc.oftc.net/#philo>).
+To contribute, please visit the [project website](http://philocms.org/). Feel free to join us on IRC at [irc://irc.oftc.net/#philo](irc://irc.oftc.net/#philo>).

 
 Using philo
 ===========
 
 Using philo
 ===========

diff --git a/docs/conf.py b/docs/conf.py
index c888d0e..4e6a624 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,7 +54,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Philo'
 
 # General information about the project.
 project = u'Philo'

-copyright = u'2011, Joseph Spiros'
+copyright = u'2009-2011, iThink Software'

 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the


@@ -197,7 +197,7 @@ htmlhelp_basename = 'Philodoc'
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'Philo.tex', u'Philo Documentation',
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'Philo.tex', u'Philo Documentation',

-   u'Stephen Burrows', 'manual'),
+   u'iThink Software', 'manual'),

 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 ]
 
 # The name of an image file (relative to this directory) to place at the top of


@@ -230,7 +230,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'philo', u'Philo Documentation',
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'philo', u'Philo Documentation',

-     [u'Stephen Burrows'], 1)
+     [u'iThink Software'], 1)

 ]
 
 def skip_attribute_attrs(app, what, name, obj, skip, options):
 ]
 
 def skip_attribute_attrs(app, what, name, obj, skip, options):

diff --git a/docs/index.rst b/docs/index.rst
index d387fa8..666e3ee 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -46,4 +46,4 @@ Prerequisites:
 * (Optional) `south 0.7.2+ <http://south.aeracode.org/>`_
 * (Optional) `recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>`_
 
 * (Optional) `south 0.7.2+ <http://south.aeracode.org/>`_
 * (Optional) `recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>`_
 

-To contribute, please visit the `project website <http://philo.ithinksw.org/>`_ or make a fork of the `git repository <http://github.com/ithinksw/philo/>`_. Feel free to join us on IRC at `irc://irc.oftc.net/#philo <irc://irc.oftc.net/#philo>`_.
+To contribute, please visit the `project website <http://philocms.org/>`_ or make a fork of the git repository on `GitHub <http://github.com/ithinksw/philo>`_ or `Gitorious <http://gitorious.org/ithinksw/philo>`_. Feel free to join us on IRC at `irc://irc.oftc.net/#philo <irc://irc.oftc.net/#philo>`_.

diff --git a/docs/intro.rst b/docs/intro.rst
index 33d1a98..2b253db 100644 (file)
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -31,5 +31,5 @@ After installing `philo`_ and `mptt`_ on your python path, make sure to complete
 
 Philo should be ready to go!
 
 
 Philo should be ready to go!
 

-.. _philo: http://github.com/ithinksw/philo
-.. _mptt: http://github.com/django-mptt/django-mptt
\ No newline at end of file
+.. _philo: http://philocms.org/
+.. _mptt: http://github.com/django-mptt/django-mptt

diff --git a/setup.py b/setup.py
index 6dca288..f33d211 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -42,11 +42,11 @@ version = __import__('philo').VERSION
 setup(
        name = 'philo',
        version = '.'.join([str(v) for v in version]),
 setup(
        name = 'philo',
        version = '.'.join([str(v) for v in version]),

-       url = "https://github.com/ithinksw/philo",
+       url = "http://philocms.org/",

        description = "A foundation for developing web content management systems.",
        long_description = open(os.path.join(root_dir, 'README.markdown')).read(),
        description = "A foundation for developing web content management systems.",
        long_description = open(os.path.join(root_dir, 'README.markdown')).read(),

-       maintainer = "Joseph Spiros",
-       maintainer_email = "joseph.spiros@ithinksw.com",
+       maintainer = "iThink Software",
+       maintainer_email = "contact@ithinksw.com",

        packages = packages,
        data_files = data_files,
        
        packages = packages,
        data_files = data_files,