| 1 | --- OldDocHelp 2008-03-10 20:52:47.000000000 -0700 |
|---|
| 2 | +++ NewDocHelp 2008-03-10 22:11:26.000000000 -0700 |
|---|
| 3 | @@ -16,32 +16,63 @@ |
|---|
| 4 | |
|---|
| 5 | .. |contribute_docs| image:: 1.0/RoughDocs/contribute_docs.jpg |
|---|
| 6 | |
|---|
| 7 | +Three Ways to Help |
|---|
| 8 | +------------------ |
|---|
| 9 | + |
|---|
| 10 | There are three ways to help make and maintain TurboGears documentation: |
|---|
| 11 | |
|---|
| 12 | #. Comment! Pages should all have a comments box at the bottom. Add your |
|---|
| 13 | comments if you see a problem. |
|---|
| 14 | |
|---|
| 15 | -#. Add to the RoughDocs section for the version of TurboGears you're using. |
|---|
| 16 | - Anyone can add and edit documentation there. Please do! |
|---|
| 17 | +.. Note:: Note: Comment sections have been increasingly locked up due to wiki |
|---|
| 18 | + spamming. Sorry for this inconvenience. |
|---|
| 19 | + |
|---|
| 20 | +2. `Add to the RoughDocs`_ section for the version of TurboGears you're using. |
|---|
| 21 | + Anyone can add and edit documentation there following the directions below. |
|---|
| 22 | + Please do! |
|---|
| 23 | |
|---|
| 24 | #. Become an editor! Knowledgeable TurboGears users with the interest and |
|---|
| 25 | - aptitude can become editors. Editors are able to edit the "official" docs. |
|---|
| 26 | + aptitude can become editors. Editors are able to edit the "official" docs. |
|---|
| 27 | + To get involved, visit the `documentation team page |
|---|
| 28 | + <DocTeam>`_. |
|---|
| 29 | + |
|---|
| 30 | + |
|---|
| 31 | +.. _Add to the RoughDocs: |
|---|
| 32 | + |
|---|
| 33 | +How to Add or Change Documentation |
|---|
| 34 | +---------------------------------- |
|---|
| 35 | + |
|---|
| 36 | + |
|---|
| 37 | +Putting Docs in the Right Places |
|---|
| 38 | +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|---|
| 39 | + |
|---|
| 40 | +All docs about the TurboGears framework *must* have a version number at the |
|---|
| 41 | +beginning of the page name (i.e the last part of the URL), in sub wiki syntax. |
|---|
| 42 | +If you write a page about Apache deployment for TurboGears 1.0, that page |
|---|
| 43 | +should be called "``1.0/ApacheDeployment``". |
|---|
| 44 | + |
|---|
| 45 | +New articles should be linked from the RoughDocs page for the applicable |
|---|
| 46 | +version (e.g. `1.0/RoughDocs <1.0/RoughDocs>`_) until they have been reviewed |
|---|
| 47 | +and approved by the editors and given "official" status. This also ensures that |
|---|
| 48 | +new documents don't get lost and others can benefit from and/or contribute to |
|---|
| 49 | +them immediately. |
|---|
| 50 | + |
|---|
| 51 | +Multi-page documents should use the sub wiki format to reflect the pages, e.g. |
|---|
| 52 | +"``1.0/20MinuteWiki/Page1``". |
|---|
| 53 | + |
|---|
| 54 | |
|---|
| 55 | -If you're looking to contribute docs in RoughDocs or as an editor, be sure |
|---|
| 56 | -to read the following sections and the `documentation team page <DocTeam>`_. |
|---|
| 57 | +Documentation Format & Style Guidelines |
|---|
| 58 | +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|---|
| 59 | |
|---|
| 60 | +In an effort to keep the documentation consistent online and useful offline, |
|---|
| 61 | +please follow these conventions: |
|---|
| 62 | |
|---|
| 63 | -Documentation Format |
|---|
| 64 | --------------------- |
|---|
| 65 | |
|---|
| 66 | -All documentation should be in ReStructuredText format, not the standard wiki |
|---|
| 67 | -markup. This is very important for ensuring the long term value of the docs we |
|---|
| 68 | -write. We expect to move to another documentation system at some point in the |
|---|
| 69 | -future, or we might want to convert the docs to printable form. The use of |
|---|
| 70 | -ReStructuredText will allow us to do that without complex document conversions. |
|---|
| 71 | +All documentation should be in *ReStructuredText (ReST)* format, **not the standard wiki |
|---|
| 72 | +markup** [#]_. |
|---|
| 73 | |
|---|
| 74 | There are two templates that should be used to get you going with your document. |
|---|
| 75 | -Both templates set the format to ReST and they also include the proper code to |
|---|
| 76 | +Both templates set the format to `ReST Formatting`_ and they also include the proper code to |
|---|
| 77 | include the page comment form. |
|---|
| 78 | |
|---|
| 79 | OfficialTemplate |
|---|
| 80 | @@ -51,8 +82,8 @@ |
|---|
| 81 | For any contributed or unofficial docs. |
|---|
| 82 | |
|---|
| 83 | |
|---|
| 84 | -ReST Syntax |
|---|
| 85 | -~~~~~~~~~~~ |
|---|
| 86 | +Designating ReST Syntax |
|---|
| 87 | +``````````````````````` |
|---|
| 88 | |
|---|
| 89 | Please note that if you choose not to use one of these templates you will have |
|---|
| 90 | to explicitly tell MoinMoin that you are using ReST syntax. This is done by |
|---|
| 91 | @@ -60,17 +91,11 @@ |
|---|
| 92 | |
|---|
| 93 | #format rst |
|---|
| 94 | |
|---|
| 95 | -MoinMoin includes a page with a `ReStructuredText primer`_ and also includes |
|---|
| 96 | -information on the `use of ReST in MoinMoin`_. |
|---|
| 97 | - |
|---|
| 98 | -Please also note the addtional notes on proper ReST formatting below. |
|---|
| 99 | - |
|---|
| 100 | -.. _restructuredtext primer: HelpOnParsers/ReStructuredText/RstPrimer |
|---|
| 101 | -.. _use of rest in moinmoin: HelpOnParsers/ReStructuredText |
|---|
| 102 | +Proper `ReST formatting`_ syntax is discussed below. |
|---|
| 103 | |
|---|
| 104 | |
|---|
| 105 | Page Status |
|---|
| 106 | -~~~~~~~~~~~ |
|---|
| 107 | +``````````` |
|---|
| 108 | |
|---|
| 109 | All documentation pages should display their editorial status right below the |
|---|
| 110 | main heading (like this page does). Use the `field lists syntax`_ for the |
|---|
| 111 | @@ -89,7 +114,7 @@ |
|---|
| 112 | |
|---|
| 113 | |
|---|
| 114 | Table of Contents |
|---|
| 115 | -~~~~~~~~~~~~~~~~~ |
|---|
| 116 | +````````````````` |
|---|
| 117 | |
|---|
| 118 | All pages with longer than a screen page should have a table of contents. |
|---|
| 119 | This will be generated automatically by the wiki software from the section |
|---|
| 120 | @@ -102,84 +127,70 @@ |
|---|
| 121 | be included in the table of contents. |
|---|
| 122 | |
|---|
| 123 | |
|---|
| 124 | -Putting Docs in the Right Places |
|---|
| 125 | --------------------------------- |
|---|
| 126 | - |
|---|
| 127 | -All docs about the TurboGears framework *must* have a version number at the |
|---|
| 128 | -beginning of the page name (i.e the last part of the URL), in sub wiki syntax. |
|---|
| 129 | -If you write a page about Apache deployment for TurboGears 1.0, that page |
|---|
| 130 | -should be called "``1.0/ApacheDeployment``". |
|---|
| 131 | - |
|---|
| 132 | -New articles should be linked from the `RoughDocs <1.0/RoughDocs>`_ page for the |
|---|
| 133 | -proper version as long as they haven't been checked and approved by the editors |
|---|
| 134 | -and given an "official" status. This also ensures that new documents don't get |
|---|
| 135 | -lost and others can benefit from them and/or contribute. |
|---|
| 136 | - |
|---|
| 137 | -Multi-page documents should use the sub wiki format to reflect the pages, e.g. |
|---|
| 138 | -"``1.0/20MinuteWiki/Page1``". |
|---|
| 139 | - |
|---|
| 140 | - |
|---|
| 141 | -Style Guidelines |
|---|
| 142 | ----------------- |
|---|
| 143 | - |
|---|
| 144 | -In an effort to keep the documentation consistent online and useful offline, |
|---|
| 145 | -please follow these conventions: |
|---|
| 146 | - |
|---|
| 147 | |
|---|
| 148 | Language & Style |
|---|
| 149 | -~~~~~~~~~~~~~~~~ |
|---|
| 150 | +```````````````` |
|---|
| 151 | |
|---|
| 152 | #. **Please pay attention to proper spelling, grammar, and style!** |
|---|
| 153 | - For example, all full sentences should end with a full stop, proper names |
|---|
| 154 | - should be capitalized, common word contractions should be written out |
|---|
| 155 | - (i.e. "you should" instead of "you'd") and so on. |
|---|
| 156 | - |
|---|
| 157 | -#. Avoid too many abbreviations and jargon speak. Not every reader of the |
|---|
| 158 | - docs is an English native speaker! |
|---|
| 159 | + For example, |
|---|
| 160 | |
|---|
| 161 | + * All full sentences should end with a full stop. |
|---|
| 162 | + * Proper names should be capitalized. |
|---|
| 163 | + * Common word contractions should be written out |
|---|
| 164 | + (i.e. "you should" instead of "you'd", etc.) |
|---|
| 165 | + |
|---|
| 166 | +2. Avoid too many abbreviations and jargon speak. |
|---|
| 167 | + |
|---|
| 168 | +#. Avoid slang and idioms (e.g. "This should be a piece of cake.") Not every |
|---|
| 169 | + reader of the docs is a native English speaker so it will not always |
|---|
| 170 | + mean what you meant it to mean! |
|---|
| 171 | |
|---|
| 172 | #. All major words in the page title and headings should be capitalized |
|---|
| 173 | - ("This is a Good Heading"). The exceptions are articles, conjunctions, |
|---|
| 174 | - and short prepositions, etc.) |
|---|
| 175 | + (e.g. "This is a Good Heading", but "This is not a good heading".) The |
|---|
| 176 | + exceptions are articles, conjunctions, and short prepositions, etc. |
|---|
| 177 | |
|---|
| 178 | |
|---|
| 179 | #. Use literal syntax (see below) for names of Python objects, functions, |
|---|
| 180 | modules etc., shell commands, software packages, and so on. |
|---|
| 181 | |
|---|
| 182 | - |
|---|
| 183 | #. A full command line should go in a block literal (see below) so that it is |
|---|
| 184 | easier to notice. |
|---|
| 185 | |
|---|
| 186 | -#. The name for an example project (e.g. ``Wiki 20`') is ``<projectname>`` |
|---|
| 187 | +#. The name for an example project (e.g. ``Wiki 20``) is ``<projectname>`` |
|---|
| 188 | and the Python package name (e.g. ``wiki_20``) is ``<packagename>``. |
|---|
| 189 | |
|---|
| 190 | |
|---|
| 191 | ReST Formatting |
|---|
| 192 | -~~~~~~~~~~~~~~~ |
|---|
| 193 | +``````````````` |
|---|
| 194 | |
|---|
| 195 | -#. Please keep the ReST source nicely formatted by wrapping lines at 80 |
|---|
| 196 | - characters, inserting two empty lines before and one after each heading |
|---|
| 197 | - and keeping the indentation of literal blocks consistent. |
|---|
| 198 | +Some markup guidelines and essentials of ReST syntax are listed below. For |
|---|
| 199 | +summary reference, visit this `Quick Reference page`_ or this more |
|---|
| 200 | +`extensive list`_. |
|---|
| 201 | |
|---|
| 202 | - In short, treat the ReST source as you would treat Python source code. |
|---|
| 203 | - You want this to be beautiful as well, don't you? |
|---|
| 204 | +Treat the ReST source as you would treat Python source code by making it |
|---|
| 205 | +nicely formatted and beautiful. When it helps, you can edit the page source |
|---|
| 206 | +in your local editor and paste it back into the wiki editor interface when |
|---|
| 207 | +you ready. |
|---|
| 208 | |
|---|
| 209 | - You can edit the page in your local editor and paste it back to the |
|---|
| 210 | - wiki editor interface when you ready. |
|---|
| 211 | |
|---|
| 212 | +#. Wrap ReST source lines at 80 characters. |
|---|
| 213 | + |
|---|
| 214 | +#. Insert two empty lines before and one after each heading. |
|---|
| 215 | + |
|---|
| 216 | +#. Keep the indentation of literal blocks consistent. |
|---|
| 217 | |
|---|
| 218 | #. The page title should be underlined with equal signs (``=``). |
|---|
| 219 | |
|---|
| 220 | #. Section headings should be underlined with ``-`` (dash), ``~`` (tilde), |
|---|
| 221 | and ` (backtick), according to their level in the section hierarchy in |
|---|
| 222 | the order given here. Keep the underline the same length as the section |
|---|
| 223 | - title (you can do this in the final proof-reading phase). |
|---|
| 224 | + title. |
|---|
| 225 | |
|---|
| 226 | -#. Literals are any chunk of code (including variable names and parameters) |
|---|
| 227 | +#. Literals are any chunk of code, including variable names and parameters |
|---|
| 228 | and anything you type directly into a terminal. Literals are surrounded |
|---|
| 229 | - by double backticks. If you run across one of the few instances of the |
|---|
| 230 | + by double backticks. (If you run across one of the few instances of the |
|---|
| 231 | older convention of surrounding literals with quotes, please drop the |
|---|
| 232 | - quotes and replace with double backticks. |
|---|
| 233 | + quotes and replace with double backticks.) |
|---|
| 234 | |
|---|
| 235 | #. Block literal sections are for longer examples and command lines. |
|---|
| 236 | |
|---|
| 237 | @@ -209,27 +220,29 @@ |
|---|
| 238 | |
|---|
| 239 | .. _example link: 1.0/ExampleLink |
|---|
| 240 | |
|---|
| 241 | - If the URL is very long, you can put a line break behind the colon and indent |
|---|
| 242 | - the URL on the next line. Put the all URLs from one section at the end of |
|---|
| 243 | + * If the URL is very long, you can put a line break after the colon and indent |
|---|
| 244 | + the URL on the next line. |
|---|
| 245 | + |
|---|
| 246 | + * Put the all URLs from one section at the end of |
|---|
| 247 | the section. |
|---|
| 248 | |
|---|
| 249 | - One-word links don't need backticks: ``mylink_``. |
|---|
| 250 | + * One-word links don't need backticks: ``mylink_``. |
|---|
| 251 | |
|---|
| 252 | - The link target should not be enclosed in backticks and case does not matter. |
|---|
| 253 | + * The link target should not be enclosed in backticks and is not case-sensitive. |
|---|
| 254 | |
|---|
| 255 | -#. Try to use list syntax for lists instead of formatting the lists yourself by |
|---|
| 256 | - using bold text or italicized text. This mostly comes up when dealing with |
|---|
| 257 | - lists of arguments etc., check the `Configuration <1.0/Configuration>`_ page |
|---|
| 258 | - for an example:: |
|---|
| 259 | +9. Try to use list syntax for lists instead of formatting the lists yourself |
|---|
| 260 | + with bold or italics. This mostly comes up when dealing with lists of |
|---|
| 261 | + arguments etc. The `Configuration <1.0/Configuration>`_ page is a good |
|---|
| 262 | + example:: |
|---|
| 263 | |
|---|
| 264 | ``arg1`` |
|---|
| 265 | argument 1 explanation text |
|---|
| 266 | ``arg2`` |
|---|
| 267 | argument 2 explanation text |
|---|
| 268 | |
|---|
| 269 | -#. First-level list have *no* indentation in the ReST source. |
|---|
| 270 | +#. First-level lists have *no* indentation in the ReST source. |
|---|
| 271 | |
|---|
| 272 | -#. For ordered lists, don't number the items yourself, use this syntax instead:: |
|---|
| 273 | +#. For ordered lists, don't number the items yourself. Use this syntax instead:: |
|---|
| 274 | |
|---|
| 275 | #. Item one |
|---|
| 276 | #. Item two |
|---|
| 277 | @@ -238,6 +251,7 @@ |
|---|
| 278 | #. You can also break lines in lists, footnotes and notes, if you indent the |
|---|
| 279 | second and following lines the same level. |
|---|
| 280 | |
|---|
| 281 | + |
|---|
| 282 | For list items, the indentation level must match that of the first letter on |
|---|
| 283 | the first line, e.g.:: |
|---|
| 284 | |
|---|
| 285 | @@ -247,37 +261,113 @@ |
|---|
| 286 | |
|---|
| 287 | Like this. |
|---|
| 288 | |
|---|
| 289 | + |
|---|
| 290 | +Remember, pages marked with "Official[, Approved]" are considered to be |
|---|
| 291 | +accurate, reviewed and have proper style. Copy editing is an essential |
|---|
| 292 | +part of maintaining high quality documents. |
|---|
| 293 | + |
|---|
| 294 | .. _callout style: |
|---|
| 295 | - http://docutils.sourceforge.net/docs/user/rst/quickref.html#contents |
|---|
| 296 | + http://docutils.sourceforge.net/docs/user/rst/quickref.html#hyperlink-targets |
|---|
| 297 | |
|---|
| 298 | |
|---|
| 299 | -Editor Guidelines |
|---|
| 300 | ------------------ |
|---|
| 301 | |
|---|
| 302 | -If you bless a page by marking it as official, please send a note to |
|---|
| 303 | -turbogears-docs saying so. We, the DocTeam_, would like to keep track |
|---|
| 304 | -of things without missing them in the noise of RecentChanges_ and I'm |
|---|
| 305 | -sure you would as well. |
|---|
| 306 | +Document Submission Procedure |
|---|
| 307 | +----------------------------- |
|---|
| 308 | |
|---|
| 309 | -If you work on a document that is marked official, please |
|---|
| 310 | +Newly Created Documents |
|---|
| 311 | +~~~~~~~~~~~~~~~~~~~~~~~ |
|---|
| 312 | |
|---|
| 313 | -#. Take extra care. |
|---|
| 314 | +While working on a new document, set the status to *"Work in progress"*. |
|---|
| 315 | |
|---|
| 316 | -#. Set the status to "Official, Work in progress" while you are working |
|---|
| 317 | - on it and to "Official, Draft" until at least one other person had a |
|---|
| 318 | - chance to look at your changes. |
|---|
| 319 | +Once completed to your satisfaction, |
|---|
| 320 | + |
|---|
| 321 | +#. Change status to *"Draft"*. |
|---|
| 322 | + |
|---|
| 323 | +#. Open a new Trac ticket requesting a review. (See `Opening New Document Tickets`_ |
|---|
| 324 | + below.) |
|---|
| 325 | + |
|---|
| 326 | + |
|---|
| 327 | + |
|---|
| 328 | +Improvements upon Existing Documents |
|---|
| 329 | +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|---|
| 330 | + |
|---|
| 331 | +Editable Documents |
|---|
| 332 | +`````````````````` |
|---|
| 333 | +* If you think you know what you are doing: |
|---|
| 334 | + |
|---|
| 335 | + #. Edit document directly. |
|---|
| 336 | + #. Do not open a ticket. |
|---|
| 337 | + |
|---|
| 338 | +* If you have doubts: |
|---|
| 339 | + |
|---|
| 340 | + #. Edit what you can. |
|---|
| 341 | + #. Open *one* ticket for review and all the rest of the issues with that page |
|---|
| 342 | + |
|---|
| 343 | +Official Documents |
|---|
| 344 | +`````````````````` |
|---|
| 345 | + |
|---|
| 346 | +If you work on a document that is marked *Official*, |
|---|
| 347 | + |
|---|
| 348 | +* If you have write access: |
|---|
| 349 | + |
|---|
| 350 | + #. Please take extra care. |
|---|
| 351 | + |
|---|
| 352 | + #. Set the status to "Official, Draft" until at least one other person has |
|---|
| 353 | + had a chance to look at your changes. |
|---|
| 354 | + |
|---|
| 355 | + #. Open a new ticket. |
|---|
| 356 | + |
|---|
| 357 | +* If you do not have write access: |
|---|
| 358 | + |
|---|
| 359 | + #. Download raw text of the original document. |
|---|
| 360 | + #. Make changes at your local computer. |
|---|
| 361 | + #. Create a diff file of your changes with `diff -u old new`. |
|---|
| 362 | + #. Open a new ticket. |
|---|
| 363 | + #. Attach diff file to ticket. |
|---|
| 364 | + |
|---|
| 365 | + |
|---|
| 366 | +Opening New Document Tickets |
|---|
| 367 | +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|---|
| 368 | +#. Open a `new Trac ticket`_. |
|---|
| 369 | + |
|---|
| 370 | +#. Put the document's title in the ticket summary |
|---|
| 371 | + |
|---|
| 372 | +#. Set Component=Docs |
|---|
| 373 | + |
|---|
| 374 | +#. Set Version=X.0 (one decimal place only) |
|---|
| 375 | + |
|---|
| 376 | +#. Set Keywords to "doc review" |
|---|
| 377 | + |
|---|
| 378 | +#. If you could not edit the document yourself, attach a diff file |
|---|
| 379 | + of your proposed changes. |
|---|
| 380 | + |
|---|
| 381 | +.. _new Trac ticket: http://trac.turbogears.org/newticket |
|---|
| 382 | |
|---|
| 383 | -Remember, pages marked with "Official[, Approved]" are considered to be |
|---|
| 384 | -accurate, reviewed and have proper style. Copy editing is an essential |
|---|
| 385 | -part of maintaining high quality documents. |
|---|
| 386 | |
|---|
| 387 | Resources |
|---|
| 388 | --------- |
|---|
| 389 | |
|---|
| 390 | -* There are some wiki ReST syntax snippets ready to be copied and pasted |
|---|
| 391 | - on Chris Arndt's `personal wiki page`_ |
|---|
| 392 | -* There is a list with further resources for documentation writers on the |
|---|
| 393 | - `documentation team page`_. |
|---|
| 394 | +.. * There are some wiki ReST syntax snippets ready to be copied and pasted |
|---|
| 395 | + on Chris Arndt's `personal wiki page`_ |
|---|
| 396 | + |
|---|
| 397 | +* `Documentation Team Page`_ |
|---|
| 398 | +* `ReST Quick Reference`_ |
|---|
| 399 | +* Lots of `ReST Information`_ |
|---|
| 400 | +* `RoughDocs Page for 1.0 <1.0/RoughDocs>`_ |
|---|
| 401 | +* `TurboGears Trac <http://trac.turbogears.org>`_ |
|---|
| 402 | |
|---|
| 403 | .. _personal wiki page: ChristopherArndt/Snippets |
|---|
| 404 | |
|---|
| 405 | + |
|---|
| 406 | +.. [#] This is very important for ensuring the long term value of the |
|---|
| 407 | + docs we write. We expect to move to another documentation system |
|---|
| 408 | + at some point in the future, or we might want to convert the docs to |
|---|
| 409 | + printable form. The use of ReStructuredText will allow us to do |
|---|
| 410 | + that without complex document conversions. |
|---|
| 411 | + |
|---|
| 412 | +.. _ReST Information: |
|---|
| 413 | +.. _extensive list: http://docutils.sourceforge.net/rst.html |
|---|
| 414 | +.. _quick reference page: |
|---|
| 415 | +.. _ReST Quick Reference: |
|---|
| 416 | + http://docutils.sourceforge.net/docs/user/rst/quickref.html |
|---|
| 417 | + |
|---|