# HG changeset patch
# User cmlenz
# Date 1183368368 0
# Node ID 0e82db0c50181310ba78f42c8c2a8eec97d439f9
# Parent  cd7d11b95fc7b07b7d0918e84ea17ec6fe38b5cb
Merged revisions [192] and [195] via svnmerge from [source:/trunk].

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
-
 Version 0.8.1
 http://svn.edgewall.org/repos/babel/tags/0.8.1/
-(?, from branches/stable/0.8.x)
+(Jul 2 2007, from branches/stable/0.8.x)
 
  * `default_locale()` would fail when the value of the `LANGUAGE` environment
    variable contained multiple language codes separated by colon, as is
@@ -22,8 +21,10 @@
  * Made locale string parsing more robust, and also take the script part into
    account (ticket #27).
  * Added a function to list all locales for which locale data is available.
- * Added a command-line option to the `babel` command which prints out all
+ * Added a command-line option to the `pybabel` command which prints out all
    available locales (ticket #24).
+ * The name of the command-line script has been changed from just `babel` to
+   `pybabel` to avoid a conflict with the OpenBabel project (ticket #34).
 
 
 Version 0.8
diff --git a/doc/cmdline.txt b/doc/cmdline.txt
--- a/doc/cmdline.txt
+++ b/doc/cmdline.txt
@@ -14,10 +14,10 @@
 .. sectnum::
 
 
-When properly installed, Babel provides a script called ``babel``::
+When properly installed, Babel provides a script called ``pybabel``::
 
-    $ babel --help
-    usage: babel subcommand [options] [args]
+    $ pybabel --help
+    usage: pybabel subcommand [options] [args]
 
     options:
       --version             show program's version number and exit
@@ -27,8 +27,8 @@
       extract   extract messages from source files and generate a POT file
       init      create new message catalogs from a template
 
-The ``babel`` script provides a number of sub-commands that do the actual work.
-Those sub-commands are described below.
+The ``pybabel`` script provides a number of sub-commands that do the actual
+work. Those sub-commands are described below.
 
 
 extract
@@ -37,8 +37,8 @@
 The ``extract`` sub-command can be used to extract localizable messages from
 a collection of source files::
 
-    $ babel extract --help
-    usage: babel extract [options] dir1 <dir2> ...
+    $ pybabel extract --help
+    usage: pybabel extract [options] dir1 <dir2> ...
     
     extract messages from source files and generate a POT file
     
@@ -79,8 +79,8 @@
 The `init` sub-command creates a new translations catalog based on a PO
 template file::
 
-    $ babel init --help
-    usage: babel init [options] 
+    $ pybabel init --help
+    usage: pybabel init [options] 
     
     create new message catalogs from a template
     
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -135,7 +135,7 @@
 
     entry_points = """
     [console_scripts]
-    babel = babel.messages.frontend:main
+    pybabel = babel.messages.frontend:main
     
     [distutils.commands]
     extract_messages = babel.messages.frontend:extract_messages