Merge lp:~hackbinary/openobject-doc/trunk into lp:~openerp-dev/openobject-doc/trunk

Proposed by David on 2013-10-31
Status: Needs review
Proposed branch: lp:~hackbinary/openobject-doc/trunk
Merge into: lp:~openerp-dev/openobject-doc/trunk
Diff against target: 40 lines (+7/-7)
1 file modified
source/contribute/08_documentation_process.rst (+7/-7)
To merge this branch: bzr merge lp:~hackbinary/openobject-doc/trunk
Reviewer Review Type Date Requested Status
OpenERP R&D Team 2013-10-31 Pending
Review via email:
To post a comment you must log in.

Unmerged revisions

1762. By David on 2013-10-31

 changed Tiny to Open ERP S.A
 launchpad repository address
 minor gramatical errors

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'source/contribute/08_documentation_process.rst'
2--- source/contribute/08_documentation_process.rst 2011-09-01 08:19:52 +0000
3+++ source/contribute/08_documentation_process.rst 2013-10-31 21:51:25 +0000
4@@ -71,11 +71,11 @@
5 Anyone can be an author and write a complete book or just one or several
6 chapters on particular aspects of OpenERP. Chapters are then review
8-Authors from Tiny
10+Authors from OpenERP S.A.
13-At Tiny (the editor of OpenERP), each employee can write a few chapters based
14-on new module he wrote for specific customers, at the end of the project. As
15+At OpenERP S.A. each employee can write a few chapters based
16+on modules she wrote for specific customers, at the end of the project. As
17 employees get a salary to write these chapters during their working hours,
18 author rights are computed slightly differently:
20@@ -96,7 +96,7 @@
21 The Sources for the documentation can be downloaded from:
22 ::
24- bzr branch lp:openobject-doc
25+ bzr branch bzr branch lp:~openerp-dev/openobject-doc/trunk
27 We use Sphinx_, a documentation generator, to build
28 the documentation. So, Sphinx should be installed on your system and you should
29@@ -203,9 +203,9 @@
30 FAQ
31 +++
33-.. describe:: How much items can we expect to sell for a book ?
34+.. describe:: How many books can we expect to sell ?
36-The first French book we wrote is sold at 500 items per month. It's good as it
37+The first French book we wrote sold 500 per month. It was good as it
38 was our the first book on OpenERP but we can expect better results with an
39 English version. So probably between 250 and 1500 items per month for an
40 English book.


People subscribed via source and target branches

to all changes: