Skip to content

Commit 32bcbb6

Browse files
author
Sam Kleinman
committed
merge: DOCS-820
2 parents 1972467 + 3c717c3 commit 32bcbb6

File tree

2 files changed

+30
-33
lines changed

2 files changed

+30
-33
lines changed

source/administration/configuration.txt

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@ Consider the following explanation for these configuration decisions:
143143
connecting over the ``localhost`` interface for the first time to
144144
create user credentials.
145145

146-
.. seealso:: The ":wiki:`Security and Authentication <Security+and+Authentication>`" wiki page.
147-
148-
.. STUB ":doc:`/administration/security`"
146+
.. seealso:: :doc:`/administration/security`
149147

150148
Replication and Sharding Configuration
151149
--------------------------------------
@@ -164,8 +162,7 @@ among all members of the set. Consider the following:
164162
Use descriptive names for sets. Once configured use the
165163
:program:`mongo` shell to add hosts to the replica set.
166164

167-
.. seealso:: ":ref:`Replica set reconfiguration
168-
<replica-set-reconfiguration-usage>`.
165+
.. seealso:: :ref:`Replica set reconfiguration <replica-set-reconfiguration-usage>`.
169166

170167
To enable authentication for the :term:`replica set`, add the
171168
following option:
@@ -176,13 +173,13 @@ following option:
176173

177174
.. versionadded:: 1.8 for replica sets, and 1.9.1 for sharded replica sets.
178175

179-
Setting :setting:`keyFile` enables authentication and specifies a key
180-
file for the replica set member use to when authenticating to each
181-
other. The content of the key file is arbitrary, but must be the same
182-
on all members of the :term:`replica set` and :program:`mongos`
183-
instances that connect to the set. The keyfile must be less one
184-
kilobyte in size and may only contain characters in the base64 set and
185-
file must not have group or "world" permissions on UNIX systems.
176+
Setting :setting:`keyFile` enables authentication and specifies a key
177+
file for the replica set member use to when authenticating to each
178+
other. The content of the key file is arbitrary, but must be the same
179+
on all members of the :term:`replica set` and :program:`mongos`
180+
instances that connect to the set. The keyfile must be less one
181+
kilobyte in size and may only contain characters in the base64 set and
182+
file must not have group or "world" permissions on UNIX systems.
186183

187184
.. seealso:: The ":ref:`Replica set Reconfiguration <replica-set-reconfiguration-usage>`
188185
section for information regarding the process for changing replica

themes/mongodb/static/mongodb-docs.css_t

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,10 @@ div.document {
4343
div.body {
4444
background-color: white;
4545
color: black;
46-
padding: 0 30px 30px 30px;
4746
font-size: 100%;
4847
}
4948

50-
div.footerX {
51-
color: white;
52-
width: 100%;
53-
padding: 13px 0;
54-
line-height:1.0;
55-
margin:0;
56-
text-align: center;
57-
font-size: 75%;
58-
border-top: 1px solid black;
59-
}
49+
div.body > div#cse-results + div.section {margin-left:2pc;}
6050

6151
div.footer {
6252
color:white;
@@ -225,10 +215,12 @@ a.headerlink:hover {
225215
color: white;
226216
}
227217

228-
div.body p, div.body dd, div.body li {
218+
div.body p, div.body dd {
229219
line-height: 1.8;
230220
}
231221

222+
div.body li {line-height:1.5;}
223+
232224
div.admonition p.admonition-title + p {
233225
display: inline;
234226
}
@@ -314,7 +306,7 @@ div.viewcode-block:target {
314306
border-bottom: 1px solid #ac9;
315307
}
316308

317-
/*
309+
/*
318310
p.first, p.last {
319311
margin-bottom: 0 !important;
320312
}
@@ -327,10 +319,10 @@ table.docutils td {
327319
}
328320

329321
table.docutils.field-list ul.first.last.simple>li {
330-
padding-top: 1em;
322+
padding-top: 1em;
331323
}
332324
table.docutils.field-list ul.first.last.simple>li>p {
333-
padding-top: 1em;
325+
padding-top: 1em;
334326
}
335327

336328
div.highlight-javascript>div.highlight>pre>span.hll {
@@ -711,8 +703,8 @@ div.section {cursor:default;}
711703

712704
div#header-db {background-image: url(http://media.mongodb.org/back-header.png)}
713705

714-
/*
715-
background-color: #f6f4cd; -- house nav style
706+
/*
707+
background-color: #f6f4cd; -- house nav style
716708
footer bg: #fdfcf7; font-size 80%; line-height:1.5em; color: #4c3a2c;
717709
logo: http://media.mongodb.org/logo-mongodb.png
718710

@@ -734,10 +726,18 @@ dd > div.admonition {margin-left:0;}
734726
p > div.admonition {margin-left:0;}
735727
li > div.admonition {margin-left:0;}
736728

737-
div#btnv {padding-top:3em}
738-
div#btnv ul#btnvl {display:block;width:66%;text-align:center;}
739-
div#btnv ul#btnvl li {display:inline;list-item-style:none;font-size:10pt;padding:1em; width:33%}
740-
div#btnv ul#btnvl li#btnvup:before,
729+
div#btnv {padding-top:3em;}
730+
div#btnv ul#btnvl {display:block;width:auto;margin:auto;;text-align:center;}
731+
/* div#btnv ul#btnvl li {border-top:solid 1pt #402817;} div#btnv ul#btnvl li {border-bottom:solid 1pt #402817;} */
732+
div#btnv ul#btnvl li {display:inline;list-item-style:none;font-size:100%;padding:1em; width:33%;margin:0;}
733+
div#btnv ul#btnvl li#btnvup:before,
741734
div#btnv ul#btnvl li#btnvnx:before {content:" ";padding-left:1em;padding-right:1em;color:#c48c55}
742735

736+
div.body > div.section > div.section {margin-left:0;margin-top:2em;}
737+
738+
div.body > div.section > div.section div.section {margin-left:2pc;margin-right:2pc;}
739+
div.section h2 {line-height:1.0}
743740

741+
table.docutils {margin:auto}
742+
table.docutils tbody tr td div.highlight pre {background-color:inherit;}
743+
table.docutils > div.admonition-example {background-color:inherit;}

0 commit comments

Comments
 (0)