View | Details | Raw Unified | Return to bug 253467
Collapse All | Expand All

(-)b/documentation/content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc (-8 / +8 lines)
Lines 44-50 To remove [.filename]#/tmp/foo#, use man:rm[1]. Link Here
44
% rm /tmp/foo
44
% rm /tmp/foo
45
----
45
----
46
46
47
It is easy to see which parts are filenames, which are commands to be typed in, which parts are references to manual pages, and so on. But the computer processing the document cannot. For this we need markup.
47
It is easy for the reader to see which parts are filenames, which are commands to be typed in, which parts are references to manual pages, and so on. But the computer processing the document cannot reliably determine this. For this we need markup.
48
48
49
49
50
The previous example is actually represented in this document like this:
50
The previous example is actually represented in this document like this:
Lines 61-67 To remove [.filename]#/tmp/foo#, use man:rm[1]. Link Here
61
[[asciidoctor-headings]]
61
[[asciidoctor-headings]]
62
== Headings
62
== Headings
63
63
64
AsciiDoctor support six headings levels. If the document type is `article` only one level 0 (`=`) can be used. If the document type is `book` can be multiple level 0 (`=`).
64
AsciiDoctor supports six headings levels. If the document type is `article` only one level 0 (`=`) can be used. If the document type is `book` then there can be multiple level 0 (`=`) headings.
65
65
66
This is an example of headings in an `article`.
66
This is an example of headings in an `article`.
67
67
Lines 101-112 The following syntax is not correct. Link Here
101
101
102
Paragraphs don't require special markup in AsciiDoc. A paragraph is defined by one or more consecutive lines of text. To create a new paragraph leave one blank line.
102
Paragraphs don't require special markup in AsciiDoc. A paragraph is defined by one or more consecutive lines of text. To create a new paragraph leave one blank line.
103
103
104
For example, this is a heading with two paragraphs
104
For example, this is a heading with two paragraphs.
105
105
106
....
106
....
107
= This is the heading
107
= This is the heading
108
108
109
This is the firts paragraph.
109
This is the first paragraph.
110
110
111
And this is the second paragraph.
111
And this is the second paragraph.
112
....
112
....
Lines 114-120 And this is the second paragraph. Link Here
114
[[asciidoctor-lists]]
114
[[asciidoctor-lists]]
115
== Lists
115
== Lists
116
116
117
AsciiDoctor support two type of lists ordered and unordered. To get more information about lists check link:https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/#lists[AsciiDoc Syntax Quick Reference]
117
AsciiDoctor supports two type of lists: ordered and unordered. To get more information about lists check link:https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/#lists[AsciiDoc Syntax Quick Reference]
118
118
119
[[asciidoctor-ordered-lists]]
119
[[asciidoctor-ordered-lists]]
120
=== Ordered lists
120
=== Ordered lists
Lines 142-148 And this would be rendered as. Link Here
142
142
143
To create an unordered list use the `.` character.
143
To create an unordered list use the `.` character.
144
144
145
For example this is an unordered lists.
145
For example this is an unordered list.
146
146
147
....
147
....
148
. First item
148
. First item
Lines 172-178 link:https://www.FreeBSD.org[FreeBSD] Link Here
172
172
173
[NOTE]
173
[NOTE]
174
====
174
====
175
As the AsciiDoctor documentation points the `link` macro is not required when the target starts with a URL scheme like `https`. But is a good practice to ensure that AsciiDoctor renders correctly the link. Specially in non-latin languages like Japanese.
175
As the AsciiDoctor documentation describes, the `link` macro is not required when the target starts with a URL scheme like `https`. However, it is a good practice to do this anyway to ensure that AsciiDoctor renders the link correctly, especially in non-latin languages like Japanese.
176
====
176
====
177
177
178
[[asciidoctor-links-internal]]
178
[[asciidoctor-links-internal]]
Lines 199-202 link:{ipsec-must}[IPSec-Must article] Link Here
199
[[asciidoctor-conclusion]]
199
[[asciidoctor-conclusion]]
200
== Conclusion
200
== Conclusion
201
201
202
That is the conclusion of this AsciiDoctor primer. For reasons of space and complexity, several things have not been covered in depth (or at all).
202
This is the conclusion of this AsciiDoctor primer. For reasons of space and complexity, several things have not been covered in depth (or at all).
(-)b/documentation/content/en/books/fdp-primer/doc-build/chapter.adoc (-5 / +5 lines)
Lines 165-180 build: .PHONY <.> Link Here
165
<.> `HUGO_CMD` flag specifies the location of the Hugo binary.
165
<.> `HUGO_CMD` flag specifies the location of the Hugo binary.
166
<.> `LANGUAGES` flag specifies in which languages the table of contents has to be generated.
166
<.> `LANGUAGES` flag specifies in which languages the table of contents has to be generated.
167
<.> `.ORDER` directives are used to ensure multiple make jobs may run without problem.
167
<.> `.ORDER` directives are used to ensure multiple make jobs may run without problem.
168
<.> `all` target generate the books TOCs, builds the documentation and puts the result in [.filename]#~/doc/documentation/public#.
168
<.> `all` target generates the books' tables of contents ("TOCs"), builds the documentation and puts the result in [.filename]#~/doc/documentation/public#.
169
<.> `starting-message` shows a message in the CLI to show the user that the process is running.
169
<.> `starting-message` shows a message in the CLI to show the user that the process is running.
170
<.> `generate-books-toc` calls the scripts to generate the books TOCs.
170
<.> `generate-books-toc` calls the scripts to generate the books TOCs.
171
<.> `run` runs hugo webserver in a random free port.
171
<.> `run` runs hugo webserver on port 1313, or a random free port if that is already in use.
172
<.> `build` builds the documentation and puts the result in the [.filename]#~/doc/documentation/public#.
172
<.> `build` builds the documentation and puts the result in the [.filename]#~/doc/documentation/public#.
173
173
174
[[website-makefile]]
174
[[website-makefile]]
175
=== Website Makefile
175
=== Website Makefile
176
176
177
This [.filename]#Makefile# take the form of:
177
This [.filename]#Makefile# takes the form of:
178
178
179
[source,bash]
179
[source,bash]
180
....
180
....
Lines 225-232 build: .PHONY <.> Link Here
225
<.> `PYTHON_CMD` flag specifies the location of the Python binary.
225
<.> `PYTHON_CMD` flag specifies the location of the Python binary.
226
<.> `HUGO_CMD` flag specifies the location of the Hugo binary.
226
<.> `HUGO_CMD` flag specifies the location of the Hugo binary.
227
<.> `.ORDER` directives are used to ensure multiple make jobs may run without problem.
227
<.> `.ORDER` directives are used to ensure multiple make jobs may run without problem.
228
<.> `all` target generate the books TOCs, builds the documentation and puts the result in [.filename]#~/doc/website/public#.
228
<.> `all` target builds the website and puts the result in [.filename]#~/doc/website/public#.
229
<.> `starting-message` shows a message in the CLI to show the user that the process is running.
229
<.> `starting-message` shows a message in the CLI to show the user that the process is running.
230
<.> `generate-releases` calls the script used to convert from AsciiDoc variables to TOML variables. With this conversion, the releases variables can be used in AsciiDoc and in the Hugo custom templates.
230
<.> `generate-releases` calls the script used to convert from AsciiDoc variables to TOML variables. With this conversion, the releases variables can be used in AsciiDoc and in the Hugo custom templates.
231
<.> `run` runs hugo webserver on a random free port.
231
<.> `run` runs hugo webserver on port 1313, or a random free port if that is already in use.
232
<.> `build` builds the website and puts the result in the [.filename]#~/doc/website/public#.
232
<.> `build` builds the website and puts the result in the [.filename]#~/doc/website/public#.
(-)b/documentation/content/en/books/fdp-primer/editor-config/chapter.adoc (-1 / +1 lines)
Lines 22-28 next: books/fdp-primer/see-also Link Here
22
22
23
toc::[]
23
toc::[]
24
24
25
Adjusting text editor configuration can make working on document files quicker and easier, and help documents conform to FDP guidelines.
25
Adjusting your text editor configuration can make working on document files quicker and easier, and help documents conform to FDP guidelines.
26
26
27
[[editor-config-vim]]
27
[[editor-config-vim]]
28
== Vim
28
== Vim
(-)b/documentation/content/en/books/fdp-primer/examples/chapter.adoc (-1 / +1 lines)
Lines 22-28 prev: books/fdp-primer/see-also/ Link Here
22
22
23
toc::[]
23
toc::[]
24
24
25
These examples are not exhaustive-they do not contain all the elements that might be desirable to use, particularly in a document's front matter. For more examples of AsciiDoctor, examine the AsciiDoc source for this and other documents available in the Git `doc` repository, or available online starting at link:https://cgit.freebsd.org/doc/[https://cgit.freebsd.org/doc/].
25
These examples are not exhaustive - they do not contain all the elements that might be desirable to use, particularly in a document's front matter. For more examples of AsciiDoctor, examine the AsciiDoc source for this and other documents available in the Git `doc` repository, or available online starting at link:https://cgit.freebsd.org/doc/[https://cgit.freebsd.org/doc/].
26
26
27
[[examples-asciidoctor-book]]
27
[[examples-asciidoctor-book]]
28
== AsciiDoctor `book`
28
== AsciiDoctor `book`
(-)b/documentation/content/en/books/fdp-primer/manual-pages/chapter.adoc (-2 / +2 lines)
Lines 242-248 Some very common macros will be shown here. For more usage examples, see man:mdo Link Here
242
242
243
[source,bash]
243
[source,bash]
244
....
244
....
245
% find /usr/shared/man/man* | xargs zgrep '.Bd'
245
% find /usr/share/man/man* | xargs zgrep '.Bd'
246
....
246
....
247
247
248
[[manual-pages-markup-important-macros-organizational]]
248
[[manual-pages-markup-important-macros-organizational]]
Lines 467-473 Some manual pages are suitable as in-depth examples. Link Here
467
|[.filename]#/usr/src/bin/cp/cp.1#
467
|[.filename]#/usr/src/bin/cp/cp.1#
468
468
469
|man:vt[4]
469
|man:vt[4]
470
|[.filename]#/usr/src/shared/man/man4/vt.4#
470
|[.filename]#/usr/src/share/man/man4/vt.4#
471
471
472
|man:crontab[5]
472
|man:crontab[5]
473
|[.filename]#/usr/src/usr.sbin/cron/crontab/crontab.5#
473
|[.filename]#/usr/src/usr.sbin/cron/crontab/crontab.5#
(-)b/documentation/content/en/books/fdp-primer/overview/chapter.adoc (-1 / +1 lines)
Lines 78-84 Review the output and edit the file to fix any problems shown, then rerun the co Link Here
78
+
78
+
79
[source,bash]
79
[source,bash]
80
....
80
....
81
make generate
81
make
82
....
82
....
83
+
83
+
84
. When changes are complete and tested, generate a "diff file":
84
. When changes are complete and tested, generate a "diff file":
(-)b/documentation/content/en/books/fdp-primer/preface/chapter.adoc (-1 / +1 lines)
Lines 102-108 Notes are represented like this, and contain information to take note of, as it Link Here
102
[TIP]
102
[TIP]
103
====
103
====
104
104
105
Tips are represented like this, and contain information helpful to the user, like showing an easier way to do something.
105
Tips are represented like this, and contain information helpful to the user, such as showing an easier way to do something.
106
====
106
====
107
107
108
[IMPORTANT]
108
[IMPORTANT]
(-)b/documentation/content/en/books/fdp-primer/structure/chapter.adoc (-4 / +4 lines)
Lines 41-47 There are three sections under [.filename]#doc/#, documentation and website shar Link Here
41
| Usage
41
| Usage
42
42
43
|[.filename]#documentation#
43
|[.filename]#documentation#
44
|Contains all the articles and books in AsciiDoc format. Contains subdirectories to further categorize the information by languages
44
|Contains all the articles and books in AsciiDoc format. Contains subdirectories to further categorize the information by languages.
45
45
46
|[.filename]#shared#
46
|[.filename]#shared#
47
|Contains files that are not specific to the various translations of the documentation. Contains subdirectories to further categorize the information by languages and three files to store the authors, releases and mirrors information. This directory is shared between `documentation` and the `website`.
47
|Contains files that are not specific to the various translations of the documentation. Contains subdirectories to further categorize the information by languages and three files to store the authors, releases and mirrors information. This directory is shared between `documentation` and the `website`.
Lines 53-59 There are three sections under [.filename]#doc/#, documentation and website shar Link Here
53
[[structure-locale]]
53
[[structure-locale]]
54
== The Directories
54
== The Directories
55
55
56
These directories contain the documentation and the website. The documentation is split into up to some directories this level. Following the link:https://gohugo.io/getting-started/directory-structure/[Hugo directory structure].
56
These directories contain the documentation and the website. The documentation is organized into subdirectories below this level, following the link:https://gohugo.io/getting-started/directory-structure/[Hugo directory structure].
57
57
58
[cols="20%,80%", frame="none", options="header"]
58
[cols="20%,80%", frame="none", options="header"]
59
|===
59
|===
Lines 133-139 The [.filename]#chapters-order.adoc# file stores the order of the book chapters. Link Here
133
133
134
[IMPORTANT]
134
[IMPORTANT]
135
====
135
====
136
Please be careful with this file. Is used by the Python `tools` to generate the Table of Contents of the books. In case of editing this file, first contact the mailto:doceng@freebsd.org[Documentation Engineering] team.
136
Please be careful with this file. It is used by the Python `tools` to generate the Table of Contents of the books. In case of editing this file, first contact the mailto:doceng@freebsd.org[Documentation Engineering] team.
137
====
137
====
138
138
139
[[structure-document-handbook-physical-chapters]]
139
[[structure-document-handbook-physical-chapters]]
Lines 178-184 The articles are organized as an AsciiDoc `article`. The articles are divided in Link Here
178
[[structure-document-articles-physical]]
178
[[structure-document-articles-physical]]
179
=== Physical Organization
179
=== Physical Organization
180
180
181
There are a one [.filename]#_index.adoc# file per article.
181
There is one [.filename]#_index.adoc# file per article.
182
182
183
[[structure-document-articles-physical-index]]
183
[[structure-document-articles-physical-index]]
184
==== _index.adoc
184
==== _index.adoc
(-)b/documentation/content/en/books/fdp-primer/translations/chapter.adoc (-3 / +3 lines)
Lines 44-50 mailto:freebsd-translators@freebsd.org[freebsd-translators@freebsd.org] for gene Link Here
44
44
45
== Are more translators needed?
45
== Are more translators needed?
46
46
47
Yes. The more people work on translation the faster it gets done, and the faster changes to the English documentation are mirrored in the translated documents.
47
Yes. The more people that work on translation the faster it gets done, and the faster changes to the English documentation are mirrored in the translated documents.
48
48
49
You do not have to be a professional translator to be able to help.
49
You do not have to be a professional translator to be able to help.
50
50
Lines 60-66 It is strongly recommended that you maintain a local copy of the FreeBSD Git rep Link Here
60
60
61
[source,bash]
61
[source,bash]
62
....
62
....
63
% git clone https://git.FreeBSD.org/doc.git doc
63
% git clone https://cgit.FreeBSD.org/doc.git doc
64
....
64
....
65
65
66
https://cgit.FreeBSD.org/[cgit.FreeBSD.org] is a public `git` server.
66
https://cgit.FreeBSD.org/[cgit.FreeBSD.org] is a public `git` server.
Lines 97-103 Write an email to the Documentation Project mailing list, announcing that you ar Link Here
97
97
98
If there is already someone in your country providing FreeBSD mirroring services you should contact them and ask if you can have some webspace for your project, and possibly an email address or mailing list services.
98
If there is already someone in your country providing FreeBSD mirroring services you should contact them and ask if you can have some webspace for your project, and possibly an email address or mailing list services.
99
99
100
Then pick a document and start translating. It is best to start with something fairly small-either the FAQ, or one of the tutorials.
100
Then pick a document and start translating. It is best to start with something fairly small - either the FAQ, or one of the tutorials.
101
101
102
== I have translated some documentation, where do I send it?
102
== I have translated some documentation, where do I send it?
103
103
(-)b/documentation/content/en/books/fdp-primer/writing-style/chapter.adoc (-3 / +3 lines)
Lines 121-130 Acronyms should be defined the first time they appear in a document, as in: "Net Link Here
121
121
122
All acronyms should be enclosed using the ` character.
122
All acronyms should be enclosed using the ` character.
123
123
124
[[writing-style-word-list]]
124
[[writing-style-special-characters]]
125
== Word List
125
== Special Character List
126
126
127
This list of words shows the correct spelling and capitalization when used in FreeBSD documentation. If a word is not on this list, ask about it on the {freebsd-doc}.
127
This list of special characters shows the correct syntax and the output when used in FreeBSD documentation. If a character is not on this list, ask about it on the {freebsd-doc}.
128
128
129
[.informaltable]
129
[.informaltable]
130
[cols="1,1,1", frame="none", options="header"]
130
[cols="1,1,1", frame="none", options="header"]

Return to bug 253467