diff --git a/CHANGES.txt b/CHANGES.txt index d88dae84b..0fe40305f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,278 @@ +2.2.0 (2017-03-02) +================== + +** New Feature + * [BK-918] - Standard look for custom Aloha Blocks + * [BK-977] - Update wiki documentation for Booktype 2.0 + * [BK-989] - Create new page for online book reading + * [BK-1007] - Django signals for different events + * [BK-1051] - What to do with messaging application + * [BK-1077] - Manage book permissions + * [BK-1086] - Convert old style Booktype project layout to new one + * [BK-1126] - Autosaving in Booktype editing + * [BK-1222] - Design for Messaging application + * [BK-1545] - Frontmatter / Titelei: standard set pages in front of every book + * [BK-1574] - Import EPUB or .docx into existing book as a new chapter or chapters + * [BK-1607] - Homepage: List just the books and groups for the language that the reader selects + * [BK-1608] - Groups could have a language setting + * [BK-1684] - Add a button to remove a book from a group + * [BK-2009] - Implement interface in editor to save section settings + * [BK-2030] - Show comment icon in table of contents IF comments are in chapter's content + * [BK-2034] - Create ability to control permissions from JS app + * [BK-2089] - Implement API authentication mechanism + * [BK-2090] - Integrate swagger.io with the API + * [BK-2140] - Add ability to edit color of book statuses + * [BK-2141] - Show an indicator in TOC that chapter has comments + * [BK-2144] - Create export chapter's content option from TOC + * [BK-2152] - Add ability to implement cover for pdfreactor screenpdf + * [BK-2153] - Implement epub/docx importing through API + * [BK-2165] - Set unified history the default one in book history screen + +** Bug + * [BK-579] - Preview of PDF cover does not work in Cover Manager + * [BK-662] - Opera12.15 browser -> pasted hyperlinks are becoming plain text + * [BK-709] - URL address is using the first version of chapter in place of new name of chapter for automatic URL address + * [BK-766] - User with email not in Gravatar database get error instead of "no avatar image" or smth like that + * [BK-792] - Problems with Cross Site Request Forgery protection on development machine + * [BK-973] - Underline tag is removed but is not replaced with CSS definition + * [BK-1299] - Diff error when comparing revisions + * [BK-1331] - Add error pop-ups for pencil and eye icons in the Home view + * [BK-1345] - Unclear button in image insert window makes image vanish + * [BK-1404] - mPDF: page 1 must start on the right side (not left) + * [BK-1407] - Tidy chokes on HTML5 figure and figcaption tags + * [BK-1421] - Prevent executing group of requests on server before first request result will not appear on clients. + * [BK-1423] - Used font is not marked in pull down + * [BK-1439] - Hard-coded references to booki.cc site in source code + * [BK-1449] - Test failure in python-ooxml 0.12 + * [BK-1486] - Fav icon for instance does not upload in Control Center + * [BK-1538] - Chapter revisions diff displays without some styles. + * [BK-1578] - List of book admins is not shown on Book info page + * [BK-1590] - Fix TOC in DraftView and FullView + * [BK-1602] - Contributors do not appear on Book Detail page when not Superuser + * [BK-1637] - 'Default visibility' setting does not have the expected effect + * [BK-1657] - Control Centre labels admins as superusers + * [BK-1669] - Firefox Browse button does not fit inside field height in various pages + * [BK-1683] - Profile buttons wrap on small screens + * [BK-1686] - Toolbar buttons do not wrap well when the display is narrow + * [BK-1688] - Deprecation warning in debug toolbar + * [BK-1695] - Book Info page gives publication date for a book which has not been published + * [BK-1699] - Split chapter functionality does not work if chapter has endnotes inside + * [BK-1714] - In Book Settings, Publisher appears under both Metadata and Additional Metadata + * [BK-1718] - Table of Contents in draft view is broken + * [BK-1720] - Possible indentation error in custom.py + * [BK-1723] - Academic and custom themes do not allow space for cover image in screen PDF + * [BK-1727] - TOC in ePub contains "Guide"? + * [BK-1728] - preload.css is not copied to static files path at installation time + * [BK-1729] - Error parsing messaging template during compression of static files + * [BK-1732] - Copy&paste text into Aloha: character styles are NOT preserved when track changes on + * [BK-1734] - Definition for track icon is missing + * [BK-1737] - Export History shows the same timestamp twice + * [BK-1739] - Non-approved covers can be selected in the Export wizard + * [BK-1751] - Impossible overwrite profile image + * [BK-1768] - DraftView should do word-wrapping on long words + * [BK-1786] - Instance logs show several RemovedInDjango18Warning messages + * [BK-1789] - EPUB and MOBI outputs have duplicate 'Guide' below Table of Contents + * [BK-1792] - Strange behaviour of sidebar tab when using Table plugin + * [BK-1797] - There is no role name for role_key DEFAULT_ROLE_registered_users + * [BK-1799] - Warnings from celery seen in supervisor log + * [BK-1805] - createuser command throws an error even when successful + * [BK-1833] - Debian package postinst should not use localised answers as triggers + * [BK-1843] - License link points to table of contents before a license is selected + * [BK-1881] - It's impossible to delete 'nbsp', if there is no another char before. + * [BK-1886] - Disable insert image, horizontal line, page break and split chapter menus when endnotes's body is in focus + * [BK-1890] - My Dashboard menu item should not open My Dashboard in a new tab + * [BK-1899] - Set attachments name during docx import to lowercase + * [BK-1918] - EPUB output does not include ISBN from metadata settings + * [BK-1922] - Internal link feature does not work for print or screen PDF outputs + * [BK-1929] - 'No module named bookizip' error on bookrename and bookexport commands + * [BK-1933] - Imported covers don't show their names in publish screen settings + * [BK-1982] - Multi-user bug with theme selection + * [BK-1984] - Same interface string defined in multiple places + * [BK-1985] - Insert Comment button vanishes after first comment is made + * [BK-1986] - Theme selector overlapped by reset button in sidebar panel + * [BK-1994] - Init infobox error + * [BK-1999] - JS console error when close chapter history tab + * [BK-2000] - CHAPTER_STATUS_DEFAULT must be contained into CHAPTER_STATUS_LIST + * [BK-2005] - Steps of the modal wizards should be translatable + * [BK-2006] - Rename JS vars to satisfy camel case style for draft and full views + * [BK-2012] - Raw HTML editor did not work in Firefox 48.0 for certain book + * [BK-2017] - Table of contents in editor is sometimes very slow to load, or does not load at all + * [BK-2018] - 'Not well formed' errors in browser console for certain files in editor + * [BK-2019] - TypeError: define is not a function + * [BK-2023] - Image gallery in the editor loads raw images + * [BK-2033] - Image gallery gives ability to upload not image file, which is wrong + * [BK-2038] - Password change notification sends new password in plain text email + * [BK-2041] - Custom style does not set valid defaults for EPUB css + * [BK-2045] - Book visibility /CORE + * [BK-2046] - Link to user manual is out of date, links should default to https + * [BK-2055] - Image editor fails in converter scripts (mpdf) when images is missing + * [BK-2056] - Image editor won't open if another was left opened + * [BK-2057] - Image editor popup overlaps with aloha toolbar when content starts with an image + * [BK-2065] - Sputnik first request hangs under some strange situation + * [BK-2068] - Inconsistency in blockquote lines and alignments + * [BK-2075] - Clean install may be broken on Debian/Ubuntu + * [BK-2077] - Tick box has no effect! + * [BK-2080] - Fresh install of dev profile broken by sqlparse conflict with django debug toolbar + * [BK-2081] - Lock Booktype requirements to avoid breaking installation process + * [BK-2094] - Automatic numbering for figures is the same for all images in one chapter. + * [BK-2098] - Registration doesn't work after django 1.9 update + * [BK-2100] - Lock django-compressor version to 2.0 + * [BK-2101] - Book still accessible via URL also it is hidden + * [BK-2102] - Invitation doesn't work when invited user is logged in + * [BK-2103] - TOC doesn't work properly on epub.js library with Booktype epub files + * [BK-2110] - Fix broken offline compression + * [BK-2111] - Metadata template tag is not returning safe html content + * [BK-2116] - New Reader: does not display after upload + * [BK-2117] - Improve edit link appear logic in the book draft view + * [BK-2119] - Remove RemovedInDjango110Warning warnings + * [BK-2123] - Remove redundant images from final epub file + * [BK-2131] - Don't remove cover during redundant image cleanup + * [BK-2132] - Initial epub sometimes has not valid nav.xhtml + * [BK-2135] - Footer text is out of date + * [BK-2137] - Spaces caused by comments are not stripped correctly from initial epub + * [BK-2138] - Add ability for including pdfreactor screenpdf as output + * [BK-2143] - Fix an issue inside text striping method for bas epub writerplugin + * [BK-2146] - ImageEditorWriterPlugin is removing theme images + * [BK-2148] - Deleting group in CC also removes all related books + * [BK-2149] - Remove errors during group creation/removing + * [BK-2151] - Refactor html in panel_publish template + * [BK-2158] - Tables are not well recognized by aloha editor plugin + * [BK-2160] - Endnotes are wrongly imported twice + * [BK-2161] - Insert Table options are shown when edit cursor is inside another table + * [BK-2166] - Revision 'Next' button always skips to the last revision, not the next + * [BK-2167] - Interface still refers to legacy Versions feature in several places + * [BK-2168] - Info page shows spurious Published: timestamp + * [BK-2169] - Info page shows misleading book status of 'New' + * [BK-2171] - Snapshot .deb packages no longer work + * [BK-2172] - Editor tooltip says 'Change Heading' when it also changes paragraph styles + * [BK-2173] - Wrong label in quote box "Set an author for this Quote" and issue with citation importer + * [BK-2175] - Change import in SecurityMiddleware + * [BK-2176] - Remove data-id attribute from endnote after internal link was created + +** Epic + * [BK-2008] - Sections must have settings to define some custom behaviours on each output + * [BK-2084] - Create REST API to communicate with other platforms + +** Task + * [BK-751] - Create objavi installation script (createobjavi) + * [BK-1041] - Convert old code from booki application to booktype + * [BK-1261] - Create official Debian package of Booktype 2.x + * [BK-1302] - Make official Debian/Ubuntu package of python-ooxml + * [BK-1507] - Search & Replace function in Editor (chapterwise possibly in the whole book) + * [BK-1530] - Tests for new permission API + * [BK-1557] - Dashboard and Home Screen differentation + * [BK-1701] - Document how to create a Booktype theme design + * [BK-1760] - Profile image cache issue + * [BK-1770] - Slight modifications of Academic theme + * [BK-1906] - Force browser to download exported files + * [BK-1909] - Removing icejs-plugin from list of aloha enabled plugins produces errors + * [BK-1996] - Update .po file headers for Booktype 2.1 + * [BK-1997] - Update contributor documentation + * [BK-2014] - Infobox: remove paragraph tag in caption + * [BK-2032] - Some fileupload listeners attached to the whole document + * [BK-2040] - Add support for Django 1.9 + * [BK-2060] - Use md5 as key for edited image cache + * [BK-2063] - Fix requests and redis versions in requirements file + * [BK-2064] - Make all import/convert constants configurable + * [BK-2072] - Add ability for including pdfreactor as output + * [BK-2088] - Fix/improve broken and abandoned tests + * [BK-2091] - Update core themes + * [BK-2096] - Change text input to dropdown in columns settings + * [BK-2097] - Rename and re-order drop down menu for paragraph styles. Part II + * [BK-2114] - Section settings: tick box for "chapter start on right page" or just "on new page" + * [BK-2122] - User stats by month: new users + * [BK-2134] - Remove settings deprecated TEMPLATES_DIRS setting + * [BK-2163] - Error during docx import + * [BK-2174] - Turn off autosave by default in editor to avoid saving revision issues + +** Improvement + * [BK-342] - 'Add Member' button for Groups menu + * [BK-374] - Index creation tool + * [BK-394] - Updates for Booktype 2.0.0 manual + * [BK-640] - Settings tab could offer more languages + * [BK-794] - Develop basic Aloha plugins for the new editing environment + * [BK-806] - Custom configuration should be stored in database + * [BK-832] - Cover image visible on the front end must be defined by Cover Manager + * [BK-834] - Panels in the editing environment must be defined in local template files + * [BK-835] - Reorder TOC function should be part of TOC class + * [BK-836] - Prune old converter tasks + * [BK-1153] - Remove bundled fonts from Debian/Ubuntu package + * [BK-1154] - Aloha and jQuery clean-up for distribution + * [BK-1272] - Admin could add a user to a group directly from the control centre + * [BK-1386] - Image captions / information + * [BK-1412] - Profile skeletons could make user-modifable settings more obvious + * [BK-1426] - Add a short message to the automatically sent login data mail + * [BK-1455] - Permissions for changing themes + * [BK-1460] - Only use default image for gravatar service when server is publicly accessible + * [BK-1464] - Move chat channel from the booki project + * [BK-1477] - Images also for Groups + * [BK-1481] - Rename a book as NON-SuperUser? + * [BK-1496] - Editable Imprint + * [BK-1498] - Data protection & privacy (for and on Booktype instance) + * [BK-1598] - Interface to edit text blocks on the webpage + * [BK-1599] - Invitation to books does not work with existing Accounts + * [BK-1636] - Metadata notice (to complete) and link on publish page + * [BK-1671] - Select/Unselect option in the role editor + * [BK-1689] - Some collected bugs / improvements - by Peter Baumgartner + * [BK-1730] - Make templates to be standalone packages + * [BK-1731] - Hide link to registration when set to admin registration only + * [BK-1733] - Close chapter dialog lacks "cancel" button + * [BK-1742] - Have a default email subject in the settings for notification messages + * [BK-1790] - Clarify default roles for anonymous and registered users + * [BK-1803] - Do not show header on the separator page in PDF + * [BK-1815] - Icon alignment + * [BK-1829] - Directionality should be implied by book language setting + * [BK-1830] - Book settings should include field for 'Table of Contents' string + * [BK-1844] - Show instance time zone near to time stamps + * [BK-1847] - Generate developer documentation from existing docstrings + * [BK-1850] - Breadcrumps to the image overview + * [BK-1863] - The change of view in dashboard book list should save selected view + * [BK-1864] - Groups add book modal should contain ajax search with autocomplete and button for loading more books + * [BK-1897] - Add Korean to language choices, fix Czech and Norwegian entries + * [BK-1902] - Insert Table feature could allow a caption + * [BK-1904] - Theme info.json and panel should state which languages are supported + * [BK-1905] - Custom theme could allow font size setting for body text + * [BK-1912] - Catch event when user wants to close tab and he has unsaved changes in the editor + * [BK-1916] - Academic theme needs improvements to EPUB styling + * [BK-1917] - Support e-readers that do not understand subtitle metadata + * [BK-1919] - EPUB Table of Contents could have classes to enable styling + * [BK-1925] - Separate ISBN for each output format + * [BK-1930] - Blockquote should be handled in a standards compliant way + * [BK-1936] - Improve logic for draft and full page views + * [BK-1964] - Email generated by 'Invite people' wizard should be more informative + * [BK-1968] - Add version for js files which include using requirejs + * [BK-2007] - Merge Amnesty cover manager features to core + * [BK-2010] - Improve the converter scripts to handle the sections settings correctly + * [BK-2020] - Improve converter to handle images which have not relative src + * [BK-2021] - Create folders for images if they don't exist + * [BK-2022] - Draft and full view don't support themes. + * [BK-2043] - Activity stream + * [BK-2044] - Soft Hyphenation (manually inserted hyphenation) + * [BK-2051] - Section settings supporting structure + * [BK-2058] - Improve image compression for image editor in converter scripts + * [BK-2067] - Allow creating a cite just when user creates a quote + * [BK-2083] - Strip linebreak tags when exporting to PDFreactor? + * [BK-2099] - Lock dev requirements + * [BK-2104] - Logout view should support `next` url param + * [BK-2105] - Small screen and usability improvements + * [BK-2107] - Frontpage url should be customizable + * [BK-2125] - Create epub converter plugin to drop not allowed tags + * [BK-2130] - Handle text in the epub chapter's root which is not covered with tags + * [BK-2139] - Implement custom colors for chapter status and display in TOC + * [BK-2142] - Autosave functionality should be modified from control center and book settings + * [BK-2145] - Chapter's history tab should use new unified history mode + * [BK-2159] - Update settings to better fit https installation + * [BK-2162] - Allow authorname and reference class in docx importer and booktype editor + * [BK-2164] - Allow infoboxes be imported from docx files + +** Technical task + * [BK-799] - Aloha plugin for inserting special characters + * [BK-1046] - Move logging functionality to new booktype application + +** Document + * [BK-2157] - Add information to PDF renderer installation section + + 2.1.0 (2016-08-01) ================== - theme support @@ -6,12 +281,13 @@ 2.0.0 (2015-10-12) ================== - Complete rewrite. Please check issue tracker for changes. + Complete rewrite. Please check issue tracker for changes or see full changelog here + https://github.com/sourcefabric/Booktype/compare/v1.6.1...v2.0.0 1.6.1 (2013-06-02) ================ Read INSTALL file about instructions how to upgrade to version 1.6.1. - + - BK-136 Add named URL patterns for all pages - BK-510 Footnotes disappearing - BK-546 Booktype.pro: control center does not save @@ -144,7 +420,7 @@ - BK-516 Disable Lulu interface in the configuration - BK-515 Do not escape strings in the notes tab - BK-514 Escape strings while formatting messages in JavaScript code for the editor - + 1.5.4 (2013-02-06) ================== @@ -246,7 +522,7 @@ - BK-332 Management command to create Booktype user - BK-331 Create configuration variables to limit number of users and books - BK-328 Load initial language data as part of South migration - - BK-327 Load initial license data as South data migration + - BK-327 Load initial license data as South data migration 1.5.3 (2012-07-01) ================== @@ -320,7 +596,7 @@ - BK-169 Separate content of publish tab in new file - BK-168 View profile page has wrong link to rss feed - BK-167 Change info in setup.py for PyPI repository - + 1.5.2 (2012-04-06) ================== Read INSTALL file about instructions how to upgrade to version 1.5.2. @@ -341,7 +617,7 @@ 1.5 (2012-02-15) ================ - - Release 1.5 to PyPi , renamed from Booki to BookType + - Release 1.5 to PyPi , renamed from Booki to BookType 0.3 (2010-03-15) @@ -358,4 +634,3 @@ ================ - Initial Release for 0.1 test release to pypi [Andy Nicholson] - diff --git a/LICENSE.txt b/LICENSE.txt index dba13ed2d..923414255 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,35 +1,35 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 +GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Copyright (C) 2007 Free Software Foundation, Inc. +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. - Preamble + Preamble - The GNU Affero General Public License is a free, copyleft license for +The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software. - The licenses for most software and other practical works are designed +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are 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. - When we speak of free software, we are referring to freedom, not +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. - Developers that use our General Public Licenses protect your rights +Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software. - A secondary benefit of defending all users' freedom is that +A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and @@ -39,7 +39,7 @@ The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public. - The GNU Affero General Public License is designed specifically to +The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the @@ -47,48 +47,48 @@ users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version. - An older license, called the Affero General Public License and +An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license. - The precise terms and conditions for copying, distribution and +The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS + TERMS AND CONDITIONS - 0. Definitions. +0. Definitions. - "This License" refers to version 3 of the GNU Affero General Public License. +"This License" refers to version 3 of the GNU Affero General Public License. - "Copyright" also means copyright-like laws that apply to other kinds of +"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 +"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 +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 +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 +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 +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" +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 @@ -97,18 +97,18 @@ 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. +1. Source Code. - The "source code" for a work means the preferred form of the work +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 +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 +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 @@ -119,7 +119,7 @@ implementation is available to the public in source code form. A (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 "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 @@ -132,16 +132,16 @@ 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 +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 +The Corresponding Source for a work in source code form is that same work. - 2. Basic Permissions. +2. Basic Permissions. - All rights granted under this License are granted for the term of +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 @@ -149,7 +149,7 @@ 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 +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 @@ -160,19 +160,19 @@ 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 +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. +3. Protecting Users' Legal Rights From Anti-Circumvention Law. - No covered work shall be deemed part of an effective technological +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 +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 @@ -180,9 +180,9 @@ 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. +4. Conveying Verbatim Copies. - You may convey verbatim copies of the Program's source code as you +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 @@ -190,37 +190,37 @@ 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, +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. +5. Conveying Modified Source Versions. - You may convey a work based on the Program, or the modifications to +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. +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". +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. +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. +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 +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 @@ -230,59 +230,59 @@ 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. +6. Conveying Non-Source Forms. - You may convey a covered work in object code form under the terms +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 +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 +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, @@ -295,7 +295,7 @@ 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, +"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 @@ -303,7 +303,7 @@ 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 +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 @@ -314,7 +314,7 @@ 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 +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 @@ -322,15 +322,15 @@ 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, +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. +7. Additional Terms. - "Additional permissions" are terms that supplement the terms of this +"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 @@ -339,41 +339,41 @@ 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 +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 +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 +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 +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 +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 +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 +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. +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 +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 @@ -383,46 +383,46 @@ 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 +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 +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. +8. Termination. - You may not propagate or modify a covered work except as expressly +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 +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 +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 +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. +9. Acceptance Not Required for Having Copies. - You are not required to accept this License in order to receive or +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, @@ -431,14 +431,14 @@ 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. +10. Automatic Licensing of Downstream Recipients. - Each time you convey a covered work, the recipient automatically +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 +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 @@ -448,7 +448,7 @@ 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 +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 @@ -456,13 +456,13 @@ rights granted under this License, and you may not initiate litigation any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - 11. Patents. +11. Patents. - A "contributor" is a copyright holder who authorizes use under this +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 +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, @@ -472,19 +472,19 @@ 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 +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 +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, +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, @@ -498,7 +498,7 @@ 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 +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 @@ -506,7 +506,7 @@ 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 +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 @@ -521,13 +521,13 @@ 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 +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. +12. No Surrender of Others' Freedom. - If conditions are imposed on you (whether by court order, agreement or +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 @@ -537,9 +537,9 @@ 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. Remote Network Interaction; Use with the GNU General Public License. +13. Remote Network Interaction; Use with the GNU General Public License. - Notwithstanding any other provision of this License, if you modify the +Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding @@ -550,7 +550,7 @@ shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph. - Notwithstanding any other provision of this License, you have +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 General Public License into a single combined work, and to convey the resulting work. The terms of this @@ -558,14 +558,14 @@ License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License. - 14. Revised Versions of this License. +14. Revised Versions of this License. - The Free Software Foundation may publish revised and/or new versions of +The Free Software Foundation may publish revised and/or new versions of the GNU Affero 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 +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered @@ -574,19 +574,19 @@ Foundation. If the Program does not specify a version number of the GNU Affero 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 +If the Program specifies that a proxy can decide which future versions of the GNU Affero 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 +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. +15. Disclaimer of Warranty. - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +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, @@ -595,9 +595,9 @@ 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. +16. Limitation of Liability. - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +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 @@ -607,47 +607,47 @@ 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. +17. Interpretation of Sections 15 and 16. - If the disclaimer of warranty and limitation of liability provided +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 + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs +How to Apply These Terms to Your New Programs - If you develop a new program, and you want it to be of the greatest +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 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. - - Copyright (C) + +Copyright (C) - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero 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 free software: you can redistribute it and/or modify +it under the terms of the GNU Affero 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 Affero General Public License for more details. +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 Affero General Public License for more details. - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. - If your software can interact with users remotely through a computer +If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive @@ -655,7 +655,7 @@ of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements. - You should also get your employer (if you work as a programmer) or school, +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 AGPL, see . diff --git a/VERSION.txt b/VERSION.txt index f40d00277..5aeb8092d 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -Booktype 2.1.0 +Booktype 2.2.0 diff --git a/docs/conf.py b/docs/conf.py index 9f8101c0c..897c25e5d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -63,9 +63,9 @@ # built documents. # # The short X.Y version. -version = '2.1' +version = '2.2' # The full version, including alpha/beta/rc tags. -release = '2.1.0' +release = '2.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/lib/booki/__init__.py b/lib/booki/__init__.py index f59844cd2..4178b857d 100644 --- a/lib/booki/__init__.py +++ b/lib/booki/__init__.py @@ -1,3 +1,3 @@ # Booktype package -# XXX can this be done from setup.py ? -version = (2,1,0) +# XXX can this be done from setup.py ? +version = (2,2,0) diff --git a/lib/booktype/__init__.py b/lib/booktype/__init__.py index f928dcb52..e87ee619c 100644 --- a/lib/booktype/__init__.py +++ b/lib/booktype/__init__.py @@ -1 +1 @@ -version = (2,1,0) +version = (2,2,0) diff --git a/lib/booktypecontrol/__init__.py b/lib/booktypecontrol/__init__.py index f928dcb52..e87ee619c 100644 --- a/lib/booktypecontrol/__init__.py +++ b/lib/booktypecontrol/__init__.py @@ -1 +1 @@ -version = (2,1,0) +version = (2,2,0) diff --git a/setup.py b/setup.py index d3e911797..77acebd03 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ def read(*rnames): setup( name="Booktype", - version="2.1.0", + version="2.2.0", packages=find_packages('lib'), # include all packages under lib package_dir={'': 'lib'}, # tell distutils packages are under lib