Skip to content

Commit b170e29

Browse files
dbkinderjren1
authored andcommitted
doc: general edit for typos
Fix typos and misspellings, and tweak CSS for spacing before lists. Signed-off-by: David B. Kinder <david.b.kinder@intel.com>
1 parent 44b0ec0 commit b170e29

File tree

10 files changed

+146
-93
lines changed

10 files changed

+146
-93
lines changed

doc/api/devicemodel_api.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
Device Model APIs
44
#################
55

6-
This section contains APIs for the SOS Device Model services.
6+
This section contains APIs for the SOS Device Model services. Sources
7+
for the Device Model are found in the `ACRN Device Model GitHub repo`_
8+
9+
.. _ACRN Device Model GitHub repo:
10+
https://github.com/projectacrn/acrn-devicemodel/
711

812
.. doxygengroup:: acrn_virtio
913
:project: Project ACRN

doc/api/hypercall_api.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
Hypercall APIs
44
##############
55

6-
This section contains APIs for the hypercall services.
6+
This section contains APIs for the hypercall services. Sources
7+
for the Device Model are found in the `ACRN Hypervisor GitHub repo`_
8+
9+
.. _ACRN Hypervisor GitHub repo:
10+
https://github.com/projectacrn/acrn-hypervisor/
711

812
.. doxygengroup:: acrn_hypercall
913
:project: Project ACRN

doc/contribute.rst

Lines changed: 41 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ agreement is shown below and at http://developercertificate.org/.
7878
DCO Sign-Off Methods
7979
====================
8080

81-
The DCO requires a sign-off message in the following format appear on each
82-
commit in the pull request::
81+
The DCO requires that a sign-off message, in the following format,
82+
appears on each commit in the pull request::
8383

8484
Signed-off-by: Acrnus Jones <acrnusj@gmail.com>
8585

@@ -95,9 +95,9 @@ Prerequisites
9595
.. _project ACRN website: https://projectacrn.org
9696

9797
As a contributor, you'll want to be familiar with project ACRN, how to
98-
configure, install, and use it as explained in the `project ACRN website`_
99-
and how to set up your development environment as introduced in the
100-
project ACRN `Getting Started Guide`_.
98+
configure, install, and use it as explained on the
99+
`project ACRN website`_, and how to set up your development environment
100+
as introduced in the project ACRN `Getting Started Guide`_.
101101

102102
.. _Getting Started Guide:
103103
https://projectacrn.github.io/getting_started/
@@ -114,17 +114,24 @@ Repository layout
114114
To clone the ACRN hypervisor repository use::
115115

116116
git clone https://github.com/projectacrn/acrn-hypervisor
117-
117+
118118
To clone the ACRN device model repository use::
119119

120120
git clone https://github.com/projectacrn/acrn-devicemodel
121121

122+
To clone the ACRN documentation repository use::
123+
124+
git clone https://github.com/projectacrn/acrn-documentation
125+
122126
The project ACRN directory structure is described in the `Hypervisor
123127
Primer`_ document. In addition to the ACRN hypervisor and device model itself,
124-
you'll also find the sources for technical documentation, sample code
125-
and supported board configurations. All of these are available for
128+
you'll also find the sources for technical documentation available from
129+
the `ACRN documentation site`_. All of these are available for
126130
developers to contribute to and enhance.
127131

132+
.. _ACRN documentation site:
133+
https://projectacrn.github.io/
134+
128135
.. _Hypervisor Primer:
129136
https://projectacrn.github.io/hypervisor_primer
130137

@@ -134,8 +141,9 @@ Submitting Issues
134141
.. _ACRN-dev mailing list:
135142
https://lists.projectacrn.org/g/acrn-dev
136143

137-
Before starting on a patch, first check in our issues in the `ACRN-dev
138-
mailing list`_ system to see what's been reported on the issue you'd
144+
Issue tracking for ACRN is done using the `ACRN-dev mailing list`_.
145+
Before starting on a patch, first read through discussions in the `ACRN-dev
146+
mailing list`_ to see what's been reported on the issue you'd
139147
like to address. Have a conversation on the `ACRN-dev mailing list`_ to
140148
see what others think of your issue (and proposed solution). You may
141149
find others that have encountered the issue you're finding, or that have
@@ -158,7 +166,7 @@ Signed-off-by
158166

159167
The name in the commit message ``Signed-off-by:`` line and your email must
160168
match the change authorship information. Make sure your :file:`.gitconfig`
161-
is set up correctly:
169+
is set up correctly by using:
162170

