Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling (root, docs, utils) #17471

Merged
merged 146 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
4dcaf01
spelling: aardvark
jsoref Feb 15, 2023
aff0c32
spelling: accidentally
jsoref Oct 28, 2022
e3d073c
spelling: acquisitions
jsoref Feb 15, 2023
296b4bc
spelling: actually
jsoref Oct 28, 2022
afa0538
spelling: adaptation
jsoref Oct 28, 2022
1ed82c1
spelling: adaptive
jsoref Oct 28, 2022
590eb7b
spelling: additional
jsoref Oct 28, 2022
325d636
spelling: and
jsoref Oct 27, 2022
b0de2dd
spelling: another
jsoref Oct 27, 2022
9e393c0
spelling: arangod
jsoref Oct 28, 2022
2fd425b
spelling: arangoimp
jsoref Oct 28, 2022
72ea43a
spelling: asynchronously
jsoref Oct 28, 2022
4adab29
spelling: attribute
jsoref Oct 28, 2022
3a677f8
spelling: author
jsoref Oct 28, 2022
974928e
spelling: backtraces
jsoref Feb 15, 2023
fde7e39
spelling: becoming
jsoref Oct 28, 2022
bf9560f
spelling: beneficial
jsoref Oct 28, 2022
d2329b3
spelling: bolts
jsoref Oct 28, 2022
7fc5ade
spelling: bound
jsoref Feb 15, 2023
67976ca
spelling: capabilities
jsoref Oct 28, 2022
7b09c1c
spelling: character
jsoref Oct 28, 2022
d873898
spelling: client
jsoref Oct 28, 2022
c3ebcc2
spelling: command
jsoref Oct 27, 2022
927ab92
spelling: computation
jsoref Oct 28, 2022
e0fbf19
spelling: configuration
jsoref Oct 28, 2022
2393bee
spelling: constraint
jsoref Oct 28, 2022
0b9d698
spelling: dequeuing
jsoref Oct 28, 2022
daf79bf
spelling: devsup
jsoref Feb 15, 2023
c0b443e
spelling: differentiated
jsoref Oct 28, 2022
c753a95
spelling: dispatcher
jsoref Oct 28, 2022
2cbaf8e
spelling: dysfunctional
jsoref Oct 28, 2022
c8306db
spelling: elapsed
jsoref Oct 28, 2022
a5f8200
spelling: empty
jsoref Oct 28, 2022
66d2b15
spelling: encoding
jsoref Oct 28, 2022
4d21726
spelling: enforce
jsoref Oct 28, 2022
62c573d
spelling: erroneous
jsoref Oct 28, 2022
cfaa302
spelling: erroneously
jsoref Oct 28, 2022
96af512
spelling: errors
jsoref Feb 15, 2023
d8f4c39
spelling: evaluated
jsoref Oct 28, 2022
2b8add3
spelling: evaluates
jsoref Feb 15, 2023
858c0bc
spelling: everything
jsoref Feb 15, 2023
3c9b527
spelling: exclusive
jsoref Oct 28, 2022
296ea63
spelling: executable
jsoref Oct 28, 2022
d168500
spelling: explicitly
jsoref Oct 28, 2022
0128be0
spelling: exponentiation
jsoref Oct 28, 2022
35bac12
spelling: file descriptors
jsoref Feb 15, 2023
0ce4dd7
spelling: file sizes
jsoref Feb 15, 2023
150f002
spelling: fixes
jsoref Oct 28, 2022
307a1b9
spelling: followed
jsoref Oct 28, 2022
4a48d83
spelling: follower
jsoref Oct 28, 2022
6ad6dd3
spelling: for
jsoref Oct 27, 2022
ab057db
spelling: github
jsoref Oct 27, 2022
6462837
spelling: highlighting
jsoref Oct 28, 2022
0a8399d
spelling: in sync
jsoref Feb 15, 2023
502e5ea
spelling: individual
jsoref Oct 28, 2022
b851ab6
spelling: initial
jsoref Oct 28, 2022
5cf656e
spelling: instantiate
jsoref Oct 28, 2022
d4805c3
spelling: instructions
jsoref Oct 28, 2022
1a32c76
spelling: interchangeably
jsoref Oct 28, 2022
8124e27
spelling: internal
jsoref Oct 28, 2022
ead3f37
spelling: into
jsoref Feb 15, 2023
9fd6d14
spelling: invalidation
jsoref Oct 28, 2022
72cdb32
spelling: invoked
jsoref Oct 28, 2022
b1d713c
spelling: is
jsoref Feb 15, 2023
c522ac8
spelling: issues
jsoref Feb 15, 2023
e1e0174
spelling: javascript
jsoref Oct 27, 2022
8cb57fa
spelling: library
jsoref Oct 28, 2022
a3b9b89
spelling: logrotation
jsoref Feb 15, 2023
cbb9aef
spelling: maintenance
jsoref Oct 28, 2022
234782a
spelling: management
jsoref Oct 28, 2022
a7260cc
spelling: materialization
jsoref Oct 28, 2022
ea97006
spelling: mergeable
jsoref Oct 28, 2022
151ae3d
spelling: milliseconds
jsoref Oct 28, 2022
45b78f5
spelling: modify
jsoref Feb 15, 2023
9aed913
spelling: monotonically
jsoref Oct 28, 2022
122493e
spelling: multiple
jsoref Oct 27, 2022
7b2b2ae
spelling: necessary
jsoref Oct 28, 2022
af02c87
spelling: nonexistent
jsoref Oct 27, 2022
5fb06f6
spelling: occurred
jsoref Oct 28, 2022
8d09fdd
spelling: occurring
jsoref Oct 28, 2022
29f6a89
spelling: opt-in
jsoref Oct 27, 2022
629cda9
spelling: optional
jsoref Feb 15, 2023
bf55888
spelling: origin
jsoref Oct 28, 2022
c604c9d
spelling: overridable
jsoref Oct 28, 2022
c6ca42d
spelling: participating
jsoref Oct 28, 2022
6b51b6f
spelling: perform
jsoref Oct 28, 2022
2e1104a
spelling: performance
jsoref Oct 28, 2022
c6bce29
spelling: personnel
jsoref Oct 28, 2022
44bef72
spelling: preexisting
jsoref Oct 27, 2022
236631b
spelling: preferably
jsoref Feb 15, 2023
67e6d64
spelling: program
jsoref Feb 15, 2023
65f79a2
spelling: raspberry
jsoref Oct 28, 2022
ef37f57
spelling: referring
jsoref Oct 28, 2022
ecd1fa2
spelling: registered
jsoref Oct 28, 2022
55d5f1e
spelling: remote
jsoref Oct 28, 2022
67e986a
spelling: replacing
jsoref Oct 28, 2022
37f2774
spelling: repository
jsoref Oct 28, 2022
2015c23
spelling: reset
jsoref Feb 15, 2023
c6f30a2
spelling: resilience
jsoref Oct 28, 2022
44731fe
spelling: retrieve
jsoref Oct 28, 2022
084f981
spelling: return
jsoref Oct 28, 2022
61a5249
spelling: returning
jsoref Oct 28, 2022
165a413
spelling: returns
jsoref Oct 27, 2022
465dc48
spelling: run clang-format
jsoref Oct 28, 2022
e7bd536
spelling: running
jsoref Oct 28, 2022
e6b7ce2
spelling: satellite
jsoref Feb 15, 2023
220075c
spelling: script
jsoref Oct 28, 2022
5bf8e01
spelling: selectivity
jsoref Oct 28, 2022
e1e5782
spelling: separate
jsoref Oct 28, 2022
49f74de
spelling: setting
jsoref Oct 28, 2022
1c92c58
spelling: shortest
jsoref Oct 28, 2022
6e3ba7f
spelling: situation
jsoref Oct 28, 2022
f014fa4
spelling: skiplist
jsoref Feb 15, 2023
29ef3d5
spelling: something
jsoref Feb 15, 2023
1cb56be
spelling: spawned
jsoref Feb 15, 2023
316ace2
spelling: specify
jsoref Oct 28, 2022
59ae56a
spelling: standalone
jsoref Oct 28, 2022
4adc0b8
spelling: startup
jsoref Oct 28, 2022
a229dca
spelling: succeeding
jsoref Oct 28, 2022
cb0e117
spelling: success
jsoref Oct 28, 2022
8f1cc51
spelling: successful
jsoref Feb 15, 2023
afee359
spelling: suggested
jsoref Oct 28, 2022
35912ee
spelling: superfluous
jsoref Oct 28, 2022
bc7ef1c
spelling: synchronous
jsoref Oct 28, 2022
576d435
spelling: than
jsoref Oct 27, 2022
ade8e0a
spelling: that
jsoref Oct 27, 2022
d75fbc9
spelling: the
jsoref Oct 27, 2022
7786f8c
spelling: timing out
jsoref Feb 15, 2023
e1b9d34
spelling: tooltippy
jsoref Oct 27, 2022
33a8330
spelling: transferred
jsoref Oct 28, 2022
63656ec
spelling: transparent
jsoref Oct 28, 2022
7cc6680
spelling: typography
jsoref Oct 28, 2022
255d95c
spelling: updated
jsoref Feb 15, 2023
0aa884b
spelling: user
jsoref Oct 27, 2022
2103ecd
spelling: version
jsoref Oct 28, 2022
527901d
spelling: visible
jsoref Feb 15, 2023
a880610
spelling: wherever
jsoref Oct 28, 2022
00604a1
spelling: workaround
jsoref Feb 15, 2023
fcd004b
Merge branch 'devel' of https://github.com/arangodb/arangodb into spe…
Simran-B Feb 20, 2023
1708705
Undo some changes, remove docs README (see docs repo instead), remove…
Simran-B Feb 20, 2023
5735176
Undo renames unrelated to docs in this branch
Simran-B Feb 20, 2023
6e2d5db
Merge branch 'devel' of https://github.com/arangodb/arangodb into spe…
Simran-B Feb 20, 2023
de5c177
Merge branch 'devel' of https://github.com/arangodb/arangodb into spe…
Simran-B Feb 24, 2023
b9be178
Merge branch 'devel' into spelling
ansoboleva Feb 27, 2023
cfbb205
Merge branch 'devel' of https://github.com/arangodb/arangodb into spe…
KVS85 Feb 27, 2023
b879404
Merge branch 'devel' into spelling
nerpaula Feb 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .githooks/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Using commit hooks

