Merge lp:~hrvojem/percona-xtrabackup/bug882498-2.0 into lp:percona-xtrabackup/2.0

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 447
Proposed branch: lp:~hrvojem/percona-xtrabackup/bug882498-2.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 85 lines (+70/-1)
2 files modified
doc/source/conf.py (+1/-1)
doc/source/manindex.rst (+69/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/bug882498-2.0
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+113523@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/conf.py'
2--- doc/source/conf.py 2012-06-26 09:37:42 +0000
3+++ doc/source/conf.py 2012-07-05 09:10:43 +0000
4@@ -255,6 +255,6 @@
5 # One entry per manual page. List of tuples
6 # (source start file, name, description, authors, manual section).
7 man_pages = [
8- ('index', 'perconaxtrabackup', u'Percona XtraBackup Documentation',
9+ ('manindex', 'xtrabackup', u'Percona XtraBackup Documentation',
10 [u'Percona Inc'], 1)
11 ]
12
13=== added file 'doc/source/manindex.rst'
14--- doc/source/manindex.rst 1970-01-01 00:00:00 +0000
15+++ doc/source/manindex.rst 2012-07-05 09:10:43 +0000
16@@ -0,0 +1,69 @@
17+.. Percona Xtrabackup documentation master file, created by
18+ sphinx-quickstart on Fri May 6 01:04:39 2011.
19+ You can adapt this file completely to your liking, but it should at least
20+ contain the root `toctree` directive.
21+
22+====================================
23+ Percona Xtrabackup - Documentation
24+====================================
25+
26+*Percona* |XtraBackup| is an open-source hot backup utility for |MySQL| - based servers that doesn't lock your database during the backup.
27+
28+It can back up data from |InnoDB|, |XtraDB|, and |MyISAM| tables on unmodified |MySQL| 5.0, 5.1 and 5.5 servers, as well as |Percona Server| with |XtraDB|. For a high-level overview of many of its advanced features, including a feature comparison, please see :doc:`intro`.
29+
30+Whether it is a 24x7 highly loaded server or a low-transaction-volume environment, *Percona* |XtraBackup| is designed to make backups a seamless procedure without disrupting the performance of the server in a production environment. `Commercial support contracts are available <http://www.percona.com/mysql-support/>`_.
31+
32+*Percona* |XtraBackup| is a combination of the |xtrabackup| *C* program, and the |innobackupex| *Perl* script. The |xtrabackup| program copies and manipulates |InnoDB| and |XtraDB| data files, and the *Perl* script enables enhanced functionality, such as interacting with a running |MySQL| server and backing up |MyISAM| tables. |XtraBackup| works with unmodified |MySQL| servers, as well as |Percona Server| with |XtraDB|. It runs on *Linux* and *FreeBSD*. The *Windows* version is currently at alpha stage and it is available for previewing and testing purposes.
33+
34+Introduction
35+============
36+
37+.. toctree::
38+ :maxdepth: 1
39+ :glob:
40+
41+ intro
42+
43+User's Manual
44+=============
45+
46+.. toctree::
47+ :maxdepth: 2
48+ :glob:
49+
50+ manual
51+
52+Tutorials, Recipes, How-tos
53+===========================
54+
55+.. toctree::
56+ :maxdepth: 2
57+ :hidden:
58+
59+ how-tos
60+
61+* :ref:`recipes-xbk`
62+
63+* :ref:`recipes-ibk`
64+
65+* :ref:`howtos`
66+
67+* :ref:`aux-guides`
68+
69+Miscellaneous
70+=============
71+
72+.. toctree::
73+ :maxdepth: 1
74+ :glob:
75+
76+ glossary
77+ trademark-policy
78+
79+Indices and tables
80+==================
81+
82+* :ref:`genindex`
83+
84+* :ref:`search`
85+

Subscribers

People subscribed via source and target branches