Skip to content

Commit b865e77

Browse files
kay-kimkay-kim
committed
update for 3.6
1 parent 93fdad5 commit b865e77

9 files changed

+153
-11
lines changed

‎Makefile

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
2+
USER=$(shell whoami)
3+
STAGING_URL="https://docs-mongodborg-staging.corp.mongodb.com"
4+
PRODUCTION_URL="https://docs.mongodb.com/getting-started"
5+
STAGING_BUCKET=docs-mongodb-org-staging
6+
PRODUCTION_BUCKET=docs-mongodb-org-prod
7+
8+
# "PROJECT" currently exists to support having multiple projects
9+
# within one bucket.
10+
PROJECT=getting-started
11+
12+
.PHONY: help lint html stage deploy deploy-search-index
13+
14+
help: ## Show this help message
15+
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
16+
@echo
17+
@echo 'Variables'
18+
@printf " \033[36m%-18s\033[0m %s\n" 'ARGS' 'Arguments to pass to mut-publish'
19+
20+
html: ## Builds this branch's HTML under build/<branch>/html
21+
giza make html
22+
23+
publish: ## Builds this branch's publishable HTML and other artifacts under build/public
24+
giza make publish
25+
if [ ${GIT_BRANCH} = master ]; then mut-redirects config/redirects -o build/public/.htaccess; fi
26+
27+
lint: ## Checks URLs in the built corpus underneath build/<branch>/html
28+
mut-lint --linters=links ./build/master/source/ ${ARGS}
29+
30+
stage: ## Host online for review
31+
mut-publish build/${GIT_BRANCH}/html-shell ${STAGING_BUCKET} --prefix=${PROJECT}/shell --stage ${ARGS}
32+
@echo "Hosted at ${STAGING_URL}/${PROJECT}/shell/${USER}/${GIT_BRANCH}/index.html"
33+
34+
deploy: build/public ## Deploy to the production bucket
35+
mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PROJECT} --deploy --redirect-prefix='getting-started' --all-subdirectories ${ARGS}
36+
37+
@echo "Hosted at ${PRODUCTION_URL}/index.html"
38+
39+
redirects:
40+
if [ ${GIT_BRANCH} = master ]; then mut-redirects config/redirects -o build/public/.htaccess; fi

‎config/build_conf.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ project:
1616
- name: csharp
1717
branched: false
1818
version:
19-
release: '3.0.4'
20-
branch: '3.0'
19+
release: '3.6.0'
20+
branch: '3.6'
2121
system:
2222
files:
2323
- 'integration.yaml'

‎config/primer-migrations-docs.yaml

+36-9
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ transform:
3838
regex: ":doc:`(.*) <(/reference/configuration-options)>`"
3939
replace: ":manual:`\\1 <\\2>`"
4040
---
41-
source: build/docs/source/includes/steps-get-mongodb-for-windows.yaml
42-
target: includes/steps-get-mongodb-for-windows.yaml
43-
transform:
44-
regex: ":doc:"
45-
replace: ":manual:"
46-
---
4741
source: build/docs/source/includes/steps-install-mongodb-on-windows-unattended.yaml
4842
target: includes/steps-install-mongodb-on-windows-unattended.yaml
4943
transform:
@@ -124,9 +118,6 @@ target: includes/steps-install-mongodb-on-amazon.yaml
124118
source: build/docs/source/includes/steps-install-mongodb-on-suse.yaml
125119
target: includes/steps-install-mongodb-on-suse.yaml
126120
---
127-
source: build/docs/source/includes/steps-install-mongodb-on-windows.yaml
128-
target: includes/steps-install-mongodb-on-windows.yaml
129-
---
130121
source: build/docs/source/includes/toc-installation-linux.yaml
131122
target: includes/toc-installation-linux.yaml
132123
---
@@ -210,6 +201,42 @@ target: includes/extracts-fact-3.0-linux-package-repo.yaml
210201
source: build/docs/source/includes/fact-installation-rhel5.rst
211202
target: includes/fact-installation-rhel5.rst
212203
---
204+
source: build/docs/source/includes/steps-uninstall-mongodb-on-linux.yaml
205+
target: includes/steps-uninstall-mongodb-on-linux.yaml
206+
---
207+
source: build/docs/source/includes/steps-uninstall-mongodb-on-redhat.yaml
208+
target: includes/steps-uninstall-mongodb-on-redhat.yaml
209+
---
210+
source: build/docs/source/includes/fact-installation-ulimit.rst
211+
target: includes/fact-installation-ulimit.rst
212+
---
213+
source: build/docs/source/includes/steps-uninstall-mongodb-on-debian.yaml
214+
target: includes/steps-uninstall-mongodb-on-debian.yaml
215+
---
216+
source: build/docs/source/includes/fact-default-bind-ip-change.rst
217+
target: includes/fact-default-bind-ip-change.rst
218+
---
219+
source: build/docs/source/includes/fact-install-windows.rst
220+
target: includes/fact-install-windows.rst
221+
---
222+
source: build/docs/source/includes/fact-uninstall.rst
223+
target: includes/fact-uninstall.rst
224+
---
225+
source: build/docs/source/includes/steps-uninstall-mongodb-on-suse.yaml
226+
target: includes/steps-uninstall-mongodb-on-suse.yaml
227+
---
228+
source: build/docs/source/includes/3.6-osx-platform.rst
229+
target: includes/3.6-osx-platform.rst
230+
---
231+
source: build/docs/source/includes/steps-uninstall-mongodb-on-redhat.yaml
232+
target: includes/steps-uninstall-mongodb-on-redhat.yaml
233+
---
234+
source: build/docs/source/includes/fact-installation-ulimit.rst
235+
target: includes/fact-installation-ulimit.rst
236+
---
237+
source: build/docs/source/includes/steps-uninstall-mongodb-on-debian.yaml
238+
target: includes/steps-uninstall-mongodb-on-debian.yaml
239+
---
213240
source: build/docs/source/includes/admonition-power-ubuntu-restriction.rst
214241
target: includes/admonition-power-ubuntu-restriction.rst
215242
...