We automatically check the C++ code that is pushed to our repository for correct
formatting. There is a Github action running for all pushes that runs a code
formatting. There is a GitHub Action running for all pushes that runs a code
formatting check that is based on clang-format.
This check will flag non-correctly formatted code as broken.

To make sure only correctly formatted code is pushed to Github, it is recommended
To make sure only correctly formatted code is pushed to GitHub, it is recommended
to install a Git pre-commit hook that checks every local commit for correct code
formatting.

Expand Down
278 changes: 139 additions & 139 deletions CHANGELOG

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ if (CMAKE_COMPILER_IS_CLANG AND NOT MSVC) # exclude clang-cl
endif ()

# need c++20
# XXX this should really be set on a per target level using cmake compile_features capabilties
# XXX this should really be set on a per target level using cmake compile_features capabilities
set(CMAKE_CXX_STANDARD 20)
# turn off compiler language extensions (e.g. don't use -std=gnu++20, but
# -std=c++20).
Expand Down Expand Up @@ -783,7 +783,7 @@ if (NOT WINDOWS)
endif ()

# ------------------------------------------------------------------------------
# IMPLICIT INCLUDES AND LIBIRARY DIRECTORIES
# IMPLICIT INCLUDES AND LIBRARY DIRECTORIES
# ------------------------------------------------------------------------------

