[lxc-devel] [lxc/lxc] d1fcb4: doc: Add keyring options to Japanese lxc.container...

[Stéphane Graber]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: d1fcb47a33de8f08b35ef2af4f1097b1325cd28d
      https://github.com/lxc/lxc/commit/d1fcb47a33de8f08b35ef2af4f1097b1325cd28d
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2020-03-11 (Wed, 11 Mar 2020)

  Changed paths:
    M doc/ja/lxc.container.conf.sgml.in

  Log Message:
  -----------
  doc: Add keyring options to Japanese lxc.containers.conf(5)

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>


  Commit: 978499c7c0666227da7727f1d922077275b6ad55
      https://github.com/lxc/lxc/commit/978499c7c0666227da7727f1d922077275b6ad55
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2020-03-11 (Wed, 11 Mar 2020)

  Changed paths:
    M .travis.yml
    R COPYING
    A LICENSE.GPL2
    A LICENSE.LGPL2.1
    M config/selinux/lxc.te
    M configure.ac
    M doc/api-extensions.md
    M doc/lxc.container.conf.sgml.in
    M src/lxc/Makefile.am
    M src/lxc/af_unix.c
    M src/lxc/af_unix.h
    M src/lxc/api_extensions.h
    M src/lxc/attach.c
    M src/lxc/attach.h
    M src/lxc/attach_options.h
    M src/lxc/caps.c
    M src/lxc/caps.h
    M src/lxc/cgroups/cgfsng.c
    M src/lxc/cgroups/cgroup.c
    M src/lxc/cgroups/cgroup.h
    A src/lxc/cgroups/cgroup2_devices.c
    A src/lxc/cgroups/cgroup2_devices.h
    M src/lxc/cgroups/cgroup_utils.c
    M src/lxc/cgroups/cgroup_utils.h
    M src/lxc/cmd/lxc-checkconfig.in
    M src/lxc/cmd/lxc-update-config.in
    M src/lxc/cmd/lxc_init.c
    M src/lxc/cmd/lxc_monitord.c
    M src/lxc/cmd/lxc_user_nic.c
    M src/lxc/cmd/lxc_usernsexec.c
    M src/lxc/commands.c
    M src/lxc/commands.h
    M src/lxc/commands_utils.c
    M src/lxc/commands_utils.h
    M src/lxc/compiler.h
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile.c
    M src/lxc/confile.h
    M src/lxc/confile_utils.c
    M src/lxc/confile_utils.h
    M src/lxc/criu.c
    M src/lxc/criu.h
    M src/lxc/error.c
    M src/lxc/error.h
    M src/lxc/execute.c
    M src/lxc/file_utils.c
    M src/lxc/file_utils.h
    M src/lxc/freezer.c
    M src/lxc/initutils.c
    M src/lxc/initutils.h
    M src/lxc/list.h
    M src/lxc/log.c
    M src/lxc/log.h
    M src/lxc/lsm/apparmor.c
    M src/lxc/lsm/lsm.c
    M src/lxc/lsm/lsm.h
    M src/lxc/lsm/nop.c
    M src/lxc/lsm/selinux.c
    M src/lxc/lxc.functions.in
    M src/lxc/lxc.h
    M src/lxc/lxccontainer.c
    M src/lxc/lxccontainer.h
    M src/lxc/lxclock.c
    M src/lxc/lxclock.h
    M src/lxc/lxcseccomp.h
    M src/lxc/macro.h
    M src/lxc/mainloop.c
    M src/lxc/mainloop.h
    M src/lxc/memory_utils.h
    M src/lxc/monitor.c
    M src/lxc/monitor.h
    M src/lxc/namespace.c
    M src/lxc/namespace.h
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/nl.c
    M src/lxc/nl.h
    M src/lxc/pam/pam_cgfs.c
    M src/lxc/parse.c
    M src/lxc/parse.h
    M src/lxc/raw_syscalls.c
    M src/lxc/raw_syscalls.h
    M src/lxc/rexec.c
    M src/lxc/rexec.h
    M src/lxc/ringbuf.c
    M src/lxc/ringbuf.h
    M src/lxc/rtnl.c
    M src/lxc/rtnl.h
    M src/lxc/seccomp.c
    M src/lxc/start.c
    M src/lxc/start.h
    M src/lxc/state.c
    M src/lxc/state.h
    M src/lxc/storage/btrfs.c
    M src/lxc/storage/btrfs.h
    M src/lxc/storage/dir.c
    M src/lxc/storage/dir.h
    M src/lxc/storage/loop.c
    M src/lxc/storage/loop.h
    M src/lxc/storage/lvm.c
    M src/lxc/storage/lvm.h
    M src/lxc/storage/nbd.c
    M src/lxc/storage/nbd.h
    M src/lxc/storage/overlay.c
    M src/lxc/storage/overlay.h
    M src/lxc/storage/rbd.c
    M src/lxc/storage/rbd.h
    M src/lxc/storage/rsync.c
    M src/lxc/storage/rsync.h
    M src/lxc/storage/storage.c
    M src/lxc/storage/storage.h
    M src/lxc/storage/storage_utils.c
    M src/lxc/storage/storage_utils.h
    M src/lxc/storage/zfs.c
    M src/lxc/storage/zfs.h
    M src/lxc/string_utils.c
    M src/lxc/string_utils.h
    M src/lxc/sync.c
    M src/lxc/sync.h
    M src/lxc/syscall_wrappers.h
    M src/lxc/terminal.c
    M src/lxc/terminal.h
    M src/lxc/tools/arguments.c
    M src/lxc/tools/arguments.h
    M src/lxc/tools/include/getsubopt.c
    M src/lxc/tools/include/getsubopt.h
    M src/lxc/tools/lxc_attach.c
    M src/lxc/tools/lxc_autostart.c
    M src/lxc/tools/lxc_cgroup.c
    M src/lxc/tools/lxc_checkpoint.c
    M src/lxc/tools/lxc_config.c
    M src/lxc/tools/lxc_console.c
    M src/lxc/tools/lxc_copy.c
    M src/lxc/tools/lxc_create.c
    M src/lxc/tools/lxc_destroy.c
    M src/lxc/tools/lxc_device.c
    M src/lxc/tools/lxc_execute.c
    M src/lxc/tools/lxc_freeze.c
    M src/lxc/tools/lxc_info.c
    M src/lxc/tools/lxc_ls.c
    M src/lxc/tools/lxc_monitor.c
    M src/lxc/tools/lxc_snapshot.c
    M src/lxc/tools/lxc_start.c
    M src/lxc/tools/lxc_stop.c
    M src/lxc/tools/lxc_top.c
    M src/lxc/tools/lxc_unfreeze.c
    M src/lxc/tools/lxc_unshare.c
    M src/lxc/tools/lxc_wait.c
    M src/lxc/utils.c
    M src/lxc/utils.h
    M src/lxc/uuid.c
    M src/lxc/uuid.h
    M src/lxc/version.h.in
    M src/tests/Makefile.am
    M src/tests/api_reboot.c
    M src/tests/cgpath.c
    M src/tests/device_add_remove.c
    A src/tests/lxc-test-exit-code
    M src/tests/share_ns.c
    M src/tests/state_server.c
    A src/tests/travis.sh
    M templates/lxc-busybox.in

  Log Message:
  -----------
  Merge branch 'master' into japanese


  Commit: 48e3c95a8dea85c4c99f9d421149e13e72d39c6b
      https://github.com/lxc/lxc/commit/48e3c95a8dea85c4c99f9d421149e13e72d39c6b
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2020-03-11 (Wed, 11 Mar 2020)

  Changed paths:
    M doc/lxc.container.conf.sgml.in

  Log Message:
  -----------
  doc: Fix typo

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>


  Commit: c6a635312dd843ae6009f7cea8168d14bf9e9801
      https://github.com/lxc/lxc/commit/c6a635312dd843ae6009f7cea8168d14bf9e9801
  Author: Stéphane Graber <stgraber at stgraber.org>
  Date:   2020-03-11 (Wed, 11 Mar 2020)

  Changed paths:
    M doc/ja/lxc.container.conf.sgml.in
    M doc/lxc.container.conf.sgml.in

  Log Message:
  -----------
  Merge pull request #3289 from tenforward/japanese

doc: Add keyring options to Japanese lxc.containers.conf(5)


Compare: https://github.com/lxc/lxc/compare/a99e7037b731...c6a635312dd8