diff options
| -rw-r--r-- | CHANGES.rst | 3 | ||||
| -rw-r--r-- | docs/building/index.rst | 10 | ||||
| -rw-r--r-- | docs/building/linux.rst | 2 | ||||
| -rw-r--r-- | docs/building/macosx.rst | 2 | ||||
| -rw-r--r-- | docs/building/options.rst | 2 | ||||
| -rw-r--r-- | docs/building/windows.rst | 2 | ||||
| -rw-r--r-- | docs/changes.rst | 3 | ||||
| -rw-r--r-- | docs/index.rst | 39 | ||||
| -rw-r--r-- | docs/installing/index.rst | 9 | ||||
| -rw-r--r-- | setup.py | 4 |
10 files changed, 37 insertions, 39 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index a33ac646b..f341b8d01 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,6 @@ +Changes +======= + 1.2.2 (2014-04-24) ------------------ diff --git a/docs/building/index.rst b/docs/building/index.rst new file mode 100644 index 000000000..daf78b998 --- /dev/null +++ b/docs/building/index.rst @@ -0,0 +1,10 @@ +Building PySide +=============== + +.. toctree:: + :maxdepth: 2 + + windows.rst + macosx.rst + linux.rst + options.rst diff --git a/docs/building/linux.rst b/docs/building/linux.rst index f14512cbc..2c136ce48 100644 --- a/docs/building/linux.rst +++ b/docs/building/linux.rst @@ -3,8 +3,6 @@ Building PySide on a Linux System (Ubuntu 12.04 - 14.04) ======================================================== -.. contents:: :local: - Installing prerequisites ------------------------ diff --git a/docs/building/macosx.rst b/docs/building/macosx.rst index 2d11c5467..e6ac00423 100644 --- a/docs/building/macosx.rst +++ b/docs/building/macosx.rst @@ -3,8 +3,6 @@ Building PySide on a Mac OS X System ==================================== -.. contents:: :local: - Mac OS X is a Unix flavor, partially based upon `BSD Unix <http://en.wikipedia.org/wiki/Berkeley_Software_Distribution>`_. diff --git a/docs/building/options.rst b/docs/building/options.rst index 0080a367e..71e7f6a57 100644 --- a/docs/building/options.rst +++ b/docs/building/options.rst @@ -3,8 +3,6 @@ PySide Setup Script command line options ======================================== -.. contents:: :local: - Usage on a Windows System ------------------------- diff --git a/docs/building/windows.rst b/docs/building/windows.rst index bc512ae13..09b87c92a 100644 --- a/docs/building/windows.rst +++ b/docs/building/windows.rst @@ -3,8 +3,6 @@ Building PySide on a Windows System =================================== -.. contents:: :local: - Installing prerequisites ------------------------ diff --git a/docs/changes.rst b/docs/changes.rst index d9e113ec6..41031dd96 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1 +1,4 @@ +.. toctree:: + :maxdepth: 2 + .. include:: ../CHANGES.rst diff --git a/docs/index.rst b/docs/index.rst index 89c35c302..c0f5c3875 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -2,8 +2,6 @@ PySide ====== -*Python bindings for the Qt cross-platform application and UI framework* - .. image:: https://pypip.in/wheel/PySide/badge.png :target: https://pypi.python.org/pypi/PySide/ :alt: Wheel Status @@ -20,6 +18,8 @@ PySide :target: https://pypi.python.org/pypi/PySide/ :alt: License +| + Introduction ============ @@ -31,9 +31,11 @@ from any modern OSS project such as all code in a git repository, an open Bugzilla for reporting bugs, and an open design process. We welcome any contribution without requiring a transfer of copyright. -The PySide documentation is hosted at `http://pyside.github.io/docs/pyside/ +The PySide reference documentation is hosted at +`http://pyside.github.io/docs/pyside/ <http://pyside.github.io/docs/pyside/>`_. + Compatibility ============= @@ -43,27 +45,16 @@ PySide requires Python 2.6 or later and Qt 4.6 or better. Qt 5.x is currently not supported. -Installing PySide -================= - -.. toctree:: - :maxdepth: 2 - - installing/windows.rst - installing/macosx.rst - installing/linux.rst - -Building PySide -=============== +Contents +======== .. toctree:: :maxdepth: 2 - building/windows.rst - building/macosx.rst - building/linux.rst - building/options.rst + installing/index.rst + building/index.rst + changes.rst Feedback and getting involved @@ -72,12 +63,4 @@ Feedback and getting involved - Mailing list: http://lists.qt-project.org/mailman/listinfo/pyside - Issue tracker: https://bugreports.qt-project.org/browse/PYSIDE - Code Repository: http://qt.gitorious.org/pyside - - -Changes -======= - -.. toctree:: - :maxdepth: 1 - - changes.rst +- Examples Code Repository: https://github.com/PySide/Examples diff --git a/docs/installing/index.rst b/docs/installing/index.rst new file mode 100644 index 000000000..ab4211fd1 --- /dev/null +++ b/docs/installing/index.rst @@ -0,0 +1,9 @@ +Installing PySide +================= + +.. toctree:: + :maxdepth: 2 + + windows.rst + macosx.rst + linux.rst @@ -931,9 +931,7 @@ try: with open(os.path.join(script_dir, 'README.rst')) as f: README = f.read() with open(os.path.join(script_dir, 'CHANGES.rst')) as f: - CHANGES = "Changes" + "\n" + \ - "=======" + "\n\n" + \ - f.read() + CHANGES = f.read() except IOError: README = CHANGES = '' |