X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Ffile-hierarchy.xml;h=a096359c8a586f1c2c6993f3f0c7831971ea865d;hp=6ef726ec0537b1dfdf69105b9fa1416559186686;hb=dc7f577501278633be6abb0600df8a21561f6640;hpb=2f3d398a0546574a5a3c1b3fcae0cdbaae960753

diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
index 6ef726ec0..a096359c8 100644
--- a/man/file-hierarchy.xml
+++ b/man/file-hierarchy.xml
@@ -54,7 +54,7 @@
                 <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 system and service manager are organized based on a
                 file system hierarchy inspired by UNIX, more
-                specificaly the hierarchy described in the <ulink
+                specifically the hierarchy described in the <ulink
                 url="http://refspecs.linuxfoundation.org/FHS_2.3/fhs-2.3.html">File
                 System Hierarchy</ulink> specification and
                 <citerefentry><refentrytitle>hier</refentrytitle><manvolnum>7</manvolnum></citerefentry>. This
@@ -74,12 +74,8 @@
                                 root. Usually writable, but this is
                                 not required. Possibly a temporary
                                 file system (<literal>tmpfs</literal>). Not shared with
-                                other hosts (unless read-only). The
-                                administrator may create additional
-                                top-level subdirectories in this tree,
-                                if required and the name does not
-                                conflict with any of the directories
-                                listed below.</para></listitem>
+                                other hosts (unless read-only).
+                                </para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -90,7 +86,7 @@
                                 System Partition, also see
                                 <citerefentry><refentrytitle>systemd-boot-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>. This
                                 directory is usually strictly local
-                                the host, and should be considered
+                                to the host, and should be considered
                                 read-only, except when a new kernel or
                                 boot loader is installed. This
                                 directory only exists on systems that
@@ -124,9 +120,9 @@
                                 system users. This directory and
                                 possibly the directories contained
                                 within it might only become available
-                                or writable in late boot or even on
-                                user login only. This directory might
-                                be placed on limited-functionality
+                                or writable in late boot or even only
+                                after user authentication. This directory
+                                might be placed on limited-functionality
                                 network file systems, hence
                                 applications should not assume the
                                 full set of file API is available on
@@ -169,7 +165,7 @@
                                 <listitem><para>The place for small
                                 temporary files. This directory is
                                 usually mounted as
-                                <literal>tmpfs</literal> instance, and
+                                a <literal>tmpfs</literal> instance, and
                                 should hence not be used for larger
                                 files. (Use
                                 <filename>/var/tmp</filename> for
@@ -206,7 +202,7 @@
                                 for system packages to place runtime
                                 data in. This directory is flushed on
                                 boot, and generally writable for
-                                priviliged programs
+                                privileged programs
                                 only. Always writable.</para></listitem>
                         </varlistentry>
 
@@ -225,7 +221,7 @@
                                 <term><filename>/run/user</filename></term>
                                 <listitem><para>Contains per-user
                                 runtime directories, each usually
-                                invidually mounted
+                                individually mounted
                                 <literal>tmpfs</literal>
                                 instances. Always writable, flushed at
                                 each reboot and when the user logs
@@ -311,14 +307,17 @@
                                 identifier. This directory should not
                                 be used for package-specific data,
                                 unless this data is
-                                architecture-dependent,
-                                too.</para></listitem>
+                                architecture-dependent, too. To query
+                                <varname>$libdir</varname> for the
+                                primary architecture of the system,
+                                invoke
+                                <programlisting># pkg-config --variable=libdir systemd</programlisting></para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><filename>/usr/share</filename></term>
                                 <listitem><para>Resources shared
-                                betwen multiple packages, such as
+                                between multiple packages, such as
                                 documentation, man pages, time zone
                                 information, fonts and other
                                 resources. Usually, the precise
@@ -471,7 +470,7 @@
                                 <term><filename>/dev</filename></term>
                                 <listitem><para>The root directory for
                                 device nodes. Usually this directory
-                                is mounted as
+                                is mounted as a
                                 <literal>devtmpfs</literal> instance,
                                 but might be of a different type in
                                 sandboxed/containerized setups. This
@@ -504,7 +503,7 @@
                                 programs) or
                                 <varname>$XDG_RUNTIME_DIR</varname>
                                 (for user programs) instead of POSIX
-                                shared memory segments, since they
+                                shared memory segments, since those
                                 directories are not world-writable and
                                 hence not vulnerable to
                                 security-sensitive name
@@ -637,7 +636,7 @@
                     <tbody>
                       <row>
                         <entry><filename>/usr/bin</filename></entry>
-                        <entry>Package executables that shall appear in the <varname>$PATH</varname> executable search path, compiled for the primary architecture of the operating system. It is not recommended to place internal binaries or binaries that are not commonly invoked from the shell in this directory, such as daemon binaries. As this directory is shared with most other packages of the system special care should be take to pick unique names for files placed here, that are unlikely to clash with other package's files.</entry>
+                        <entry>Package executables that shall appear in the <varname>$PATH</varname> executable search path, compiled for the primary architecture of the operating system. It is not recommended to place internal binaries or binaries that are not commonly invoked from the shell in this directory, such as daemon binaries. As this directory is shared with most other packages of the system special care should be taken to pick unique names for files placed here, that are unlikely to clash with other package's files.</entry>
                       </row>
                       <row>
                         <entry><filename>$libdir</filename></entry>
@@ -657,7 +656,7 @@
                       </row>
                       <row>
                         <entry><filename>/etc/<replaceable>package</replaceable></filename></entry>
-                        <entry>System-specific configuration for the package. It is recommended to default to safe fallbacks if this configuration is missing, if this is possible. Alternatively, a <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> fragment may be used to copy or symlink the necessary files and directores from <filename>/usr/share/factory</filename> during boot, via the <literal>L</literal> or <literal>C</literal> directives.</entry>
+                        <entry>System-specific configuration for the package. It is recommended to default to safe fallbacks if this configuration is missing, if this is possible. Alternatively, a <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> fragment may be used to copy or symlink the necessary files and directories from <filename>/usr/share/factory</filename> during boot, via the <literal>L</literal> or <literal>C</literal> directives.</entry>
                       </row>
                       <row>
                         <entry><filename>/run/<replaceable>package</replaceable></filename></entry>
@@ -695,6 +694,7 @@
                         <citerefentry><refentrytitle>hier</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-boot-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 </para>
         </refsect1>