Modifing licence terms

Suppression des fichiers binaires
apache · Jan 11, 2017 · 27b0637 · 27b0637
1 parent dce470e
commit 27b0637
Show file tree

Hide file tree

Showing 123 changed files with 521 additions and 986 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    = -D language='fr' 
+SPHINXOPTS    = 
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build

diff --git a/build/latex/CloudStackAdministrationDocumentation.pdf b/build/latex/CloudStackAdministrationDocumentation.pdf
diff --git a/make.sh b/make.sh
@@ -0,0 +1,3 @@
+rm -fr build
+mkdir build
+sphinx-build -b html source build
diff --git a/source/locale/fr/LC_MESSAGES/_global.mo b/source/locale/fr/LC_MESSAGES/_global.mo
diff --git a/source/locale/fr/LC_MESSAGES/_global.po b/source/locale/fr/LC_MESSAGES/_global.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,15 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2016, Apache Software Foundation
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
-#
-#, fuzzy
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"

diff --git a/source/locale/fr/LC_MESSAGES/accounts.mo b/source/locale/fr/LC_MESSAGES/accounts.mo
diff --git a/source/locale/fr/LC_MESSAGES/accounts.po b/source/locale/fr/LC_MESSAGES/accounts.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,11 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
 #
 # Translators:
 >>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d

diff --git a/source/locale/fr/LC_MESSAGES/administration.mo b/source/locale/fr/LC_MESSAGES/administration.mo
diff --git a/source/locale/fr/LC_MESSAGES/administration.po b/source/locale/fr/LC_MESSAGES/administration.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,13 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
-# Translators:
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

diff --git a/source/locale/fr/LC_MESSAGES/api.mo b/source/locale/fr/LC_MESSAGES/api.mo
diff --git a/source/locale/fr/LC_MESSAGES/api.po b/source/locale/fr/LC_MESSAGES/api.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,13 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
-# Translators:
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

diff --git a/source/locale/fr/LC_MESSAGES/events.mo b/source/locale/fr/LC_MESSAGES/events.mo
diff --git a/source/locale/fr/LC_MESSAGES/events.po b/source/locale/fr/LC_MESSAGES/events.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,14 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
-#
-# Translators:
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

diff --git a/source/locale/fr/LC_MESSAGES/hosts.mo b/source/locale/fr/LC_MESSAGES/hosts.mo
diff --git a/source/locale/fr/LC_MESSAGES/hosts.po b/source/locale/fr/LC_MESSAGES/hosts.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,14 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
-#
-# Translators:
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

diff --git a/source/locale/fr/LC_MESSAGES/index.mo b/source/locale/fr/LC_MESSAGES/index.mo
diff --git a/source/locale/fr/LC_MESSAGES/index.po b/source/locale/fr/LC_MESSAGES/index.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,12 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/management.mo b/source/locale/fr/LC_MESSAGES/management.mo
diff --git a/source/locale/fr/LC_MESSAGES/management.po b/source/locale/fr/LC_MESSAGES/management.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking.mo b/source/locale/fr/LC_MESSAGES/networking.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking.po b/source/locale/fr/LC_MESSAGES/networking.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.mo b/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po b/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.mo b/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po b/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.mo b/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po b/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.mo b/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po b/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.mo b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.mo b/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po b/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.mo b/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po b/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.mo b/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po b/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.mo b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.mo b/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po b/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.mo b/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po b/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.mo b/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.mo
diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po b/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.mo b/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.mo