163171
.. code-block:: console
164172
@@ -203,7 +211,8 @@ and test your changes thoroughly before submitting.
203211
The general GitHub workflow used by project ACRN developers uses a combination of
204212
command line Git commands and browser interaction with GitHub. As it is with
205213
Git, there are multiple ways of getting a task done. We'll describe a typical
206-
workflow here:
214+
workflow here for the acrn-hypervisor repo that can also be used for the
215+
acrn-devicemodel and acrn-documentation repos:
207216

208217
.. _Create a Fork of acrn-hypervisor:
209218
https://github.com/projectacrn/acrn-hypervisor#fork-destination-box
@@ -232,14 +241,18 @@ workflow here:
232241

233242
#. Make changes, test locally, change, test, test again, ...
234243

235-
#. When things look good, start the pull request process by adding your changed
236-
files::
244+
#. When things look good, start the pull request process by checking
245+
which files have not been staged::
246+
247+
git status
248+
249+
Then add the changed files::
237250

238251
git add [file(s) that changed, add -p if you want to be more specific]
239252

240-
You can see files that are not yet staged using::
253+
(or to have all changed files added use)::
241254

242-
git status
255+
git add -A
243256

244257
#. Verify changes to be committed look as you expected::
245258

@@ -259,9 +272,9 @@ workflow here:
259272

260273
git push origin fix_comment_typo
261274

262-
#. In your web browser, go to your forked repo and click on the Compare & pull
263-
request button for the branch you just worked on and you want to open a pull
264-
request with.
275+
#. In your web browser, go to your personal forked repo and click on the Compare & pull
276+
request button for the branch you just worked on and you want to
277+
submit to the upstream repo.
265278

266279
#. Review the pull request changes, and verify that you are opening a pull request
267280
for the appropriate branch. The title and message from your commit message should
@@ -285,7 +298,12 @@ workflow here:
285298
and use the same process described above to work on this new topic branch.
286299

287300
#. If reviewers do request changes to your patch, you can interactively rebase
288-
commit(s) to fix review issues. In your development repo::
301+
commit(s) to fix review issues. In your development repo, make the
302+
needed changes on the branch you made the initial submission::
303+
304+
git checkout fix-comment-typo
305+
306+
then::
289307

290308
git fetch --all
291309
git rebase --ignore-whitespace upstream/master
@@ -311,8 +329,9 @@ workflow here:
311329

312330
By force pushing your update, your original pull request will be updated with
313331
your changes so you won't need to resubmit the pull request.
314-
315-
You can follow the same workflow for contributing to acrn-devicemodel.
332+
333+
You can follow the same workflow for contributing to acrn-devicemodel
334+
or acrn-documentation repos.
316335

317336

318337
Commit Guidelines

doc/getting_started/index.rst

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Getting Started Guide
55

66
After reading the :ref:`introduction`, use this guide to get started
77
using ACRN in a reference setup. We'll show how to set up your
8-
development and target hardware, and then how to boot up of the ACRN
8+
development and target hardware, and then how to boot up the ACRN
99
hypervisor and the `Clear Linux`_ Service OS and Guest OS on the Intel
10-
|reg| NUC, using the UEFI BIOS.
10+
|reg| NUC.
1111

1212
.. _Clear Linux: https://clearlinux.org
1313

@@ -16,7 +16,7 @@ Hardware setup
1616

1717
The Intel |reg| NUC (NUC6CAYH) is the supported reference target
1818
platform for ACRN work, as described in :ref:`hardware`, and is the only
19-
platform tested with these setup instructions.
19+
platform currently tested with these setup instructions.
2020

2121
The recommended NUC hardware configuration is:
2222

@@ -40,9 +40,11 @@ for downloading and flashing an updated BIOS for the NUC.
4040
Set up a Clear Linux Operating System
4141
=====================================
4242

43-
Currently, an installable version of ARCN does not exist. Therefore, we
44-
need to setup a base Clear Linux OS to bootstrap ACRN.
45-
**ACRN requires Clear Linux version 21260 or newer.**
43+
Currently, an installable version of ARCN does not exist. Therefore, you
44+
need to setup a base Clear Linux OS to bootstrap ACRN on the NUC. You'll
45+
need a network connection for your NUC to complete this setup.
46+
47+
.. note:: ACRN requires Clear Linux version 21260 or newer.
4648

