Skip to content

Commit 64e4214

Browse files
author
Sam Kleinman
committed
meta: update to metaguides
1 parent b54f92a commit 64e4214

File tree

3 files changed

+80
-42
lines changed

3 files changed

+80
-42
lines changed

meta.organization.rst

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Indexes and Experience
2020
~~~~~~~~~~~~~~~~~~~~~~
2121

2222
There are two "index files," for the documentation
23-
project. "``/contents.rst``" and "``/index.rst``". The "contents" file
23+
project. "``/contents.txt``" and "``/index.txt``". The "contents" file
2424
provides an index and top level tree of all documentation in the
2525
resource and Sphinx uses this organization to power the "Next" and
2626
"Previous" page functionality and all overarching outlines of the
@@ -48,11 +48,12 @@ makes it possible to provide great flexibility while still maintaining
4848
a reasonable organization of files and URLs for the
4949
documentation. Consider the following example:
5050

51-
Given that topic such as "replication," has material regarding the
52-
administration of replica sets, as well as reference material, an
53-
overview of the functionality, and operational tutorials, it makes
54-
more sense to include a few locations for documents, and use the meta
55-
documents to provide the topic-level organization.
51+
Given that topic such as "replication," has material regarding
52+
the administration of replica sets, as well as reference
53+
material, an overview of the functionality, and operational
54+
tutorials, it makes more sense to include a few locations for
55+
documents, and use the meta documents to provide the topic-level
56+
organization.
5657

5758
Current topical indexes include:
5859

@@ -63,11 +64,12 @@ Current topical indexes include:
6364
- mongo
6465
- sharding
6566
- replication
67+
- faq
6668

6769
Additional topical indexes are forthcoming.
6870

69-
Top Level Folders
70-
-----------------
71+
The Top Level Folders
72+
---------------------
7173

7274
The documentation has a number of top-level folders, that hold all of
7375
the content of the resource. Consider the following list and
@@ -85,6 +87,10 @@ explanations below:
8587
coverage in this context. Topics include: drivers, schema design,
8688
optimization, replication, and sharding.
8789

90+
- *applications/use-cases* - contains use cases that detail how
91+
MongoDB can support various kinds uses and application designs,
92+
including in depth instructions and examples.
93+
8894
- *core* - contains overviews and introduction to the core features,
8995
functionality, and concepts of MongoDB. Topics include: replication,
9096
sharding, capped collections, journaling/durability, aggregation.
@@ -96,4 +102,7 @@ explanations below:
96102

97103
- *tutorial* - contains operational guides and tutorials that lead
98104
users through common tasks (administrative and conceptual) with
99-
MongoDB.
105+
MongoDB. This includes programming patterns and operational guides.
106+
107+
- *faq* - contains all the frequently asked questions related to
108+
MongoDB, in a collection of topical files.

meta.practices.rst

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ the source file. Additionally, the existing files are "hard wrapped"
2121
to 70 characters per-line, which you can adhere to if it is easy for
2222
you.
2323

24+
Standards and Practices
25+
-----------------------
26+
27+
- All non-trivial at least two people should vet all non-trivial
28+
changes to the documentation before publication. One of the
29+
reviewers should have significant technical experience with the
30+
material covered in the documentation.
31+
32+
- All development and editorial work should transpire in topic
33+
branches (or in "forks," on github,) that editors will merge into
34+
the publication branches before publication.
35+
2436
Collaboration
2537
-------------
2638

@@ -53,34 +65,20 @@ running builds yourself.
5365
Publication
5466
-----------
5567

