Skip to content

Commit

Permalink
Merge branch 'master' into v7
Browse files Browse the repository at this point in the history
  • Loading branch information
gsanchietti committed May 12, 2017
2 parents 7b94995 + 818a0a9 commit a195f0b
Show file tree
Hide file tree
Showing 89 changed files with 2,103 additions and 866 deletions.
3 changes: 2 additions & 1 deletion administrator-manual/en/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ System language
^^^^^^^^^^^^^^^

The system language of |product| installations is *English (United States)*.
Additional languages can be installed later. See :ref:`installation-next-steps`.
Additional languages can be installed later. See :ref:`Next steps <installation-next-steps>`.

.. _installation-manual:

Expand Down Expand Up @@ -305,6 +305,7 @@ To install the base system, run: ::
yum update @nethserver-iso


.. _installation-next-steps:

Next steps
Expand Down
578 changes: 312 additions & 266 deletions administrator-manual/en/locale/es/LC_MESSAGES/accounts.po

Large diffs are not rendered by default.

0 comments on commit a195f0b

Please sign in to comment.