function(CREATE_FLAGS OUTPUT GLUE)
Expand Down
26 changes: 13 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ in the ArangoDB source tree:

### Style Guide

We use `clang-format` to enfore consistent code formatting. Check
We use `clang-format` to enforce consistent code formatting. Check
[STYLEGUIDE.md](STYLEGUIDE.md) for a comprehensive description of ArangoDB's
Coding Guidelines.

Expand Down Expand Up @@ -237,7 +237,7 @@ Note: Make sure that your source path does not contain spaces otherwise the buil
ArangoDB uses a build system called [Oskar](https://github.com/arangodb/oskar).
Please refer to the documentation of Oskar for details.

Optimizations and limit of architecture (list of possible CPU instuctions) are set using this `cmake` option
Optimizations and limit of architecture (list of possible CPU instructions) are set using this `cmake` option
in addition to the other options:

```
Expand Down Expand Up @@ -287,7 +287,7 @@ favorite browser and open the web interface.
All changes to any source will automatically re-build and reload your browser.
Enjoy :)

### Cross Orogin Policy (CORS) ERROR
### Cross Origin Policy (CORS) ERROR

Our front-end development server currently runs on port:`3000`, while the backend runs on port:`8529` respectively. This implies that when the front-end sends a request to the backend would result in Cross-Origin-Policy security checks which recently got enforced by some browsers for security reasons. Until recently, we never had reports of CORS errors when running both the backend and front-end dev servers independently, however,
we recently confirmed that this error occurs in ( Chrome v: 98.0.4758.102 and Firefox v: 96.0.1 ).
Expand Down Expand Up @@ -411,7 +411,7 @@ You now will get log entries with the contents being passed between the blocks.

### Crashes

The Linux builds of the arangod execuable contain a built-in crash handler
The Linux builds of the arangod executable contain a built-in crash handler
(introduced in v3.7.0).
The crash handler is supposed to log basic crash information to the ArangoDB logfile in
case the arangod process receives one of the signals SIGSEGV, SIGBUS, SIGILL, SIGFPE or
Expand All @@ -421,7 +421,7 @@ SIGABRT. SIGKILL signals, which the operating system can send to a process in ca
In case the crash handler receives one of the mentioned interceptable signals, it will
write basic crash information to the logfile and a backtrace of the call site.
The backtrace can be provided to the ArangoDB support for further inspection. Note that
backtaces are only usable if debug symbols for ArangoDB have been installed as well.
backtraces are only usable if debug symbols for ArangoDB have been installed as well.

After logging the crash information, the crash handler will execute the default action for
the signal it has caught. If core dumps are enabled, the default action for these signals
Expand Down Expand Up @@ -783,8 +783,8 @@ There are several major places where unittests live:
| `js/client/modules/@arangodb/testutils/test-utils.js` | infrastructure for tests like filtering, bucketing, iterating |
| `js/client/modules/@arangodb/testutils/process-utils.js` | manage arango instances, start/stop/monitor SUT-processes |
| `js/client/modules/@arangodb/testutils/result-processing.js` | work with the result structures to produce reports, hit lists etc. |
| `js/client/modules/@arangodb/testutils/crash-utils.js` | if somethings goes wrong, this contains the crash analysis tools |
| `js/client/modules/@arangodb/testutils/clusterstats.js` | can be launched seperately to monitor the cluster instances and their resource usage |
| `js/client/modules/@arangodb/testutils/crash-utils.js` | if something goes wrong, this contains the crash analysis tools |
| `js/client/modules/@arangodb/testutils/clusterstats.js` | can be launched separately to monitor the cluster instances and their resource usage |
| `js/client/modules/@arangodb/testsuites/` | modules with testframework that control one set of tests each |
| `js/common/modules[/jsunity]/jsunity.js` | jsunity testing framework; invoked via jsunity.js next to the module |
| `js/common/modules/@arangodb/mocha-runner.js` | wrapper for running mocha tests in arangodb |
Expand Down Expand Up @@ -1030,7 +1030,7 @@ The `rta_makedata` testsuite can be invoked with:

- `--cluster false` - to be ran on a single server setup.
- `--activefailover true` to be ran on an active failover setup.
- `--cluster true` to be ran on a 3 db-server node cluster; one run will check resillience with 2 remaining dbservers.
- `--cluster true` to be ran on a 3 db-server node cluster; one run will check resilience with 2 remaining dbservers.

Invoke it like this:

Expand All @@ -1053,7 +1053,7 @@ Once this is completed, you may run it like this:
./scripts/unittest go_driver --gosource ../go-driver/ --testCase View --goOptions:timeout 180m --cluster true

This will invoke the test with a filter to only execute tests that have `View` in their name.
As an aditional parameter we pass `-timeout 100m` to the driver test.
As an additional parameter we pass `-timeout 100m` to the driver test.

The driver integration also features JWT pass in. It will launch a cluster with 3 DB-Servers, as
the tests expect to have at least 3 DB-Servers.
Expand Down Expand Up @@ -1110,7 +1110,7 @@ At the time being phpunit version 6.5 is supported. Install it like this:

Once this is completed, you may run it like this:

./scipts/unittest php_driver --phpsource ../arangodb-php/ \
./scripts/unittest php_driver --phpsource ../arangodb-php/ \
Simran-B marked this conversation as resolved.
Show resolved Hide resolved
--testCase testSaveVerticesAndEdgeBetweenThemAndRemoveOneByOne \
--cluster true \
--phpkeepalive false
Expand All @@ -1133,7 +1133,7 @@ All required data is passed as parameters:
- driverOptions options to be passed on to the driver works in the form of
`--driverOptions.argname value` evaluating to `--argname` `value`
- `--test testcase` evaluates to `--testsuite testcase`
- `--testCase testcaseExp` evalates to `--filter testcaseExp`
- `--testCase testcaseExp` evaluates to `--filter testcaseExp`

Statically provided options (with sample values):

Expand Down Expand Up @@ -1210,7 +1210,7 @@ Choose the `Npcap Loopback Adapter` number - 1:
--sniff true \
--cleanup false \
--sniffDevice 1 \
--sniffProgram 'c:/Programm Files/wireshark/tshark.exe' \
--sniffProgram 'c:/Program Files/wireshark/tshark.exe' \
--forceJson true

You can later on use Wireshark to inspect the capture files.
Expand All @@ -1232,7 +1232,7 @@ Currently available Analyzers are:
- unitTestTabularPrintResults - prints a table, add one (or more) of the following columns to print by adding it to `--tableColumns`:

- `duration` - the time spent in the complete testfile
- `status` - sucess/fail
- `status` - success/fail
- `failed` - fail?
- `total` - the time spent in the testcase
- `totalSetUp` - the time spent in setup summarized
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ the server error number
a descriptive error message

@RESTRETURNCODE{404}
If the specified user user function does not exist, the server will respond with *HTTP 404*.
If the specified user function does not exist, the server will respond with *HTTP 404*.

@RESTREPLYBODY{error,boolean,required,}
boolean flag to indicate whether an error occurred (*true* in this case)
Expand Down
2 changes: 1 addition & 1 deletion Documentation/DocuBlocks/Rest/AQL/get_api_aqlfunction.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

@startDocuBlock get_api_aqlfunction
@brief gets all reqistered AQL user functions
@brief gets all registered AQL user functions

@RESTHEADER{GET /_api/aqlfunction, Return registered AQL user functions, RestAqlUserFunctionsHandler:List}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ A plain text message stating what went wrong.

@EXAMPLES

trying to delete non existing task
Try to delete a non-existent task:

@EXAMPLE_ARANGOSH_RUN{RestTasksDeleteFail}
var url = "/_api/tasks/NoTaskWithThatName";
Expand All @@ -47,7 +47,7 @@ trying to delete non existing task
logJsonResponse(response);
@END_EXAMPLE_ARANGOSH_RUN

Remove existing Task
Remove existing task:

@EXAMPLE_ARANGOSH_RUN{RestTasksDelete}
var url = "/_api/tasks/";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ the number of intermediate commits done
Statistics about the V8 javascript contexts

@RESTSTRUCT{available,v8_context_struct,integer,required,}
the number of currently spawnen V8 contexts
the number of currently spawned V8 contexts

@RESTSTRUCT{busy,v8_context_struct,integer,required,}
the number of currently active V8 contexts
Expand Down Expand Up @@ -228,7 +228,7 @@ The number of spawned worker threads
The number of currently busy worker threads

@RESTSTRUCT{queued,server_threads_struct,integer,required,}
The number of jobs queued up waiting for worker threads becomming available
The number of jobs queued up waiting for worker threads becoming available

@EXAMPLES

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ currently only *little* is supported
which method do we use to handle fd-sets, *poll* should be here on linux.

@RESTSTRUCT{fd-setsize,version_details_struct,string,optional,}
if not *poll* the fd setsize is valid for the maximum number of filedescriptors
if not *poll* the fd setsize is valid for the maximum number of file descriptors

@RESTSTRUCT{full-version-string,version_details_struct,string,optional,}
The full version string
Expand Down Expand Up @@ -125,7 +125,7 @@ the version of the used velocypack implementation
the version of the bundled zlib

@RESTSTRUCT{mode,version_details_struct,string,optional,}
the mode we're runnig as - one of [*server*, *console*, *script*]
the mode we're running as - one of [*server*, *console*, *script*]

@RESTSTRUCT{host,version_details_struct,string,optional,}
the host ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ within the timeout, then an *HTTP 408* is returned.
};
@END_EXAMPLE_ARANGOSH_RUN

The result `body` contains besides the above discussed error codes the `result` object, if `code` is equal to `201`, which holds the unique identifier of this hot backup as the string attibute `id`, the full size in bytes as `sizeInBytes`, the number of idividual files as `nrFiles` and the number of database servers as `nrDBServers`. Single server deployments list potentially misleadingly `nrDBServers: 1`. Furthermore, the body contains a `datetime` time stamp and the flag `potentiallyInconsistent`, which indicates that the backup could inconsistent. This only happens if `allowInconsistent` has happened.
The result `body` contains besides the above discussed error codes the `result` object, if `code` is equal to `201`, which holds the unique identifier of this hot backup as the string attribute `id`, the full size in bytes as `sizeInBytes`, the number of individual files as `nrFiles` and the number of database servers as `nrDBServers`. Single server deployments list potentially misleadingly `nrDBServers: 1`. Furthermore, the body contains a `datetime` time stamp and the flag `potentiallyInconsistent`, which indicates that the backup could inconsistent. This only happens if `allowInconsistent` has happened.

@endDocuBlock
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ If the download command is invoked with bad parameters or any HTTP
method other than `POST`, then an *HTTP 400* is returned.

@RESTRETURNCODE{401}
If the authentication to the rempote repository fails, then an *HTTP
If the authentication to the remote repository fails, then an *HTTP
401* is returned.

@RESTRETURNCODE{404}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ operation is aborted.
If all is well, code 202 is returned if a new operation is scheduled.

@RESTRETURNCODE{400}
If the upload command is invoced with bad parameters or any HTTP
If the upload command is invoked with bad parameters or any HTTP
method other than `POST`, then an *HTTP 400* is returned.

@RESTRETURNCODE{401}
If the authentication to the rempote repository fails, then an *HTTP
If the authentication to the remote repository fails, then an *HTTP
400* is returned.

@RESTRETURNCODE{404}
Expand Down
6 changes: 3 additions & 3 deletions Documentation/DocuBlocks/Rest/Bulk/batch_processing.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The response sent by the server is a multipart response, too. It contains
the individual HTTP responses for all batch parts, including the full HTTP
result header (with status code and other potential headers) and an
optional result body. The individual batch parts in the result are
seperated using the same boundary value as specified in the request.
separated using the same boundary value as specified in the request.

The order of batch parts in the response will be the same as in the
original client request. Client can additionally use the `Content-Id`
Expand Down Expand Up @@ -121,9 +121,9 @@ in this case try to find the boundary at the beginning of the request body).
@EXAMPLE_ARANGOSH_RUN{RestBatchImplicitBoundary}
var parts = [
"Content-Type: application/x-arango-batchpart\r\n\r\n" +
"DELETE /_api/collection/notexisting1 HTTP/1.1\r\n",
"DELETE /_api/collection/nonexistent1 HTTP/1.1\r\n",
Simran-B marked this conversation as resolved.
Show resolved Hide resolved
"Content-Type: application/x-arango-batchpart\r\n\r\n" +
"DELETE _api/collection/notexisting2 HTTP/1.1\r\n"
"DELETE _api/collection/nonexistent2 HTTP/1.1\r\n"
];
var boundary = "SomeBoundaryValue";
var body = "--" + boundary + "\r\n" +
Expand Down
2 changes: 1 addition & 1 deletion Documentation/DocuBlocks/Rest/Bulk/import_json.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ violation. Possible values are:
- `ignore`: this will not update an existing document and simply ignore the
error caused by a unique key constraint violation.

Note that that `update`, `replace` and `ignore` will only work when the
Note that `update`, `replace` and `ignore` will only work when the
import document in the request contains the `_key` attribute. `update` and
`replace` may also fail because of secondary unique key constraint violations.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/DocuBlocks/Rest/Collections/1_structs.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ for a SatelliteCollection (Enterprise Edition only). _(cluster only)_

@RESTSTRUCT{writeConcern,collection_info,integer,optional,}
Determines how many copies of each shard are required to be
in sync on the different DB-Servers. If there are less then these many copies
in sync on the different DB-Servers. If there are less than these many copies
Simran-B marked this conversation as resolved.
Show resolved Hide resolved
in the cluster a shard will refuse to write. Writes to shards with enough
up-to-date copies will succeed at the same time however. The value of
`writeConcern` cannot be larger than `replicationFactor`. _(cluster only)_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ and their format is subject to change. By default, `details` is set to `false`,
so no details are returned and the behavior is identical to previous versions
of ArangoDB.
Please note that requesting `details` may cause additional load and thus have
an impact on performace.
an impact on performance.

@RESTDESCRIPTION
In addition to the above, the result also contains the number of documents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ copies take over, usually without an error being reported.
@RESTBODYPARAM{writeConcern,integer,optional,int64}
Write concern for this collection (default: 1).
It determines how many copies of each shard are required to be
in sync on the different DB-Servers. If there are less then these many copies
in sync on the different DB-Servers. If there are less than these many copies
in the cluster a shard will refuse to write. Writes to shards with enough
up-to-date copies will succeed at the same time however. The value of
`writeConcern` cannot be larger than `replicationFactor`. _(cluster only)_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ copies take over, usually without an error being reported.
@RESTBODYPARAM{writeConcern,integer,optional,int64}
Write concern for this collection (default: 1).
It determines how many copies of each shard are required to be
in sync on the different DB-Servers. If there are less then these many copies
in sync on the different DB-Servers. If there are less than these many copies
in the cluster a shard will refuse to write. Writes to shards with enough
up-to-date copies will succeed at the same time however. The value of
*writeConcern* can not be larger than *replicationFactor*. _(cluster only)_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ _(cluster only)_
@RESTSTRUCT{writeConcern,get_api_database_new_OPTIONS,number,optional,}
Default write concern for new collections created in this database.
It determines how many copies of each shard are required to be
in sync on the different DB-Servers. If there are less then these many copies
in sync on the different DB-Servers. If there are less than these many copies
in the cluster a shard will refuse to write. Writes to shards with enough
up-to-date copies will succeed at the same time however. The value of
*writeConcern* can not be larger than *replicationFactor*. _(cluster only)_
Simran-B marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ The response body contains an error document in this case.
@RESTRETURNCODE{409}
is returned if we fail to lock the document key due to some
concurrent operation that is operating on the same document.
This also also referred to as a write-write conflict.
This is also referred to as a write-write conflict.
The response body contains an error document in this case with the
errorNum set to 1200 (`ERROR_ARANGO_CONFLICT`).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ index. The response body contains an error document in
this case with the errorNum set to 1210 (`ERROR_ARANGO_UNIQUE_CONSTRAINT_VIOLATED`).
2) if we fail to lock the document key or some unique index entry
due to some concurrent operation that is operating on the same
document. This also also referred to as a write-write conflict.
document. This is also referred to as a write-write conflict.
The response body contains an error document in this case with the
errorNum set to 1200 (`ERROR_ARANGO_CONFLICT`).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ unique constraint. The response body contains an error document in
this case with the errorNum set to 1210 (`ERROR_ARANGO_UNIQUE_CONSTRAINT_VIOLATED`).
2) if we fail to lock the document key or some unique index entry
due to some concurrent operation that is operating on the same
document. This also also referred to as a write-write conflict.
document. This is also referred to as a write-write conflict.
The response body contains an error document in this case with the
errorNum set to 1200 (`ERROR_ARANGO_CONFLICT`).

Expand Down
Loading