56-
The makefile for this repository contains targets for the publication
57-
process. In order to maintain multiple versions of the documentation
58-
(to reflect different versions of the MongoDB server, for editing,
59-
review, etc.,) the makefile adds a couple of targets to the default
60-
Sphinx makefile. In the ``build-branch`` target, Sphinx builds the
61-
documentation into branch-specific folders. The ``deploy`` target
62-
moves these builds to into a local mirror (i.e. "``../public-docs``")
63-
of the documentation resource and calls a "``publish.sh``" script that
64-
handles the upload process itself.
65-
66-
To publish the documentation, use the following procedure:
67-
68-
1. Checkout the branch of the documentation that you want to publish,
69-
make/apply all changes that you wish to publish.
70-
71-
2. Build the following target. This operation builds all components of
72-
the documentation required for publication . ::
73-
74-
make build-branch
75-
76-
3. Build the following target. This procedure exports the build to the
77-
"``../public-docs``" directory and runs the "``publish.sh``"
78-
script. ::
68+
The makefile for this repository contains targets that automate the
69+
publication process. Use "``make html``" to publish a test build of
70+
the documentation in the "``build/``" directory of your
71+
repository. Use "``make publish``" to build the full contents of the
72+
manual from the current branch in the "``../public-docs/``" directory
73+
relative the docs repository.
7974

80-
make deploy
75+
Other targets include:
8176

82-
The ``publish`` target (i.e. "``make publish``") combines
83-
``build-branch`` and ``deploy`` procedures.
77+
- ``man`` - builds UNIX Manual pages for all Mongodb utilities.
78+
- ``push`` - builds and deploys the contents of the
79+
"``../public-docs/``".
80+
- ``pdfs`` - builds a PDF version of the manual (requires LaTeX
81+
dependencies.)
8482

8583
Branches
8684
--------

meta.style-guide.rst

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ style guide is to provide an accessible base style to ensure that our
88
documentation is easy to read, simple to use, and straightforward to
99
maintain.
1010

11+
Also consider the `Documentation Organization
12+
<meta.organization.rst>`_ (meta.organization.rst) document for more
13+
information regarding the MongoDB Manual organization.
14+
1115
Document History
1216
----------------
1317

@@ -18,6 +22,9 @@ guidelines, conventions, and questions.
1822
and as part of an effort of making it easier for people outside of the
1923
documentation team to contribute to documentation.
2024

25+
**2012-03-21**: Merged in content from the Jargon, and cleaned up
26+
style in light of recent experiences.
27+
2128
Naming Conventions
2229
------------------
2330

@@ -132,13 +139,6 @@ General Formulations
132139
- Contractions are acceptable insofar as they are necessary to
133140
increase readability and flow. Avoid otherwise.
134141

135-
- Shorter sentences are better than longer sentences. Use complex
136-
formations (e.g. compound complex structures that require
137-
semi-colons.) only as a last resort, if at all.
138-
139-
- For longer lists and more complex lists, use bulleted items rather
140-
than integrating them inline into a sentence.
141-
142142
- Make lists grammatically correct.
143143

144144
- Do not use a period after every item unless the list item
@@ -158,6 +158,37 @@ General Formulations
158158
``mongod`` instance that cannot be accessed rather than the
159159
colloquialism "down."
160160

161+
Structural Formulations
162+
~~~~~~~~~~~~~~~~~~~~~~~
163+
164+
- There should be at least two headings at every nesting level. Within
165+
an "h2" block, there should either be: no "h3" blocks, 2 "h3"
166+
blocks, or more than 2 "h3" blocks.
167+
168+
- Section headers should be in title case (capitalize first, last, and
169+
all important words,) and should effectively describe the contents
170+
of the section. In a single document you should strive to have
171+
section titles that are not redundant and grammatically consistent
172+
with each other.
173+
174+
- Use paragraphs and paragraph breaks to increase clarity and
175+
flow. Avoid burying critical information in the middle of long
176+
paragraphs. Err on the side of shorter paragraphs when possible.
177+
178+
- Shorter sentences are better than longer sentences. Use complex
179+
formations (e.g. compound complex structures that require
180+
semi-colons.) only as a last resort, if at all.
181+
182+
- In general, avoid paragraphs that consist of single sentences as
183+
they often represent a sentence that has unintentionally become too
184+
complex or incomplete. However, sometimes such paragraphs are useful
185+
for emphasis, summary, or introductions.
186+
187+
As a corollary, most sections should have multiple paragraphs.
188+
189+
- For longer lists and more complex lists, use bulleted items rather
190+
than integrating them inline into a sentence.
191+
161192
ReStructured Text and Typesetting
162193
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
163194

0 commit comments

Comments
 (0)