4749
1. Follow this `Clear Linux installation guide
4850
<https://clearlinux.org/documentation/clear-linux/get-started/bare-metal-install>`__
@@ -71,11 +73,11 @@ need to setup a base Clear Linux OS to bootstrap ACRN.
7173
| /dev/sda3 | 111.3G | Linux root (x86-64) |
7274
+-------------+----------+-----------------------+
7375

74-
4. After installation is complete, boot into Clear Linux and log in as
75-
root and set a password.
76+
4. After installation is complete, boot into Clear Linux, login as
77+
root, and set a password.
7678

77-
5. Clear Linux is set to automatically update. If you do not wish for
78-
autoupdate, issue this command:
79+
5. Clear Linux is set to automatically update itself. If you do not want
80+
it to autoupdate, issue this command:
7981

8082
.. code-block:: none
8183
@@ -110,7 +112,7 @@ need to setup a base Clear Linux OS to bootstrap ACRN.
110112
Add the ACRN hypervisor to the EFI Partition
111113
============================================
112114

113-
In order to boot the ACRN SOS on the NUC, we need to add it to the EFI
115+
In order to boot the ACRN SOS on the NUC, you'll need to add it to the EFI
114116
partition. Follow these steps:
115117

116118
#. Mount the EFI partition and verify you have the following files:
@@ -210,8 +212,9 @@ folder) as shown here:
210212
:caption: acrn-devicemodel/samples/bridge.sh
211213
:language: bash
212214

213-
By default, it is located in the ``/usr/share/acrn/demo/``
214-
directory. Use it directly by making it executable and running it:
215+
By default, the script is located in the ``/usr/share/acrn/demo/``
216+
directory. Use it directly by making it executable and run it to create
217+
a network bridge:
215218

216219
.. code-block:: none
217220
@@ -256,8 +259,9 @@ Set up Reference UOS
256259
:caption: acrn-devicemodel/samples/launch_uos.sh
257260
:language: bash
258261

259-
By default, it is located in the ``/usr/share/acrn/demo/``
260-
directory. Use it directly by making it executable and running it:
262+
By default, the script is located in the ``/usr/share/acrn/demo/``
263+
directory. Use it directly by making it executable and run it to
264+
launch the User OS:
261265

262266
.. code-block:: none
263267
@@ -266,7 +270,7 @@ Set up Reference UOS
266270
# ./launch_uos.sh
267271
268272
#. At this point, you've successfully booted the ACRN system,
269-
hypervisor, SOS and UOS:
273+
hypervisor, SOS, and UOS:
270274

271275
.. figure:: images/gsg-successful-boot.png
272276
:align: center
@@ -277,7 +281,7 @@ Build ACRN from Source
277281
**********************
278282

279283
If you would like to build ACRN hypervisor and device model from source,
280-
follow these steps:
284+
follow these steps, using your NUC as a development system:
281285

282286
#. On your Clear Linux system, install the os-clr-on-clr bundle to get
283287
the necessary tools.

doc/hardware.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,17 @@ Intel Apollo Lake NUC
1616
<https://www.intel.com/content/www/us/en/products/boards-kits/nuc/kits/nuc6cayh.html>`_
1717
* Intel |reg| Celeron |reg| Processor J3455
1818
* Tested NUC with 8GB of RAM and using an 128GB SSD
19+
20+
You can read a full `AnandTech review`_ of the NUC6CAYH NUC Kit and
21+
search online for where to purchase this NUC from `Amazon`_,
22+
`SimplyNUC`_, and other vendors. Be sure to purchase the NUC with the
23+
recommended memory and storage options noted above.
24+
25+
.. _AnandTech review:
26+
https://www.anandtech.com/show/12295/intel-nuc6cayh-arches-canyon-apollo-lake-ucff-pc-review
27+
28+
.. _Amazon:
29+
https://www.amazon.com/s/ref=nb_sb_noss_2?url=search-alias%3Daps&field-keywords=NUC6CAYH
30+
31+
.. _SimplyNUC:
32+
https://www.simplynuc.com/?s=NUC6CAYH&post_type=product

doc/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ For information about the changes and additions for releases, please
99
consult the published :ref:`release_notes` documentation.
1010

1111
Source code for Project ACRN is maintained in the
12-
`Project ACRN GitHub repo`_, and is provided under the `BSD 3-clause license`_ (as found in
13-
the LICENSE file in the project repo).
12+
`Project ACRN GitHub repo`_, and is provided under the BSD 3-clause
13+
license.
1414

1515
.. _BSD 3-clause license:
1616
https://github.com/projectacrn/acrn-hypervisor/blob/doc/master/LICENSE

0 commit comments

Comments
 (0)