summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-28 14:25:19 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-28 14:25:19 -0300
commit5b975799ce9b7a6e0a88be4bcb48bdfb90800bb3 (patch)
treebda674a79b1aeccb37b67609517bc4761db7ae07 /docs
parent9cea9c8a34343f8792d65b96f93ae22bd8685878 (diff)
parentc088a1544a5f7a51359d2802019c0740aab0cc5b (diff)
Merge branch 'release-0.2.2'0.2.2
Diffstat (limited to 'docs')
-rw-r--r--docs/COPYING674
-rw-r--r--docs/api/leap.base.rst98
-rw-r--r--docs/api/leap.base.tests.rst43
-rw-r--r--docs/api/leap.baseapp.rst75
-rw-r--r--docs/api/leap.certs.rst11
-rw-r--r--docs/api/leap.config.rst27
-rw-r--r--docs/api/leap.crypto.rst18
-rw-r--r--docs/api/leap.crypto.tests.rst22
-rw-r--r--docs/api/leap.eip.rst74
-rw-r--r--docs/api/leap.eip.tests.rst43
-rw-r--r--docs/api/leap.gui.firstrun.rst91
-rw-r--r--docs/api/leap.gui.rst68
-rw-r--r--docs/api/leap.gui.tests.rst59
-rw-r--r--docs/api/leap.keymanager.rst50
-rw-r--r--docs/api/leap.keymanager.tests.rst11
-rw-r--r--docs/api/leap.platform_init.rst27
-rw-r--r--docs/api/leap.rst9
-rw-r--r--docs/api/leap.services.eip.rst66
-rw-r--r--docs/api/leap.services.eip.tests.rst11
-rw-r--r--docs/api/leap.services.mail.rst27
-rw-r--r--docs/api/leap.services.rst28
-rw-r--r--docs/api/leap.services.soledad.rst27
-rw-r--r--docs/api/leap.testing.rst43
-rw-r--r--docs/api/leap.util.rst49
-rw-r--r--docs/api/leap.util.tests.rst19
-rw-r--r--docs/checklist_for_leap_client_release.wiki5
-rw-r--r--docs/conf.py26
-rw-r--r--docs/dev/environment.rst49
-rw-r--r--docs/dev/internationalization.rst22
-rw-r--r--docs/dev/resources.rst4
-rw-r--r--docs/dev/workflow.rst8
-rw-r--r--docs/index.rst7
-rw-r--r--docs/pkg/debian.rst4
-rw-r--r--docs/testers/howto.rst4
-rw-r--r--docs/user/install.rst46
-rw-r--r--docs/user/intro.rst2
-rw-r--r--docs/user/running.rst20
37 files changed, 490 insertions, 1377 deletions
diff --git a/docs/COPYING b/docs/COPYING
deleted file mode 100644
index 94a9ed02..00000000
--- a/docs/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/docs/api/leap.base.rst b/docs/api/leap.base.rst
deleted file mode 100644
index 778836c4..00000000
--- a/docs/api/leap.base.rst
+++ /dev/null
@@ -1,98 +0,0 @@
-base Package
-============
-
-:mod:`auth` Module
-------------------
-
-.. automodule:: leap.base.auth
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`authentication` Module
-----------------------------
-
-.. automodule:: leap.base.authentication
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`checks` Module
---------------------
-
-.. automodule:: leap.base.checks
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`config` Module
---------------------
-
-.. automodule:: leap.base.config
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`connection` Module
-------------------------
-
-.. automodule:: leap.base.connection
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`constants` Module
------------------------
-
-.. automodule:: leap.base.constants
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`exceptions` Module
-------------------------
-
-.. automodule:: leap.base.exceptions
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`network` Module
----------------------
-
-.. automodule:: leap.base.network
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`pluggableconfig` Module
------------------------------
-
-.. automodule:: leap.base.pluggableconfig
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`providers` Module
------------------------
-
-.. automodule:: leap.base.providers
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`specs` Module
--------------------
-
-.. automodule:: leap.base.specs
- :members:
- :undoc-members:
- :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-
- leap.base.tests
-
diff --git a/docs/api/leap.base.tests.rst b/docs/api/leap.base.tests.rst
deleted file mode 100644
index 7af035b0..00000000
--- a/docs/api/leap.base.tests.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-tests Package
-=============
-
-:mod:`test_auth` Module
------------------------
-
-.. automodule:: leap.base.tests.test_auth
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_checks` Module
--------------------------
-
-.. automodule:: leap.base.tests.test_checks
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_config` Module
--------------------------
-
-.. automodule:: leap.base.tests.test_config
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_providers` Module
-----------------------------
-
-.. automodule:: leap.base.tests.test_providers
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_validation` Module
------------------------------
-
-.. automodule:: leap.base.tests.test_validation
- :members:
- :undoc-members:
- :show-inheritance:
-
diff --git a/docs/api/leap.baseapp.rst b/docs/api/leap.baseapp.rst
deleted file mode 100644
index f24b4976..00000000
--- a/docs/api/leap.baseapp.rst
+++ /dev/null
@@ -1,75 +0,0 @@
-baseapp Package
-===============
-
-:mod:`constants` Module
------------------------
-
-.. automodule:: leap.baseapp.constants
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`dialogs` Module
----------------------
-
-.. automodule:: leap.baseapp.dialogs
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`eip` Module
------------------
-
-.. automodule:: leap.baseapp.eip
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`leap_app` Module
-----------------------
-
-.. automodule:: leap.baseapp.leap_app
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`log` Module
------------------
-
-.. automodule:: leap.baseapp.log
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`mainwindow` Module
-------------------------
-
-.. automodule:: leap.baseapp.mainwindow
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`network` Module
----------------------
-
-.. automodule:: leap.baseapp.network
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`permcheck` Module
------------------------
-
-.. automodule:: leap.baseapp.permcheck
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`systray` Module
----------------------
-
-.. automodule:: leap.baseapp.systray
- :members:
- :undoc-members:
- :show-inheritance:
-
diff --git a/docs/api/leap.certs.rst b/docs/api/leap.certs.rst
deleted file mode 100644
index e9cc2524..00000000
--- a/docs/api/leap.certs.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-certs Package
-=============
-
-:mod:`certs` Package
---------------------
-
-.. automodule:: leap.certs
- :members:
- :undoc-members:
- :show-inheritance:
-
diff --git a/docs/api/leap.config.rst b/docs/api/leap.config.rst
new file mode 100644
index 00000000..c1462817
--- /dev/null
+++ b/docs/api/leap.config.rst
@@ -0,0 +1,27 @@
+config Package
+==============
+
+:mod:`leapsettings` Module
+--------------------------
+
+.. automodule:: leap.config.leapsettings
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`provider_spec` Module
+---------------------------
+
+.. automodule:: leap.config.provider_spec
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`providerconfig` Module
+----------------------------
+
+.. automodule:: leap.config.providerconfig
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
diff --git a/docs/api/leap.crypto.rst b/docs/api/leap.crypto.rst
index a04e2e1d..6db77e86 100644
--- a/docs/api/leap.crypto.rst
+++ b/docs/api/leap.crypto.rst
@@ -1,18 +1,26 @@
crypto Package
==============
-:mod:`certs` Module
--------------------
+:mod:`constants` Module
+-----------------------
-.. automodule:: leap.crypto.certs
+.. automodule:: leap.crypto.constants
:members:
:undoc-members:
:show-inheritance:
-:mod:`leapkeyring` Module
+:mod:`srpauth` Module
+---------------------
+
+.. automodule:: leap.crypto.srpauth
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`srpregister` Module
-------------------------
-.. automodule:: leap.crypto.leapkeyring
+.. automodule:: leap.crypto.srpregister
:members:
:undoc-members:
:show-inheritance:
diff --git a/docs/api/leap.crypto.tests.rst b/docs/api/leap.crypto.tests.rst
index 54ffa62f..f9e32580 100644
--- a/docs/api/leap.crypto.tests.rst
+++ b/docs/api/leap.crypto.tests.rst
@@ -1,10 +1,26 @@
tests Package
=============
-:mod:`test_certs` Module
-------------------------
+:mod:`tests` Package
+--------------------
-.. automodule:: leap.crypto.tests.test_certs
+.. automodule:: leap.crypto.tests
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`fake_provider` Module
+---------------------------
+
+.. automodule:: leap.crypto.tests.fake_provider
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`test_srpregister` Module
+------------------------------
+
+.. automodule:: leap.crypto.tests.test_srpregister
:members:
:undoc-members:
:show-inheritance:
diff --git a/docs/api/leap.eip.rst b/docs/api/leap.eip.rst
deleted file mode 100644
index e418461b..00000000
--- a/docs/api/leap.eip.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-eip Package
-===========
-
-:mod:`checks` Module
---------------------
-
-.. automodule:: leap.eip.checks
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`config` Module
---------------------
-
-.. automodule:: leap.eip.config
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`constants` Module
------------------------
-
-.. automodule:: leap.eip.constants
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`eipconnection` Module
----------------------------
-
-.. automodule:: leap.eip.eipconnection
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`exceptions` Module
-------------------------
-
-.. automodule:: leap.eip.exceptions
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`openvpnconnection` Module
--------------------------------
-
-.. automodule:: leap.eip.openvpnconnection
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`specs` Module
--------------------
-
-.. automodule:: leap.eip.specs
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`udstelnet` Module
------------------------
-
-.. automodule:: leap.eip.udstelnet
- :members:
- :undoc-members:
- :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-
- leap.eip.tests
-
diff --git a/docs/api/leap.eip.tests.rst b/docs/api/leap.eip.tests.rst
deleted file mode 100644
index 932a074f..00000000
--- a/docs/api/leap.eip.tests.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-tests Package
-=============
-
-:mod:`data` Module
-------------------
-
-.. automodule:: leap.eip.tests.data
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_checks` Module
--------------------------
-
-.. automodule:: leap.eip.tests.test_checks
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_config` Module
--------------------------
-
-.. automodule:: leap.eip.tests.test_config
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_eipconnection` Module
---------------------------------
-
-.. automodule:: leap.eip.tests.test_eipconnection
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_openvpnconnection` Module
-------------------------------------
-
-.. automodule:: leap.eip.tests.test_openvpnconnection
- :members:
- :undoc-members:
- :show-inheritance:
-
diff --git a/docs/api/leap.gui.firstrun.rst b/docs/api/leap.gui.firstrun.rst
deleted file mode 100644
index 36470c33..00000000
--- a/docs/api/leap.gui.firstrun.rst
+++ /dev/null
@@ -1,91 +0,0 @@
-firstrun Package
-================
-
-:mod:`firstrun` Package
------------------------
-
-.. automodule:: leap.gui.firstrun
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`intro` Module
--------------------
-
-.. automodule:: leap.gui.firstrun.intro
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`last` Module
-------------------
-
-.. automodule:: leap.gui.firstrun.last
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`login` Module
--------------------
-
-.. automodule:: leap.gui.firstrun.login
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`mixins` Module
---------------------
-
-.. automodule:: leap.gui.firstrun.mixins
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`providerinfo` Module
---------------------------
-
-.. automodule:: leap.gui.firstrun.providerinfo
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`providerselect` Module
-----------------------------
-
-.. automodule:: leap.gui.firstrun.providerselect
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`providersetup` Module
----------------------------
-
-.. automodule:: leap.gui.firstrun.providersetup
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`register` Module
-----------------------
-
-.. automodule:: leap.gui.firstrun.register
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`regvalidation` Module
----------------------------
-
-.. automodule:: leap.gui.firstrun.regvalidation
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`wizard` Module
---------------------
-
-.. automodule:: leap.gui.firstrun.wizard
- :members:
- :undoc-members:
- :show-inheritance:
-
diff --git a/docs/api/leap.gui.rst b/docs/api/leap.gui.rst
index a35a7856..d78de5d3 100644
--- a/docs/api/leap.gui.rst
+++ b/docs/api/leap.gui.rst
@@ -9,18 +9,34 @@ gui Package
:undoc-members:
:show-inheritance:
-:mod:`constants` Module
+:mod:`locale_rc` Module
-----------------------
-.. automodule:: leap.gui.constants
+.. automodule:: leap.gui.locale_rc
:members:
:undoc-members:
:show-inheritance:
-:mod:`locale_rc` Module
------------------------
+:mod:`loggerwindow` Module
+--------------------------
-.. automodule:: leap.gui.locale_rc
+.. automodule:: leap.gui.loggerwindow
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`loggerwindow_rc` Module
+-----------------------------
+
+.. automodule:: leap.gui.loggerwindow_rc
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`mainwindow` Module
+------------------------
+
+.. automodule:: leap.gui.mainwindow
:members:
:undoc-members:
:show-inheritance:
@@ -33,43 +49,51 @@ gui Package
:undoc-members:
:show-inheritance:
-:mod:`progress` Module
-----------------------
+:mod:`twisted_main` Module
+--------------------------
-.. automodule:: leap.gui.progress
+.. automodule:: leap.gui.twisted_main
:members:
:undoc-members:
:show-inheritance:
-:mod:`styles` Module
---------------------
+:mod:`ui_loggerwindow` Module
+-----------------------------
-.. automodule:: leap.gui.styles
+.. automodule:: leap.gui.ui_loggerwindow
:members:
:undoc-members:
:show-inheritance:
-:mod:`threads` Module
----------------------
+:mod:`ui_mainwindow` Module
+---------------------------
-.. automodule:: leap.gui.threads
+.. automodule:: leap.gui.ui_mainwindow
:members:
:undoc-members:
:show-inheritance:
-:mod:`utils` Module
--------------------
+:mod:`ui_wizard` Module
+-----------------------
-.. automodule:: leap.gui.utils
+.. automodule:: leap.gui.ui_wizard
:members:
:undoc-members:
:show-inheritance:
-Subpackages
------------
+:mod:`wizard` Module
+--------------------
-.. toctree::
+.. automodule:: leap.gui.wizard
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`wizardpage` Module
+------------------------
- leap.gui.firstrun
- leap.gui.tests
+.. automodule:: leap.gui.wizardpage
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/api/leap.gui.tests.rst b/docs/api/leap.gui.tests.rst
deleted file mode 100644
index 60b0a6ca..00000000
--- a/docs/api/leap.gui.tests.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-tests Package
-=============
-
-:mod:`test_firstrun_login` Module
----------------------------------
-
-.. automodule:: leap.gui.tests.test_firstrun_login
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_firstrun_providerselect` Module
-------------------------------------------
-
-.. automodule:: leap.gui.tests.test_firstrun_providerselect
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_firstrun_register` Module
-------------------------------------
-
-.. automodule:: leap.gui.tests.test_firstrun_register
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_firstrun_wizard` Module
-----------------------------------
-
-.. automodule:: leap.gui.tests.test_firstrun_wizard
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_mainwindow_rc` Module
---------------------------------
-
-.. automodule:: leap.gui.tests.test_mainwindow_rc
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_progress` Module
----------------------------
-
-.. automodule:: leap.gui.tests.test_progress
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_threads` Module
---------------------------
-
-.. automodule:: leap.gui.tests.test_threads
- :members:
- :undoc-members:
- :show-inheritance:
-
diff --git a/docs/api/leap.keymanager.rst b/docs/api/leap.keymanager.rst
new file mode 100644
index 00000000..0de8fc5f
--- /dev/null
+++ b/docs/api/leap.keymanager.rst
@@ -0,0 +1,50 @@
+keymanager Package
+==================
+
+:mod:`keymanager` Package
+-------------------------
+
+.. automodule:: leap.keymanager
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`errors` Module
+--------------------
+
+.. automodule:: leap.keymanager.errors
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`gpg` Module
+-----------------
+
+.. automodule:: leap.keymanager.gpg
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`keys` Module
+------------------
+
+.. automodule:: leap.keymanager.keys
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`openpgp` Module
+---------------------
+
+.. automodule:: leap.keymanager.openpgp
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+ leap.keymanager.tests
+
diff --git a/docs/api/leap.keymanager.tests.rst b/docs/api/leap.keymanager.tests.rst
new file mode 100644
index 00000000..9836bd01
--- /dev/null
+++ b/docs/api/leap.keymanager.tests.rst
@@ -0,0 +1,11 @@
+tests Package
+=============
+
+:mod:`test_keymanager` Module
+-----------------------------
+
+.. automodule:: leap.keymanager.tests.test_keymanager
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
diff --git a/docs/api/leap.platform_init.rst b/docs/api/leap.platform_init.rst
new file mode 100644
index 00000000..a638df35
--- /dev/null
+++ b/docs/api/leap.platform_init.rst
@@ -0,0 +1,27 @@
+platform_init Package
+=====================
+
+:mod:`platform_init` Package
+----------------------------
+
+.. automodule:: leap.platform_init
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`initializers` Module
+--------------------------
+
+.. automodule:: leap.platform_init.initializers
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`locks` Module
+-------------------
+
+.. automodule:: leap.platform_init.locks
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
diff --git a/docs/api/leap.rst b/docs/api/leap.rst
index ce715c5d..102f3b61 100644
--- a/docs/api/leap.rst
+++ b/docs/api/leap.rst
@@ -30,12 +30,11 @@ Subpackages
.. toctree::
- leap.base
- leap.baseapp
- leap.certs
+ leap.config
leap.crypto
- leap.eip
leap.gui
- leap.testing
+ leap.keymanager
+ leap.platform_init
+ leap.services
leap.util
diff --git a/docs/api/leap.services.eip.rst b/docs/api/leap.services.eip.rst
new file mode 100644
index 00000000..450c1a93
--- /dev/null
+++ b/docs/api/leap.services.eip.rst
@@ -0,0 +1,66 @@
+eip Package
+===========
+
+:mod:`eipbootstrapper` Module
+-----------------------------
+
+.. automodule:: leap.services.eip.eipbootstrapper
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`eipconfig` Module
+-----------------------
+
+.. automodule:: leap.services.eip.eipconfig
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`eipspec` Module
+---------------------
+
+.. automodule:: leap.services.eip.eipspec
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`providerbootstrapper` Module
+----------------------------------
+
+.. automodule:: leap.services.eip.providerbootstrapper
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`udstelnet` Module
+-----------------------
+
+.. automodule:: leap.services.eip.udstelnet
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`vpnlaunchers` Module
+--------------------------
+
+.. automodule:: leap.services.eip.vpnlaunchers
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`vpnprocess` Module
+------------------------
+
+.. automodule:: leap.services.eip.vpnprocess
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+ leap.services.eip.tests
+
diff --git a/docs/api/leap.services.eip.tests.rst b/docs/api/leap.services.eip.tests.rst
new file mode 100644
index 00000000..ea6e8ba5
--- /dev/null
+++ b/docs/api/leap.services.eip.tests.rst
@@ -0,0 +1,11 @@
+tests Package
+=============
+
+:mod:`test_eipconfig` Module
+----------------------------
+
+.. automodule:: leap.services.eip.tests.test_eipconfig
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
diff --git a/docs/api/leap.services.mail.rst b/docs/api/leap.services.mail.rst
new file mode 100644
index 00000000..bd479972
--- /dev/null
+++ b/docs/api/leap.services.mail.rst
@@ -0,0 +1,27 @@
+mail Package
+============
+
+:mod:`smtpbootstrapper` Module
+------------------------------
+
+.. automodule:: leap.services.mail.smtpbootstrapper
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`smtpconfig` Module
+------------------------
+
+.. automodule:: leap.services.mail.smtpconfig
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`smtpspec` Module
+----------------------
+
+.. automodule:: leap.services.mail.smtpspec
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
diff --git a/docs/api/leap.services.rst b/docs/api/leap.services.rst
new file mode 100644
index 00000000..e5b22e64
--- /dev/null
+++ b/docs/api/leap.services.rst
@@ -0,0 +1,28 @@
+services Package
+================
+
+:mod:`abstractbootstrapper` Module
+----------------------------------
+
+.. automodule:: leap.services.abstractbootstrapper
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`tx` Module
+----------------
+
+.. automodule:: leap.services.tx
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+ leap.services.eip
+ leap.services.mail
+ leap.services.soledad
+
diff --git a/docs/api/leap.services.soledad.rst b/docs/api/leap.services.soledad.rst
new file mode 100644
index 00000000..efefeb50
--- /dev/null
+++ b/docs/api/leap.services.soledad.rst
@@ -0,0 +1,27 @@
+soledad Package
+===============
+
+:mod:`soledadbootstrapper` Module
+---------------------------------
+
+.. automodule:: leap.services.soledad.soledadbootstrapper
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`soledadconfig` Module
+---------------------------
+
+.. automodule:: leap.services.soledad.soledadconfig
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`soledadspec` Module
+-------------------------
+
+.. automodule:: leap.services.soledad.soledadspec
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
diff --git a/docs/api/leap.testing.rst b/docs/api/leap.testing.rst
deleted file mode 100644
index dfad1b0c..00000000
--- a/docs/api/leap.testing.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-testing Package
-===============
-
-:mod:`basetest` Module
-----------------------
-
-.. automodule:: leap.testing.basetest
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`https_server` Module
---------------------------
-
-.. automodule:: leap.testing.https_server
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`pyqt` Module
-------------------
-
-.. automodule:: leap.testing.pyqt
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`qunittest` Module
------------------------
-
-.. automodule:: leap.testing.qunittest
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_basetest` Module
----------------------------
-
-.. automodule:: leap.testing.test_basetest
- :members:
- :undoc-members:
- :show-inheritance:
-
diff --git a/docs/api/leap.util.rst b/docs/api/leap.util.rst
index dbb69ebe..601f6cba 100644
--- a/docs/api/leap.util.rst
+++ b/docs/api/leap.util.rst
@@ -1,26 +1,10 @@
util Package
============
-:mod:`coroutines` Module
-------------------------
-
-.. automodule:: leap.util.coroutines
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`dicts` Module
+:mod:`util` Package
-------------------
-.. automodule:: leap.util.dicts
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`fileutil` Module
-----------------------
-
-.. automodule:: leap.util.fileutil
+.. automodule:: leap.util
:members:
:undoc-members:
:show-inheritance:
@@ -33,34 +17,35 @@ util Package
:undoc-members:
:show-inheritance:
-:mod:`misc` Module
-------------------
+:mod:`leap_log_handler` Module
+------------------------------
-.. automodule:: leap.util.misc
+.. automodule:: leap.util.leap_log_handler
:members:
:undoc-members:
:show-inheritance:
-:mod:`translations` Module
---------------------------
+:mod:`privilege_policies` Module
+--------------------------------
-.. automodule:: leap.util.translations
+.. automodule:: leap.util.privilege_policies
:members:
:undoc-members:
:show-inheritance:
-:mod:`web` Module
------------------
+:mod:`request_helpers` Module
+-----------------------------
-.. automodule:: leap.util.web
+.. automodule:: leap.util.request_helpers
:members:
:undoc-members:
:show-inheritance:
-Subpackages
------------
-
-.. toctree::
+:mod:`requirement_checker` Module
+---------------------------------
- leap.util.tests
+.. automodule:: leap.util.requirement_checker
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/api/leap.util.tests.rst b/docs/api/leap.util.tests.rst
deleted file mode 100644
index eb6654c4..00000000
--- a/docs/api/leap.util.tests.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-tests Package
-=============
-
-:mod:`test_fileutil` Module
----------------------------
-
-.. automodule:: leap.util.tests.test_fileutil
- :members:
- :undoc-members:
- :show-inheritance:
-
-:mod:`test_leap_argparse` Module
---------------------------------
-
-.. automodule:: leap.util.tests.test_leap_argparse
- :members:
- :undoc-members:
- :show-inheritance:
-
diff --git a/docs/checklist_for_leap_client_release.wiki b/docs/checklist_for_leap_client_release.wiki
index c61b258c..d3bdf1ee 100644
--- a/docs/checklist_for_leap_client_release.wiki
+++ b/docs/checklist_for_leap_client_release.wiki
@@ -4,7 +4,7 @@
* [ ] all rc-critical closed!
* [ ] all bbots green
* [ ] uploaded translations: make translations
- * [ ] re-generate pyqt resources
+ * [ ] re-generate pyside resources
* [ ] update docs
* [ ] CREDITS
@@ -34,9 +34,6 @@
* [ ] wait ...?
* [ ] PYPI UPLOAD: with "python ./setup.py sdist upload register"
- * [ ] login to pypi
- * [ ] from Edit, add new release
- * [ ] upload .tar.gz, .asc
* [ ] make an "announcement of new release" on leap.se
* [ ] close the Milestone on the chili Roadmap
diff --git a/docs/conf.py b/docs/conf.py
index 05c8cf5b..39f17d9b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,7 +16,21 @@ import sys, os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../src'))
+sys.path.insert(0, os.path.abspath('../src/leap'))
+sys.path.insert(0, os.path.abspath('../src/leap/crypto'))
+sys.path.insert(0, os.path.abspath('../src/leap/keymanager'))
+sys.path.insert(0, os.path.abspath('../src/leap/services'))
+sys.path.insert(0, os.path.abspath('../src/leap/services/eip'))
+sys.path.insert(0, os.path.abspath('../src/leap/util'))
+
+sys.path.insert(0, os.path.abspath(
+ os.path.expanduser(
+ '~/Virtualenvs/leap-client/local/lib/python2.7/'
+ 'site-packages/leap/common')))
+
+# TODO: should add all the virtualenv site-packages to the path
+# as a workaround, install all in your path.
# -- General configuration -----------------------------------------------------
@@ -25,7 +39,11 @@ import sys, os
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
+
+intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None),
+ 'twisted': ('http://twistedsphinx.funsize.net/',
+ None)}
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -48,9 +66,9 @@ copyright = u'2012, The LEAP Encryption Access Project'
# built documents.
#
# The short X.Y version.
-version = '0.1.0'
+version = '0.2.1-dev1'
# The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '0.2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/dev/environment.rst b/docs/dev/environment.rst
index c3868b81..010ccc83 100644
--- a/docs/dev/environment.rst
+++ b/docs/dev/environment.rst
@@ -8,19 +8,20 @@ This document covers how to get an enviroment ready to contribute code to the LE
Cloning the repo
----------------
.. note::
- Stable releases will be in *master* branch (nothing there yet, move on!).
+ Stable releases are in *master* branch.
Development code lives in *develop* branch.
::
git clone git://leap.se/leap_client
+ git checkout develop
Base Dependencies
------------------
Leap client depends on these libraries:
* `python 2.6 or 2.7`
-* `qt4` libraries (see also :ref:`Troubleshooting PyQt install <pyqtvirtualenv>` about how to install inside your virtualenv)
+* `qt4` libraries (see also :ref:`Troubleshooting PySide install <pysidevirtualenv>` about how to install inside your virtualenv)
* `openssl`
* `openvpn <http://openvpn.net/index.php/open-source/345-openvpn-project.html>`_
@@ -28,7 +29,7 @@ Debian
^^^^^^
In debian-based systems::
- $ apt-get install openvpn python-qt4 python-crypto python-openssl
+ $ apt-get install openvpn python-pyside python-openssl
To install the software from sources::
@@ -50,6 +51,10 @@ The basic problem being addressed is one of dependencies and versions, and indir
Read more about it in the `project documentation page <http://pypi.python.org/pypi/virtualenv/>`_.
+.. note::
+ this section could be completed with useful options that can be passed to the virtualenv command (e.g., to make portable paths, site-packages, ...). We also should document how to use virtualenvwrapper.
+
+
Create and activate your dev environment
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -58,36 +63,36 @@ Create and activate your dev environment
$ virtualenv </path/to/new/environment>
$ source </path/to/new/environment>/bin/activate
-Install python dependencies
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. _pysidevirtualenv:
-You can install python dependencies with pip. If you do it inside your working environment, they will be installed avoiding the need for administrative permissions::
+Avoid compiling PySide inside a virtualenv
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- $ pip install -r pkg/requirements.pip
+If you attempt to install PySide inside a virtualenv as part of the rest of the dependencies using pip, basically it will take ages to compile.
-.. _pyqtvirtualenv:
+As a workaround, you can run the following script after creating your virtualenv. It will symlink to your global PySide installation (*this is the recommended way if you are running a debian-based system*)::
-Troubleshooting PyQt install inside a virtualenv
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ $ pkg/postmkvenv.sh
-If you attempt to install PyQt inside a virtualenv using pip, it will fail because PyQt4 does not use the standard setup.py mechanism.
+A second option if that does not work for you would be to install PySide globally and pass the ``--site-packages`` option when you are creating your virtualenv::
-As a workaround, you can run the following script after creating your virtualenv. It will symlink to your global PyQt installation (*this is the recommended way if you are running a debian-based system*)::
+ $ apt-get install python-pyside
+ $ virtualenv --site-packages .
- $ pkg/postmkvenv.sh
+After that, you must export ``LEAP_VENV_SKIP_PYSIDE`` to skip the isntallation::
-A second option if that does not work for you would be to install PyQt globally and pass the ``--site-packages`` option when you are creating your virtualenv::
+ $ export LEAP_VENV_SKIP_PYSIDE=1
- $ apt-get install python-qt4
- $ virtualenv --site-packages .
+And now you are ready to proceed with the next section.
-Or, if you prefer, you can also `download the official PyQt tarball <http://www.riverbankcomputing.com/software/pyqt/download>`_ and execute ``configure.py`` in the root folder of their distribution, which generates a ``Makefile``::
+.. _pydepinstall:
- $ python configure.py
- $ make && make install
+Install python dependencies
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. note::
- this section could be completed with useful options that can be passed to the virtualenv command (e.g., to make portable paths, site-packages, ...).
+You can install python dependencies with ``pip``. If you do it inside your working environment, they will be installed avoiding the need for administrative permissions::
+
+ $ pip install -r pkg/requirements.pip
.. _copyscriptfiles:
@@ -95,7 +100,7 @@ Or, if you prefer, you can also `download the official PyQt tarball <http://www.
Copy script files
-----------------
-The openvpn invocation expects some files to be in place. If you have not installed `leap-client` from a debian package, you must copy these files manually::
+The openvpn invocation expects some files to be in place. If you have not installed `leap-client` from a debian package, you must copy these files manually by now::
$ sudo mkdir -p /etc/leap
$ sudo cp pkg/linux/resolv-update /etc/leap
diff --git a/docs/dev/internationalization.rst b/docs/dev/internationalization.rst
index 1a9af0be..8c584fdd 100644
--- a/docs/dev/internationalization.rst
+++ b/docs/dev/internationalization.rst
@@ -6,7 +6,7 @@ Internationalization
This part of the documentation covers the localization and translation of LEAP Client.
Because we want to *bring fire to the people*, in as many countries and languages as possible.
-Translating the LEAP Client PyQt Application
+Translating the LEAP Client PySide Application
--------------------------------------------
.. raw:: html
@@ -32,7 +32,7 @@ For devs: i18n conventions
.. note::
should say something about our special cases (provider labels and exceptions) when we get decision about it.
-Refer to `pyqt documentation <http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/i18n.html>`_.
+Refer to `pyside documentation <http://qt-project.org/wiki/PySide_Internationalization>`_.
tl;dr;::
@@ -40,15 +40,11 @@ tl;dr;::
for any string that you want to be translated, as long as the instance derives from ``QObject``.
-If you have to translate something that it is not a ``QObject``, use the magic leap ``translate`` method:
-
-
-.. code-block:: python
-
- from leap.util.translations import translate
-
- class Foo(object):
- bar = translate(<Context>, <string>, <comment>)
+.. If you have to translate something that it is not a ``QObject``, use the magic leap ``translate`` method:
+.. .. code-block:: python
+.. from leap.util.translations import translate
+.. class Foo(object):
+.. bar = translate(<Context>, <string>, <comment>)
.. Note about this: there seems to be some problems with the .tr method
@@ -59,9 +55,9 @@ If you have to translate something that it is not a ``QObject``, use the magic l
For i18n maintainers
^^^^^^^^^^^^^^^^^^^^
-You need ``pylupdate4`` and ``lrelease`` for these steps. To get it, in debian::
+You need ``pyside-lupdate`` and ``lrelease`` for these steps. To get it, in debian::
- $ apt-get install pyqt4-dev-tools qt4-linguist-tools
+ $ apt-get install pyside-tools qt4-linguist-tools
If you do not already have it, install the ``transifex-client`` from the cheese shop::
diff --git a/docs/dev/resources.rst b/docs/dev/resources.rst
index 7cfa2b70..e68649a1 100644
--- a/docs/dev/resources.rst
+++ b/docs/dev/resources.rst
@@ -1,7 +1,7 @@
.. _resources:
-PyQt Resource files
-===================
+PySide Resource files
+=====================
Compiling resource/ui files
---------------------------
diff --git a/docs/dev/workflow.rst b/docs/dev/workflow.rst
index 5ceccca4..e36431ff 100644
--- a/docs/dev/workflow.rst
+++ b/docs/dev/workflow.rst
@@ -20,20 +20,22 @@ If you introduce a new dependency, please add it under ``pkg/requirements`` or `
Git flow
--------
-See `A successful git branching model <http://nvie.com/posts/a-successful-git-branching-model/>`_ for more information. The slight modification we make is that release tags are made in the release branch before getting merged to master, rather than getting tagged in master.
+We are basing our workflow on what is described in `A successful git branching model <http://nvie.com/posts/a-successful-git-branching-model/>`_.
.. image:: https://leap.se/code/attachments/13/git-branching-model.png
The author of the aforementioned post has also a handy pdf version of it: `branching_model.pdf`_
+However, we use a setup in which each developer maintains her own feature branch in her private repo. After a code review, this feature branch is rebased onto the authoritative integration branch. Thus, the leapcode repo in leap.se (mirrored in github) only maintains the master and develop branches.
+
A couple of tools that help to follow this process are `git-flow`_ and `git-sweep`_.
.. _`branching_model.pdf`: https://leap.se/code/attachments/14/Git-branching-model.pdf
.. _`git-flow`: https://github.com/nvie/gitflow
.. _`git-sweep`: http://pypi.python.org/pypi/git-sweep
-Merge into integration branch
------------------------------
+Code review and merges into integration branch
+-----------------------------------------------
All code ready to be merged into the integration branch is expected to:
* Have tests
diff --git a/docs/index.rst b/docs/index.rst
index 3e1a603f..e3078929 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,7 +9,7 @@ LEAP Client
Release v\ |version|. (`Impatient? jump to the` :ref:`Installation <install>` `section!`)
.. if you change this paragraph, change it in user/intro too
-The **LEAP Encryption Access Project Client** is a :ref:`GPL3 Licensed <gpl3>` multiplatform client, written in python using PyQt4, that supports the features offered by :ref:`the LEAP Platform <leapplatform>`. Currently is being tested on Linux, support for OSX and Windows will come soon.
+The **LEAP Encryption Access Project Client** is a :ref:`GPL3 Licensed <gpl3>` multiplatform client, written in python using PySide, that supports the features offered by :ref:`the LEAP Platform <leapplatform>`. Currently is being tested on Linux, support for OSX and Windows will come soon.
User Guide
----------
@@ -77,15 +77,12 @@ Different directories and files used for the configuration of the client.
API Documentation
-----------------
-If you are looking for a reference to specific classes or functions, you are likely to find it here
+If you are looking for a reference to specific classes or functions, you are likely to find it here.
.. I should investigate a bit more how to skip some things, and how to give nice format
to the docstrings.
Maybe we should not have sphinx-apidocs building everything, but a minimal index of our own.
-.. note::
- when it's a bit more polished, that's it :)
-
.. toctree::
:maxdepth: 2
diff --git a/docs/pkg/debian.rst b/docs/pkg/debian.rst
index e98032a5..204d4073 100644
--- a/docs/pkg/debian.rst
+++ b/docs/pkg/debian.rst
@@ -10,9 +10,9 @@ Dependencies
------------
* ``openvpn``
-* ``python-qt4``
+* ``python-pyside``
* ``python-crypto``
-* ``python setuptools``
+* ``python-setuptools``
* ``python-requests``
* ``python-openssl``
diff --git a/docs/testers/howto.rst b/docs/testers/howto.rst
index c4a928ed..a3f8da09 100644
--- a/docs/testers/howto.rst
+++ b/docs/testers/howto.rst
@@ -17,6 +17,10 @@ Fetching latest development code
To allow rapid testing in different platforms, we have put together a quick script that is able to fetch latest development code. It more or less does all the steps covered in the :ref:`Setting up a Work Enviroment <environment>` section, only that in a more compact way suitable (ahem) also for non developers.
+.. note::
+
+ In the near future, we will be using ``standalone bundles`` with the ability to self-update.
+
Install dependencies
^^^^^^^^^^^^^^^^^^^^
First, install all the base dependencies plus git, virtualenv and development files needed to compile several extensions::
diff --git a/docs/user/install.rst b/docs/user/install.rst
index 1f0fd831..0467ba8b 100644
--- a/docs/user/install.rst
+++ b/docs/user/install.rst
@@ -6,42 +6,56 @@ Installation
This part of the documentation covers the installation of the LEAP Client.
We assume that you want to get it properly installed before being able to use it.
-Debian package
---------------
-
-.. warning::
-
- No updated debian package yet.
+.. note::
-Once we have a release candidate, probably the easiest way of having the LEAP Client installed will be to install a .deb package under debian or ubuntu systems.
+ The recommended way of installing in the near future will be the standalone bundles, but those are not quite ready yet. Methods described in this page assume you are familiar with python code, and you can find your way through the process of dependencies install. You can refer to the sections :ref:`setting up a working environment <environment>` or :ref:`fetching latest code for testing <fetchinglatest>`.
Distribute & Pip
----------------
-.. warning::
-
- This does not work yet, since we have not released an initial version yet to the cheese shop.
+.. warning:: The package in the cheese shop is from the stable, `0.2.0` release, which is now outdated. You are encouraged to install the development version instead.
-Installing LEAP Client will be as simple as using `pip <http://www.pip-installer.org/>`_ once we have a release candidate::
+Installing LEAP Client is as simple as using `pip <http://www.pip-installer.org/>`_ for the already released versions ::
$ pip install leap-client
-Get the code
-------------
+Debian package
+--------------
.. warning::
- This... won't work either, as-is. This should be the third optional way to install stable releases from master branch. Right now that does not work because there is *nothing* updated in the master branch. Leaving this here since this is what we will be doing, but if you really intend to have a working tree, refer to the sections :ref:`setting up a working environment <environment>` or :ref:`fetching latest code for testing <fetchinglatest>`.
+ The debian package in the leap repositories is from the stable, `0.2.0` release, which is now outdated. You are encouraged to install the development version instead,
+
+First, you need to bootstrap your apt-key::
+
+ # gpg --recv-key 0x1E34A1828E207901 0x485B12FA218E81EB
+ # gpg --list-sigs 0x1E34A1828E207901
+ # gpg --list-sigs 0x485B12FA218E81EB
+ # gpg -a --export 0x1E34A1828E207901 | sudo apt-key add -
+
+Add the archive to your sources.list::
+
+ # echo "deb http://deb.leap.se/debian unstable main" >> /etc/apt/sources.list
+ # apt-get update
+ # apt-get install leap-keyring
+
+And then you can happily install leap-client::
+
+ apt-get install leap-client
+
+Show me the code!
+-----------------
You can get the code from LEAP public git repository ::
- git clone git://leap.se/leap_client
+ $ git clone git://leap.se/leap_client
Or from the github mirror ::
- git clone git://github.com/leapcode/leap_client.git
+ $ git clone git://github.com/leapcode/leap_client.git
Once you have grabbed a copy of the sources, you can install it into your site-packages easily ::
$ pyton setup.py install
+
diff --git a/docs/user/intro.rst b/docs/user/intro.rst
index abb6d487..9461d5f2 100644
--- a/docs/user/intro.rst
+++ b/docs/user/intro.rst
@@ -6,7 +6,7 @@ Introduction
The LEAP Client
---------------
.. if yoy change this, change it also in the index.rst
-The **LEAP Client** is a :ref:`GPL3 Licensed <gpl3>` multiplatform client, written in python using PyQt4, that supports the features offered by :ref:`the LEAP Platform <leapplatform>`. Currently is being tested on Linux, support for OSX and Windows will come soon.
+The **LEAP Client** is a :ref:`GPL3 Licensed <gpl3>` multiplatform client, written in python using PySide, that supports the features offered by :ref:`the LEAP Platform <leapplatform>`. Currently is being tested on Linux, support for OSX and Windows will come soon.
Features
^^^^^^^^
diff --git a/docs/user/running.rst b/docs/user/running.rst
index 35ec1f6d..43f3e87c 100644
--- a/docs/user/running.rst
+++ b/docs/user/running.rst
@@ -3,14 +3,19 @@
Running
==================
-This document dovers how to launch the LEAP Client.
+This document covers how to launch the LEAP Client.
Launching the client
--------------------
-After a successful installation, there should be a launcher called leap-client somewhere in your path::
+After a successful installation, there should be a launcher called `leap-client` somewhere in your path::
% leap-client
+The first time you launch it, it should launch the first run wizard that will guide you through the setup of the LEAP Services.
+
+.. note::
+
+ You will need to enter a valid test provider running the LEAP Platform. You can use the LEAP test service, *https://bitmask.net*
.. _debugmode:
@@ -24,14 +29,13 @@ If you ask for it, you can also have all that debug info in a beautiful file rea
$ leap-client --debug --logfile /tmp/leap.log
-.. warning::
- the following is broken since it will clutter your stdout with all the commands sent to the management interface.
+.. warning
+.. the following is broken since it will clutter your stdout with all the commands sent to the management interface.
See bug #1232
-If you want to increment the level of verbosity passed to openvpn, you can do::
-
-
- $ leap-client --openvpn-verbosity 4
+.. not working...
+.. If you want to increment the level of verbosity passed to openvpn, you can do::
+.. $ leap-client --openvpn-verbosity 4
Options
------------