Skip to content

Commit

Permalink
Merge pull request #96 from scop/links
Browse files Browse the repository at this point in the history
Doc and comment link fixes
  • Loading branch information
methane committed Jul 6, 2016
2 parents 68181ed + 0f6e5d7 commit f2ab098
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ Packaged as `mysql-python`_. ::
# emerge mysql-python
# emerge zmysqlda # if you use Zope

.. _`mysql-python`: http://packages.gentoo.org/search/?sstring=mysql-python
.. _`mysql-python`: https://packages.gentoo.org/packages/search?q=mysql-python


BSD
Expand Down
2 changes: 1 addition & 1 deletion _mysql_exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
These classes are dictated by the DB API v2.0:
http://www.python.org/topics/database/DatabaseAPI-2.0.html
https://www.python.org/dev/peps/pep-0249/
"""

try:
Expand Down
2 changes: 1 addition & 1 deletion doc/FAQ.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Solutions:
* reconfigure your system so that the MySQL libraries are on the
default loader path. In Linux, you edit /etc/ld.so.conf and run
ldconfig. For Solaris, see `Linker and Libraries Guide
<http://docs.sun.com/app/docs/doc/817-3677/6mj8mbtbe?a=view>`_.
<http://docs.oracle.com/cd/E19253-01/817-1984/chapter6-63352/>`_.


ImportError: ld.so.1: python: fatal: libmtmalloc.so.1: DF_1_NOOPEN tagged object may not be dlopen()'ed
Expand Down
4 changes: 2 additions & 2 deletions doc/user_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ This does what the previous example does, but gets the username and
password and other parameters from ~/.my.cnf (UNIX-like systems). Read
about `option files`_ for more details.

.. _`option files`: http://dev.mysql.com/doc/mysql/en/Option_files.html
.. _`option files`: http://dev.mysql.com/doc/refman/en/option-files.html

So now you have an open connection as ``db`` and want to do a
query. Well, there are no cursors in MySQL, and no parameter
Expand Down Expand Up @@ -366,7 +366,7 @@ connect(parameters...)
an exception is raised. *This must be a keyword
parameter.*

.. _mysql_ssl_set: http://dev.mysql.com/doc/mysql/en/mysql_ssl_set.html
.. _mysql_ssl_set: http://dev.mysql.com/doc/refman/en/mysql-ssl-set.html


apilevel
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ test_suite = nose.collector

[build_ext]
## Only uncomment/set these if the default configuration doesn't work
## Also see http://docs.python.org/dist/setup-config.html
## Also see https://docs.python.org/distutils/configfile.html
# include-dirs = ?
# library-dirs = ?
# link-objects = ?
Expand Down

0 comments on commit f2ab098

Please sign in to comment.