‎config/redirects

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
raw: getting-started -> https://docs.mongodb.com/getting-started/shell
2+
3+
raw: getting-started/cpp -> https://mongodb.github.io/mongo-cxx-driver
4+
raw: getting-started/cpp/aggregation -> https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/tutorial
5+
raw: getting-started/cpp/client -> https://mongodb.github.io/mongo-cxx-driver
6+
raw: getting-started/cpp/import-data -> https://mongodb.github.io/mongo-cxx-driver
7+
raw: getting-started/cpp/indexes -> https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/tutorial
8+
raw: getting-started/cpp/insert -> https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/tutorial
9+
raw: getting-started/cpp/introduction -> https://mongodb.github.io/mongo-cxx-driver
10+
raw: getting-started/cpp/query -> https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/tutorial
11+
raw: getting-started/cpp/remove -> https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/tutorial
12+
raw: getting-started/cpp/update -> https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/tutorial
13+
14+
15+
raw: getting-started/java -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
16+
raw: getting-started/java/aggregation -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
17+
raw: getting-started/java/client -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/installation
18+
raw: getting-started/java/import-data -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
19+
raw: getting-started/java/indexes -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
20+
raw: getting-started/java/insert -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
21+
raw: getting-started/java/introduction -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
22+
raw: getting-started/java/query -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
23+
raw: getting-started/java/remove -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
24+
raw: getting-started/java/update -> https://mongodb.github.io/mongo-java-driver/3.4/driver/getting-started/quick-start
25+
26+
27+
raw: getting-started/node -> https://docs.mongodb.com/manual/tutorial/getting-started/
28+
raw: getting-started/node/aggregation -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
29+
raw: getting-started/node/client -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
30+
raw: getting-started/node/import-data -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
31+
raw: getting-started/node/indexes -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
32+
raw: getting-started/node/insert -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
33+
raw: getting-started/node/introduction -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
34+
raw: getting-started/node/query -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
35+
raw: getting-started/node/remove -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
36+
raw: getting-started/node/update -> http://mongodb.github.io/node-mongodb-native/2.2/quick-start/quick-start/
37+

‎source/includes/3.6-osx-platform.rst

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MongoDB 3.6 is not tested on APFS, the new filesystem in macOS 10.13
2+
and may encounter errors.

‎source/includes/fact-default-bind-ip-change.rst

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Starting in MongoDB 3.6, MongoDB binaries, :program:`mongod` and
2+
:program:`mongos`, bind to localhost by default.
3+
Previously, starting in MongoDB 2.6, only the binaries from the
4+
official MongoDB RPM (Red Hat, CentOS, Fedora Linux, and derivatives)
5+
and DEB (Debian, Ubuntu, and derivatives) packages bind to localhost by
6+
default. For more details, see :ref:`3.6-bind_ip-compatibility`.

‎source/includes/fact-install-windows.rst

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
In Windows Explorer, locate the downloaded MongoDB ``.msi`` file, which
2+
typically is located in the default ``Downloads`` folder. Double-click
3+
the ``.msi`` file. A set of screens will appear to guide you through the
4+
installation process.
5+
6+
You may specify an installation directory if you choose the "Custom"
7+
installation option.
8+
9+
.. note::
10+
11+
These instructions assume that you have installed MongoDB
12+
to ``C:\Program Files\MongoDB\Server\3.6\``.
13+
14+
During the installation process you will be given the option to install
15+
:ref:`MongoDB Compass <compass-index>` in addition to MongoDB Server.
16+
17+
MongoDB is self-contained and does not have any other system
18+
dependencies. You can run MongoDB from any folder you choose. You may
19+
install MongoDB in any folder (e.g. ``D:\test\mongodb``).

‎source/includes/fact-installation-ulimit.rst

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Most Unix-like operating systems limit the system resources that a
2+
session may use. These limits may negatively impact MongoDB operation.
3+
See :doc:`/reference/ulimit` for more information.

‎source/includes/fact-uninstall.rst

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
To completely remove MongoDB from a system, you must remove the MongoDB
2+
applications themselves, the configuration files, and any directories containing
3+
data and logs. The following section guides you through the necessary steps.
4+
5+
.. warning::
6+
This process will *completely* remove MongoDB, its configuration, and *all*
7+
databases. This process is not reversible, so ensure that all of your
8+
configuration and data is backed up before proceeding.

0 commit comments

Comments
 (0)